- Devel - libvirt List Archives

[libvirt] [PATCH] cpu: Add support for CPU vendor
by Jiri Denemark 20 Jul '10

20 Jul '10

By specifying <vendor> element in CPU requirements a guest can be restricted to run only on CPUs by a given vendor. Host CPU vendor is also specified in capabilities XML. The vendor is checked when migrating a guest but it's not forced, i.e., a guest configured without <vendor> element can be freely migrated. --- Sorry for such a big patch but the bulk of it is in cpu/ which is not so easy to be splitted reasonably. docs/formatcaps.html.in | 1 + docs/formatdomain.html.in | 8 + docs/schemas/capability.rng | 5 + docs/schemas/domain.rng | 7 + src/conf/cpu_conf.c | 14 ++ src/conf/cpu_conf.h | 1 + src/cpu/cpu.c | 9 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_map.c | 36 ++++-- src/cpu/cpu_map.h | 20 ++- src/cpu/cpu_map.xml | 6 + src/cpu/cpu_x86.c | 307 +++++++++++++++++++++++++++++++++++++++++-- tests/testutilsqemu.c | 1 + 13 files changed, 389 insertions(+), 32 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 525a331..dcbf35a 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -22,6 +22,7 @@ BIOS you will see</p> <vmx/> </features> <model>core2duo</model> + <vendor>Intel</vendor> <topology sockets="1" cores="2" threads="1"/> <feature name="lahf_lm"/> <feature name='xtpr'/> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 425a1e4..8f0cf3b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -220,6 +220,7 @@ ... <cpu match='exact'> <model>core2duo</model> + <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='1'/> <feature policy='disable' name='lahf_lm'/> </cpu> @@ -267,6 +268,13 @@ definition can be found in <code>cpu_map.xml</code> file installed in libvirt's data directory.</dd> + <dt><code>vendor</code></dt> + <dd><span class="since">Since 0.8.2</span> the content of the + <code>vendor</code> element specifies CPU vendor requested by the + guest. If this element is missing, the guest can be run on a CPU + matching given features regardless on its vendor. The list of + supported vendors can be found in <code>cpu_map.xml</code>.</dd> + <dt><code>topology</code></dt> <dd>The <code>topology</code> element specifies requested topology of virtual CPU provided to the guest. Three non-zero values have to be diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 67e8cf2..f894b09 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -79,6 +79,11 @@ <element name='model'> <text/> </element> + <optional> + <element name='vendor'> + <text/> + </element> + </optional> <element name='topology'> <attribute name='sockets'> <ref name='positiveInteger'/> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fd57917..1d56f5b 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1557,6 +1557,7 @@ <interleave> <ref name="cpuModel"/> <optional> + <ref name="cpuVendor"/> <ref name="cpuTopology"/> </optional> <zeroOrMore> @@ -1584,6 +1585,12 @@ </element> </define> + <define name="cpuVendor"> + <element name="vendor"> + <text/> + </element> + </define> + <define name="cpuFeature"> <element name="feature"> <attribute name="policy"> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c51ac4e..d9aa69c 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -58,6 +58,7 @@ virCPUDefFree(virCPUDefPtr def) VIR_FREE(def->model); VIR_FREE(def->arch); + VIR_FREE(def->vendor); for (i = 0 ; i < def->nfeatures ; i++) VIR_FREE(def->features[i].name); @@ -79,6 +80,7 @@ virCPUDefCopy(const virCPUDefPtr cpu) if (VIR_ALLOC(copy) < 0 || (cpu->arch && !(copy->arch = strdup(cpu->arch))) || (cpu->model && !(copy->model = strdup(cpu->model))) + || (cpu->vendor && !(copy->vendor = strdup(cpu->vendor))) || VIR_ALLOC_N(copy->features, cpu->nfeatures) < 0) goto no_memory; @@ -173,6 +175,13 @@ virCPUDefParseXML(const xmlNodePtr node, goto error; } + def->vendor = virXPathString("string(./vendor[1])", ctxt); + if (def->vendor && !def->model) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("CPU vendor specified without CPU model")); + goto error; + } + if (virXPathNode("./topology[1]", ctxt)) { int ret; unsigned long ul; @@ -349,6 +358,11 @@ virCPUDefFormatBuf(virBufferPtr buf, if (def->model) virBufferVSprintf(buf, "%s <model>%s</model>\n", indent, def->model); + if (def->vendor) { + virBufferVSprintf(buf, "%s <vendor>%s</vendor>\n", + indent, def->vendor); + } + if (def->sockets && def->cores && def->threads) { virBufferVSprintf(buf, "%s <topology", indent); virBufferVSprintf(buf, " sockets='%u'", def->sockets); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index a30991d..1c29192 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -72,6 +72,7 @@ struct _virCPUDef { int match; /* enum virCPUMatch */ char *arch; char *model; + char *vendor; unsigned int sockets; unsigned int cores; unsigned int threads; diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 8d6c22b..279eee7 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -173,14 +173,15 @@ cpuEncode(const char *arch, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden) + union cpuData **forbidden, + union cpuData **vendor) { struct cpuArchDriver *driver; VIR_DEBUG("arch=%s, cpu=%p, forced=%p, required=%p, " - "optional=%p, disabled=%p, forbidden=%p", + "optional=%p, disabled=%p, forbidden=%p, vendor=%p", NULLSTR(arch), cpu, forced, required, - optional, disabled, forbidden); + optional, disabled, forbidden, vendor); if ((driver = cpuGetSubDriver(arch)) == NULL) return -1; @@ -193,7 +194,7 @@ cpuEncode(const char *arch, } return driver->encode(cpu, forced, required, - optional, disabled, forbidden); + optional, disabled, forbidden, vendor); } diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 40f2a7d..a745917 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -58,7 +58,8 @@ typedef int union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden); + union cpuData **forbidden, + union cpuData **vendor); typedef void (*cpuArchDataFree) (union cpuData *data); @@ -119,7 +120,8 @@ cpuEncode (const char *arch, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden); + union cpuData **forbidden, + union cpuData **vendor); extern void cpuDataFree (const char *arch, diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 5fb88e0..263bb9e 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -32,9 +32,14 @@ #define CPUMAPFILE PKGDATADIR "/cpu_map.xml" +VIR_ENUM_IMPL(cpuMapElement, CPU_MAP_ELEMENT_LAST, + "vendor", + "feature", + "model") + static int load(xmlXPathContextPtr ctxt, - const char *node, + enum cpuMapElement element, cpuMapLoadCallback callback, void *data) { @@ -47,9 +52,10 @@ static int load(xmlXPathContextPtr ctxt, cur = ctxt_node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && - xmlStrEqual(cur->name, BAD_CAST node)) { + xmlStrEqual(cur->name, + BAD_CAST cpuMapElementTypeToString(element))) { ctxt->node = cur; - if (callback(ctxt, data) < 0) + if (callback(element, ctxt, data) < 0) goto cleanup; } @@ -66,16 +72,15 @@ cleanup: int cpuMapLoad(const char *arch, - cpuMapLoadCallback feature_cb, - void *model_data, - cpuMapLoadCallback model_cb, - void *feature_data) + cpuMapLoadCallback cb, + void *data) { xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xpath = NULL; int ret = -1; + int element; if (arch == NULL) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, @@ -83,6 +88,12 @@ int cpuMapLoad(const char *arch, return -1; } + if (cb == NULL) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no callback provided")); + return -1; + } + if ((xml = xmlParseFile(CPUMAPFILE)) == NULL) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse CPU map file: %s"), @@ -107,11 +118,12 @@ int cpuMapLoad(const char *arch, goto cleanup; } - if ((feature_cb && load(ctxt, "feature", feature_cb, feature_data) < 0) || - (model_cb && load(ctxt, "model", model_cb, model_data) < 0)) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse CPU map for %s architecture"), arch); - goto cleanup; + for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { + if (load(ctxt, element, cb, data) < 0) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse CPU map for %s architecture"), arch); + goto cleanup; + } } ret = 0; diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index 3d72c7f..e26c7c1 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -27,15 +27,25 @@ # include "xml.h" +enum cpuMapElement { + CPU_MAP_ELEMENT_VENDOR, + CPU_MAP_ELEMENT_FEATURE, + CPU_MAP_ELEMENT_MODEL, + + CPU_MAP_ELEMENT_LAST +}; + +VIR_ENUM_DECL(cpuMapElement) + + typedef int -(*cpuMapLoadCallback) (xmlXPathContextPtr ctxt, +(*cpuMapLoadCallback) (enum cpuMapElement element, + xmlXPathContextPtr ctxt, void *data); extern int cpuMapLoad(const char *arch, - cpuMapLoadCallback feature_cb, - void *model_data, - cpuMapLoadCallback model_cb, - void *feature_data); + cpuMapLoadCallback cb, + void *data); #endif /* __VIR_CPU_MAP_H__ */ diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 084b879..3ec4a7e 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1,5 +1,9 @@ <cpus> <arch name='x86'> +  + <vendor name='Intel' string='GenuineIntel'/> + <vendor name='AMD' string='AuthenticAMD'/> +  <feature name='fpu'>  <cpuid function='0x00000001' edx='0x00000001'/> @@ -310,6 +314,7 @@ <model name='phenom'> <model name='pentiumpro'/> + <vendor name='AMD'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> @@ -328,6 +333,7 @@ <model name='athlon'> <model name='pentiumpro'/> + <vendor name='AMD'/> <feature name='pse36'/> <feature name='vme'/> <feature name='mtrr'/> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 0266ce9..114235c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -35,8 +35,18 @@ #define VIR_FROM_THIS VIR_FROM_CPU +#define VENDOR_STRING_LENGTH 12 + + static const char *archs[] = { "i686", "x86_64" }; +struct x86_vendor { + char *name; + struct cpuX86cpuid cpuid; + + struct x86_vendor *next; +}; + struct x86_feature { char *name; unsigned int ncpuid; @@ -47,6 +57,7 @@ struct x86_feature { struct x86_model { char *name; + const struct x86_vendor *vendor; unsigned int ncpuid; struct cpuX86cpuid *cpuid; @@ -54,6 +65,7 @@ struct x86_model { }; struct x86_map { + struct x86_vendor *vendors; struct x86_feature *features; struct x86_model *models; }; @@ -212,6 +224,44 @@ x86DataCopy(const union cpuData *data) } +static int +x86DataAddCpuid(union cpuData *data, + const struct cpuX86cpuid *cpuid) +{ + struct cpuX86cpuid **cpuids; + int *len; + unsigned int pos; + unsigned int ext; + + if (cpuid->function < CPUX86_EXTENDED) { + pos = cpuid->function; + ext = 0; + len = &data->x86.basic_len; + cpuids = &data->x86.basic; + } else { + pos = cpuid->function - CPUX86_EXTENDED; + ext = CPUX86_EXTENDED; + len = &data->x86.extended_len; + cpuids = &data->x86.extended; + } + + if (pos >= *len) { + unsigned int i; + + if (VIR_ALLOC_N(*cpuids, pos + 1) < 0) + return -1; + + for (i = *len; i <= pos; i++) + (*cpuids)[i].function = i + ext; + *len = pos + 1; + } + + x86cpuidSetBits((*cpuids) + pos, cpuid); + + return 0; +} + + static void x86DataSubtract(union cpuData *data1, const union cpuData *data2) @@ -318,6 +368,27 @@ x86DataToCPUFeatures(virCPUDefPtr cpu, } +/* also removes bits corresponding to vendor string from data */ +static const struct x86_vendor * +x86DataToVendor(union cpuData *data, + const struct x86_map *map) +{ + const struct x86_vendor *vendor = map->vendors; + struct cpuX86cpuid *cpuid; + + while (vendor) { + if ((cpuid = x86DataCpuid(data, vendor->cpuid.function)) && + x86cpuidMatchMasked(cpuid, &vendor->cpuid)) { + x86cpuidClearBits(cpuid, &vendor->cpuid); + return vendor; + } + vendor = vendor->next; + } + + return NULL; +} + + static virCPUDefPtr x86DataToCPU(const union cpuData *data, const struct x86_model *model, @@ -326,6 +397,7 @@ x86DataToCPU(const union cpuData *data, virCPUDefPtr cpu; union cpuData *copy = NULL; union cpuData *modelData = NULL; + const struct x86_vendor *vendor; if (VIR_ALLOC(cpu) < 0 || !(cpu->model = strdup(model->name)) || @@ -333,6 +405,10 @@ x86DataToCPU(const union cpuData *data, !(modelData = x86DataFromModel(model))) goto no_memory; + if ((vendor = x86DataToVendor(copy, map)) && + !(cpu->vendor = strdup(vendor->name))) + goto no_memory; + x86DataSubtract(copy, modelData); x86DataSubtract(modelData, data); @@ -358,6 +434,106 @@ error: static void +x86VendorFree(struct x86_vendor *vendor) +{ + if (!vendor) + return; + + VIR_FREE(vendor->name); + VIR_FREE(vendor); +}; + + +static struct x86_vendor * +x86VendorFind(const struct x86_map *map, + const char *name) +{ + struct x86_vendor *vendor; + + vendor = map->vendors; + while (vendor) { + if (STREQ(vendor->name, name)) + return vendor; + + vendor = vendor->next; + } + + return NULL; +} + + +static int +x86VendorLoad(xmlXPathContextPtr ctxt, + struct x86_map *map) +{ + struct x86_vendor *vendor = NULL; + char *string = NULL; + int ret = 0; + + if (VIR_ALLOC(vendor) < 0) + goto no_memory; + + vendor->name = virXPathString("string(@name)", ctxt); + if (!vendor->name) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing CPU vendor name")); + goto ignore; + } + + if (x86VendorFind(map, vendor->name)) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor %s already defined"), vendor->name); + goto ignore; + } + + string = virXPathString("string(@string)", ctxt); + if (!string) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing vendor string for CPU vendor %s"), vendor->name); + goto ignore; + } + if (strlen(string) != VENDOR_STRING_LENGTH) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid CPU vendor string '%s'"), string); + goto ignore; + } + + vendor->cpuid.function = 0; + vendor->cpuid.ebx = (string[0] ) | + (string[1] << 8) | + (string[2] << 16) | + (string[3] << 24); + vendor->cpuid.edx = (string[4] ) | + (string[5] << 8) | + (string[6] << 16) | + (string[7] << 24); + vendor->cpuid.ecx = (string[8] ) | + (string[9] << 8) | + (string[10] << 16) | + (string[11] << 24); + + if (!map->vendors) + map->vendors = vendor; + else { + vendor->next = map->vendors; + map->vendors = vendor; + } + +out: + VIR_FREE(string); + + return ret; + +no_memory: + virReportOOMError(); + ret = -1; +ignore: + x86VendorFree(vendor); + goto out; +} + + +static void x86FeatureFree(struct x86_feature *feature) { if (feature == NULL) @@ -389,9 +565,8 @@ x86FeatureFind(const struct x86_map *map, static int x86FeatureLoad(xmlXPathContextPtr ctxt, - void *data) + struct x86_map *map) { - struct x86_map *map = data; xmlNodePtr *nodes = NULL; xmlNodePtr ctxt_node = ctxt->node; struct x86_feature *feature = NULL; @@ -500,6 +675,7 @@ x86ModelCopy(const struct x86_model *model) return NULL; } + copy->vendor = model->vendor; copy->ncpuid = model->ncpuid; for (i = 0; i < model->ncpuid; i++) copy->cpuid[i] = model->cpuid[i]; @@ -788,11 +964,11 @@ x86ModelCompare(const struct x86_model *model1, static int x86ModelLoad(xmlXPathContextPtr ctxt, - void *data) + struct x86_map *map) { - struct x86_map *map = data; xmlNodePtr *nodes = NULL; struct x86_model *model = NULL; + char *vendor = NULL; int ret = 0; int i; int n; @@ -832,11 +1008,22 @@ x86ModelLoad(xmlXPathContextPtr ctxt, if (VIR_ALLOC_N(model->cpuid, ancestor->ncpuid) < 0) goto no_memory; + model->vendor = ancestor->vendor; model->ncpuid = ancestor->ncpuid; memcpy(model->cpuid, ancestor->cpuid, sizeof(*model->cpuid) * model->ncpuid); } + vendor = virXPathString("string(./vendor/@name)", ctxt); + if (vendor) { + if (!(model->vendor = x86VendorFind(map, vendor))) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown vendor %s referenced by CPU model %s"), + vendor, model->name); + goto ignore; + } + } + n = virXPathNodeSet("./feature", ctxt, &nodes); if (n < 0) goto ignore; @@ -872,6 +1059,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt, } out: + VIR_FREE(vendor); VIR_FREE(nodes); return ret; @@ -907,6 +1095,28 @@ x86MapFree(struct x86_map *map) } +static int +x86MapLoadCallback(enum cpuMapElement element, + xmlXPathContextPtr ctxt, + void *data) +{ + struct x86_map *map = data; + + switch (element) { + case CPU_MAP_ELEMENT_VENDOR: + return x86VendorLoad(ctxt, map); + case CPU_MAP_ELEMENT_FEATURE: + return x86FeatureLoad(ctxt, map); + case CPU_MAP_ELEMENT_MODEL: + return x86ModelLoad(ctxt, map); + case CPU_MAP_ELEMENT_LAST: + break; + } + + return 0; +} + + static struct x86_map * x86LoadMap(void) { @@ -917,9 +1127,7 @@ x86LoadMap(void) return NULL; } - if (cpuMapLoad("x86", - x86FeatureLoad, map, - x86ModelLoad, map) < 0) + if (cpuMapLoad("x86", x86MapLoadCallback, map) < 0) goto error; return map; @@ -965,6 +1173,13 @@ x86Compute(virCPUDefPtr host, } } + if (cpu->vendor && + (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { + VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", + cpu->vendor); + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + if (!(map = x86LoadMap()) || !(host_model = x86ModelFromCPU(host, map, 0)) || !(cpu_force = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORCE)) || @@ -1117,6 +1332,15 @@ x86Decode(virCPUDefPtr cpu, if (!(cpuCandidate = x86DataToCPU(data, candidate, map))) goto out; + if (candidate->vendor && cpuCandidate->vendor && + STRNEQ(candidate->vendor->name, cpuCandidate->vendor)) { + VIR_DEBUG("CPU vendor %s of model %s differs from %s; ignoring", + candidate->vendor->name, candidate->name, + cpuCandidate->vendor); + virCPUDefFree(cpuCandidate); + goto next; + } + if (cpu->type == VIR_CPU_TYPE_HOST) { cpuCandidate->type = VIR_CPU_TYPE_HOST; for (i = 0; i < cpuCandidate->nfeatures; i++) { @@ -1154,6 +1378,7 @@ x86Decode(virCPUDefPtr cpu, } cpu->model = cpuModel->model; + cpu->vendor = cpuModel->vendor; cpu->nfeatures = cpuModel->nfeatures; cpu->features = cpuModel->features; VIR_FREE(cpuModel); @@ -1194,7 +1419,8 @@ x86Encode(const virCPUDefPtr cpu, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden) + union cpuData **forbidden, + union cpuData **vendor) { struct x86_map *map = NULL; union cpuData *data_forced = NULL; @@ -1202,6 +1428,7 @@ x86Encode(const virCPUDefPtr cpu, union cpuData *data_optional = NULL; union cpuData *data_disabled = NULL; union cpuData *data_forbidden = NULL; + union cpuData *data_vendor = NULL; int ret = -1; if ((map = x86LoadMap()) == NULL) @@ -1237,6 +1464,23 @@ x86Encode(const virCPUDefPtr cpu, goto error; } + if (vendor) { + const struct x86_vendor *v = NULL; + + if (cpu->vendor && !(v = x86VendorFind(map, cpu->vendor))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("CPU vendor %s not found"), cpu->vendor); + goto error; + } + + if (v && + (VIR_ALLOC(data_vendor) < 0 || + x86DataAddCpuid(data_vendor, &v->cpuid) < 0)) { + virReportOOMError(); + goto error; + } + } + if (forced) *forced = data_forced; if (required) @@ -1247,6 +1491,8 @@ x86Encode(const virCPUDefPtr cpu, *disabled = data_disabled; if (forbidden) *forbidden = data_forbidden; + if (vendor) + *vendor = data_vendor; ret = 0; @@ -1261,6 +1507,7 @@ error: x86DataFree(data_optional); x86DataFree(data_disabled); x86DataFree(data_forbidden); + x86DataFree(data_vendor); goto cleanup; } @@ -1358,6 +1605,8 @@ x86Baseline(virCPUDefPtr *cpus, union cpuData *data = NULL; virCPUDefPtr cpu = NULL; unsigned int i; + const struct x86_vendor *vendor = NULL; + struct x86_model *model = NULL; if (!(map = x86LoadMap())) goto error; @@ -1371,13 +1620,49 @@ x86Baseline(virCPUDefPtr *cpus, cpu->type = VIR_CPU_TYPE_GUEST; cpu->match = VIR_CPU_MATCH_EXACT; + if (cpus[0]->vendor && + !(vendor = x86VendorFind(map, cpus[0]->vendor))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("Unknown CPU vendor %s"), cpus[0]->vendor); + goto error; + } + for (i = 1; i < ncpus; i++) { - struct x86_model *model; + const char *vn = NULL; + if (!(model = x86ModelFromCPU(cpus[i], map, 0))) goto error; + if (cpus[i]->vendor && model->vendor && + STRNEQ(cpus[i]->vendor, model->vendor->name)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("CPU vendor %s of model %s differs from vendor %s"), + model->vendor->name, model->name, cpus[i]->vendor); + goto error; + } + + if (cpus[i]->vendor) + vn = cpus[i]->vendor; + else if (model->vendor) + vn = model->vendor->name; + + if (vn) { + if (!vendor) { + if (!(vendor = x86VendorFind(map, vn))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("Unknown CPU vendor %s"), vn); + goto error; + } + } else if (STRNEQ(vendor->name, vn)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("CPU vendors do not match")); + goto error; + } + } + x86ModelIntersect(base_model, model); x86ModelFree(model); + model = NULL; } if (!(data = x86DataFromModel(base_model))) @@ -1389,6 +1674,9 @@ x86Baseline(virCPUDefPtr *cpus, goto error; } + if (vendor && x86DataAddCpuid(data, &vendor->cpuid) < 0) + goto no_memory; + if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; @@ -1404,6 +1692,7 @@ cleanup: no_memory: virReportOOMError(); error: + x86ModelFree(model); virCPUDefFree(cpu); cpu = NULL; goto cleanup; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7fee21a..99b1f4e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -83,6 +83,7 @@ virCapsPtr testQemuCapsInit(void) { 0, /* match */ (char *) "x86_64", /* arch */ (char *) "core2duo", /* model */ + (char *) "Intel", /* vendor */ 1, /* sockets */ 2, /* cores */ 1, /* threads */ -- 1.7.1.1

3 8

[libvirt] A problem about live migration of kvm
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status:failed". I don't know why? I hope someone who used this command successfully would help me, thank you.

1 0

[libvirt] [PATCH 0/8]: Revamp virsh error reporting
by Chris Lalancette 19 Jul '10

19 Jul '10

This patch series is related to a discussion Eric Blake and I had a couple of months back[1]. It essentially revamps the way that virsh does error reporting so that errors from more calls are properly reported. More details are in each individual patch. [1] https://www.redhat.com/archives/libvir-list/2010-April/msg00240.html

3 24

Re: [libvirt] [virt-tools-list] Trouble setting Virtual Network
by Cole Robinson 19 Jul '10

19 Jul '10

On 07/15/2010 01:27 PM, Fernando Carvalho wrote: > I'm having trouble setting virtual network. > The debug log is the following: > > --XML dump of the network I'm trying to set-- > > virsh # net-dumpxml net0 > <network> > <name>net0</name> > <uuid>bb909289-700a-87f8-c075-910209d1a2e3</uuid> > <bridge name='virbr0' stp='on' delay='0' /> > <ip address='192.168.100.1' netmask='255.255.255.0'> > <dhcp> > <range start='192.168.100.128' end='192.168.100.254' /> > </dhcp> > </ip> > </network> > > --Error message when I try to startup the network-- > > virsh # net-start net0 > 17:04:48.570: debug : virNetworkLookupByName:5884 : conn=0x9d82658, name=net0 > 17:04:48.570: debug : remoteIO:9802 : Do proc=46 serial=3 length=36 wait=(nil) > 17:04:48.570: debug : remoteIO:9877 : We have the buck 46 0x9d96488 0x9d96488 > 17:04:48.570: debug : remoteIODecodeMessageLength:9233 : Got length, > now need 80 total (76 more) > 17:04:48.570: debug : remoteIOEventLoop:9728 : Giving up the buck 46 > 0x9d96488 (nil) > 17:04:48.570: debug : remoteIO:9908 : All done with our call 46 (nil) 0x9d96488 > 17:04:48.570: debug : virNetworkCreate:6140 : network=0x9d96488 > 17:04:48.570: debug : remoteIO:9802 : Do proc=39 serial=4 length=52 wait=(nil) > 17:04:48.570: debug : remoteIO:9877 : We have the buck 39 0x9d964f0 0x9d964f0 > 17:04:49.022: debug : remoteIODecodeMessageLength:9233 : Got length, > now need 576 total (572 more) > 17:04:49.022: debug : remoteIOEventLoop:9728 : Giving up the buck 39 > 0x9d964f0 (nil) > 17:04:49.022: debug : remoteIO:9908 : All done with our call 39 (nil) 0x9d964f0 > 17:04:49.022: debug : virNetworkGetName:6288 : network=0x9d96488 > error: Failed to start network net0 > 17:04:49.022: debug : virNetworkFree:6228 : network=0x9d96488 > 17:04:49.022: debug : virUnrefNetwork:601 : unref network 0x9d96488 net0 1 > 17:04:49.022: debug : virReleaseNetwork:557 : release network > 0x9d96488 net0 bb909289-700a-87f8-c075-910209d1a2e3 > 17:04:49.022: debug : virReleaseNetwork:571 : unref connection 0x9d82658 2 > error: internal error '/sbin/iptables --table filter --delete INPUT > --in-interface virbr0 --protocol udp --destination-port 69 --jump > ACCEPT' exited with non-zero status 1 and signal 0: iptables: Bad rule > (does a matching rule exist in that chain?). > > -- > > Can someone help me on this? > I'm not sure, but CC'ing libvirt-list. - Cole

2 1

[libvirt] iscsi support?
by Harald Dunkel 19 Jul '10

19 Jul '10

Hi folks, I would like to try out iscsi for virtual block devices. This would be very interesting especially for a migration at run time. Problem is: It still doesn't work :-(. libvirt can login to the iscsi pool, but using virsh vol-list I just get an empty list, even though /dev/disk/by-path shows the expected block devices. There was an old thread on this list describing the procedure: http://www.mail-archive.com/libvir-list@redhat.com/msg06320.html Are there any news about this? I am using libvirt 0.8.1, iet 1.4.20.1 and open-iscsi 2.0.871.3, as included in Debian Testing. Regards Harri

3 7

[libvirt] flaky network on clients/guests machines - please help!
by Horten 18 Jul '10

18 Jul '10

I've set up a redhat ( Linux 2.6.18-194.8.1.el5 #1 SMP Wed Jun 23 10:52:51 EDT 2010 x86_64 x86_64 x86_64 GNU/Linux) box and two virtual hosts (clients/guests). The network on the host is fine, however the clients network is extremely flaky....Sometimes it connects into and out of the client, but sometimes it gives me all sorts of timeout, no route, etc messages....I've tried everything I can think of, turning on dnsmasq, nscd, and adding options single-request in resolv.conf, but nothing seems to work. The client machines are running the same os as the host....Please see below results of running strace on ssh to another machine....(I can ssh to this other machine from the host and from any other machine and at times from the clients)...Any help will be greatly appreciated..... [root@testbedwww ~]# strace ssh phys.lsu.edu execve("/usr/bin/ssh", ["ssh", "phys.lsu.edu"], [/* 22 vars */]) = 0 brk(0) = 0x2acb61bee000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46ece000 uname({sys="Linux", node="testbedwww.phys.lsu.edu", ...}) = 0 access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) open("/etc/ld.so.cache", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=100036, ...}) = 0 mmap(NULL, 100036, PROT_READ, MAP_PRIVATE, 3, 0) = 0x2acb46ecf000 close(3) = 0 open("/usr/lib64/libfipscheck.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\300\n`\2344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=8904, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46ee8000 mmap(NULL, 2102008, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb470cf000 mprotect(0x2acb470d1000, 2093056, PROT_NONE) = 0 mmap(0x2acb472d0000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x2acb472d0000 close(3) = 0 open("/lib64/libcrypto.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200\232\345\2404\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1366272, ...}) = 0 mmap(NULL, 3475344, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb472d1000 mprotect(0x2acb473fe000, 2093056, PROT_NONE) = 0 mmap(0x2acb475fd000, 135168, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x12c000) = 0x2acb475fd000 mmap(0x2acb4761e000, 14224, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4761e000 close(3) = 0 open("/lib64/libutil.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200\16\300\2514\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=18152, ...}) = 0 mmap(NULL, 2105616, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb47622000 mprotect(0x2acb47624000, 2093056, PROT_NONE) = 0 mmap(0x2acb47823000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x2acb47823000 close(3) = 0 open("/usr/lib64/libz.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\320\37 \2354\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=85928, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb47825000 mmap(NULL, 2178920, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb47826000 mprotect(0x2acb4783a000, 2093056, PROT_NONE) = 0 mmap(0x2acb47a39000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x13000) = 0x2acb47a39000 close(3) = 0 open("/lib64/libnsl.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240@ \2374\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=114352, ...}) = 0 mmap(NULL, 2194096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb47a3a000 mprotect(0x2acb47a4f000, 2093056, PROT_NONE) = 0 mmap(0x2acb47c4e000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14000) = 0x2acb47c4e000 mmap(0x2acb47c50000, 6832, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb47c50000 close(3) = 0 open("/lib64/libcrypt.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360\t\300\2544\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=48600, ...}) = 0 mmap(NULL, 2322880, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb47c52000 mprotect(0x2acb47c5b000, 2093056, PROT_NONE) = 0 mmap(0x2acb47e5a000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x8000) = 0x2acb47e5a000 mmap(0x2acb47e5c000, 184768, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb47e5c000 close(3) = 0 open("/lib64/libresolv.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\2402`\2414\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=92736, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb47e8a000 mmap(NULL, 2181864, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb47e8b000 mprotect(0x2acb47e9c000, 2097152, PROT_NONE) = 0 mmap(0x2acb4809c000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x11000) = 0x2acb4809c000 mmap(0x2acb4809e000, 6888, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4809e000 close(3) = 0 open("/usr/lib64/libgssapi_krb5.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\0\222\240\2454\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=190976, ...}) = 0 mmap(NULL, 2283888, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb480a0000 mprotect(0x2acb480cc000, 2097152, PROT_NONE) = 0 mmap(0x2acb482cc000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2c000) = 0x2acb482cc000 close(3) = 0 open("/usr/lib64/libkrb5.so.3", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`\221!\2424\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=613896, ...}) = 0 mmap(NULL, 2706624, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb482ce000 mprotect(0x2acb4835f000, 2097152, PROT_NONE) = 0 mmap(0x2acb4855f000, 16384, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x91000) = 0x2acb4855f000 close(3) = 0 open("/usr/lib64/libk5crypto.so.3", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260V\340\2454\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=153624, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb48563000 mmap(NULL, 2247432, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb48564000 mprotect(0x2acb48588000, 2093056, PROT_NONE) = 0 mmap(0x2acb48787000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x23000) = 0x2acb48787000 close(3) = 0 open("/lib64/libcom_err.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\320\n\240\2414\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=10000, ...}) = 0 mmap(NULL, 2103048, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb48789000 mprotect(0x2acb4878b000, 2093056, PROT_NONE) = 0 mmap(0x2acb4898a000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x2acb4898a000 close(3) = 0 open("/usr/lib64/libnss3.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\203\301\2574\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1230520, ...}) = 0 mmap(NULL, 3329096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb4898b000 mprotect(0x2acb48ab1000, 2093056, PROT_NONE) = 0 mmap(0x2acb48cb0000, 28672, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x125000) = 0x2acb48cb0000 mmap(0x2acb48cb7000, 3144, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb48cb7000 close(3) = 0 open("/lib64/libc.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\220\332!\2344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1717800, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb48cb8000 mmap(NULL, 3498328, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb48cb9000 mprotect(0x2acb48e07000, 2093056, PROT_NONE) = 0 mmap(0x2acb49006000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x14d000) = 0x2acb49006000 mmap(0x2acb4900b000, 16728, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4900b000 close(3) = 0 open("/usr/lib64/libplc4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0p\23\0\2604\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=18024, ...}) = 0 mmap(NULL, 2110936, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49010000 mprotect(0x2acb49014000, 2093056, PROT_NONE) = 0 mmap(0x2acb49213000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x3000) = 0x2acb49213000 close(3) = 0 open("/lib64/libdl.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\20\16\240\2344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=23360, ...}) = 0 mmap(NULL, 2109696, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49214000 mprotect(0x2acb49216000, 2097152, PROT_NONE) = 0 mmap(0x2acb49416000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x2acb49416000 close(3) = 0 open("/usr/lib64/libkrb5support.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\200\"\240\2434\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=35728, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb49418000 mmap(NULL, 2128592, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49419000 mprotect(0x2acb49421000, 2093056, PROT_NONE) = 0 mmap(0x2acb49620000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x2acb49620000 close(3) = 0 open("/lib64/libkeyutils.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`\v \2434\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=9728, ...}) = 0 mmap(NULL, 2102672, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49621000 mprotect(0x2acb49623000, 2093056, PROT_NONE) = 0 mmap(0x2acb49822000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x2acb49822000 close(3) = 0 open("/usr/lib64/libnssutil3.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@\203@\2574\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=122184, ...}) = 0 mmap(NULL, 2216376, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49823000 mprotect(0x2acb4983c000, 2093056, PROT_NONE) = 0 mmap(0x2acb49a3b000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x18000) = 0x2acb49a3b000 mmap(0x2acb49a40000, 440, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb49a40000 close(3) = 0 open("/usr/lib64/libplds4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\20\16\0\2574\0\0\0"..., 832) = 832 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb49a41000 fstat(3, {st_mode=S_IFREG|0755, st_size=13800, ...}) = 0 mmap(NULL, 2106736, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49a42000 mprotect(0x2acb49a45000, 2093056, PROT_NONE) = 0 mmap(0x2acb49c44000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x2acb49c44000 close(3) = 0 open("/usr/lib64/libnspr4.so", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0000\317\200\2574\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=233144, ...}) = 0 mmap(NULL, 2336608, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49c45000 mprotect(0x2acb49c7b000, 2097152, PROT_NONE) = 0 mmap(0x2acb49e7b000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x36000) = 0x2acb49e7b000 mmap(0x2acb49e7d000, 10080, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb49e7d000 close(3) = 0 open("/lib64/libpthread.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240W\340\2344\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=145824, ...}) = 0 mmap(NULL, 2204528, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb49e80000 mprotect(0x2acb49e96000, 2093056, PROT_NONE) = 0 mmap(0x2acb4a095000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x15000) = 0x2acb4a095000 mmap(0x2acb4a097000, 13168, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4a097000 close(3) = 0 open("/lib64/libselinux.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0`E\340\2354\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=95464, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb4a09b000 mmap(NULL, 2192784, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb4a09c000 mprotect(0x2acb4a0b1000, 2097152, PROT_NONE) = 0 mmap(0x2acb4a2b1000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x15000) = 0x2acb4a2b1000 mmap(0x2acb4a2b3000, 1424, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4a2b3000 close(3) = 0 open("/lib64/libsepol.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@=\240\2354\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=247496, ...}) = 0 mmap(NULL, 2383168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb4a2b4000 mprotect(0x2acb4a2ef000, 2097152, PROT_NONE) = 0 mmap(0x2acb4a4ef000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x3b000) = 0x2acb4a4ef000 mmap(0x2acb4a4f0000, 40256, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x2acb4a4f0000 close(3) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb4a4fa000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb4a4fb000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb4a4fc000 arch_prctl(ARCH_SET_FS, 0x2acb4a4fbd00) = 0 mprotect(0x2acb4a095000, 4096, PROT_READ) = 0 mprotect(0x2acb49416000, 4096, PROT_READ) = 0 mprotect(0x2acb49006000, 16384, PROT_READ) = 0 mprotect(0x2acb4809c000, 4096, PROT_READ) = 0 mprotect(0x2acb47e5a000, 4096, PROT_READ) = 0 mprotect(0x2acb47c4e000, 4096, PROT_READ) = 0 mprotect(0x2acb47823000, 4096, PROT_READ) = 0 mprotect(0x2acb470cd000, 4096, PROT_READ) = 0 munmap(0x2acb46ecf000, 100036) = 0 set_tid_address(0x2acb4a4fbd90) = 3475 set_robust_list(0x2acb4a4fbda0, 0x18) = 0 futex(0x7fff3317641c, FUTEX_WAKE_PRIVATE, 1) = 0 rt_sigaction(SIGRTMIN, {0x2acb49e85380, [], SA_RESTORER|SA_SIGINFO, 0x2acb49e8eb10}, NULL, 8) = 0 rt_sigaction(SIGRT_1, {0x2acb49e852b0, [], SA_RESTORER|SA_RESTART|SA_SIGINFO, 0x2acb49e8eb10}, NULL, 8) = 0 rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0 getrlimit(RLIMIT_STACK, {rlim_cur=10240*1024, rlim_max=RLIM_INFINITY}) = 0 access("/etc/selinux/", F_OK) = 0 brk(0) = 0x2acb61bee000 brk(0x2acb61c0f000) = 0x2acb61c0f000 open("/etc/selinux/config", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=448, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46ecf000 read(3, "# This file controls the state o"..., 4096) = 448 read(3, "", 4096) = 0 close(3) = 0 munmap(0x2acb46ecf000, 4096) = 0 open("/proc/mounts", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0444, st_size=0, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46ecf000 read(3, "rootfs / rootfs rw 0 0\n/dev/root"..., 4096) = 577 close(3) = 0 munmap(0x2acb46ecf000, 4096) = 0 open("/selinux/mls", O_RDONLY) = 3 read(3, "1", 19) = 1 close(3) = 0 socket(PF_FILE, SOCK_STREAM, 0) = 3 connect(3, {sa_family=AF_FILE, path="/var/run/setrans/.setrans-unix"...}, 110) = 0 sendmsg(3, {msg_name(0)=NULL, msg_iov(5)=[{"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\0", 1}, {"\0", 1}], msg_controllen=0, msg_flags=0}, MSG_NOSIGNAL) = 14 readv(3, [{"\1\0\0\0", 4}, {"\1\0\0\0", 4}, {"\0\0\0\0", 4}], 3) = 12 readv(3, [{"\0", 1}], 1) = 1 close(3) = 0 open("/dev/null", O_RDWR) = 3 close(3) = 0 open("/proc/sys/crypto/fips_enabled", O_RDONLY) = 3 read(3, "0\n", 2) = 2 close(3) = 0 getuid() = 0 geteuid() = 0 setresuid(-1, 0, -1) = 0 socket(PF_FILE, SOCK_STREAM, 0) = 3 fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0 connect(3, {sa_family=AF_FILE, path="/var/run/nscd/socket"...}, 110) = 0 sendto(3, "\2\0\0\0\v\0\0\0\7\0\0\0passwd\0", 19, MSG_NOSIGNAL, NULL, 0) = 19 poll([{fd=3, events=POLLIN|POLLERR|POLLHUP}], 1, 5000) = 1 ([{fd=3, revents=POLLIN|POLLHUP}]) recvmsg(3, {msg_name(0)=NULL, msg_iov(2)=[{"passwd\0", 7}, {"\270O\3\0\0\0\0\0", 8}], msg_controllen=24, {cmsg_len=20, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, {4}}, msg_flags=0}, 0) = 15 mmap(NULL, 217016, PROT_READ, MAP_SHARED, 4, 0) = 0x2acb46ee9000 close(4) = 0 close(3) = 0 umask(022) = 022 ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 open("/root/.ssh/config", O_RDONLY) = -1 ENOENT (No such file or directory) open("/etc/ssh/ssh_config", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=1827, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46f1e000 read(3, "#\t$OpenBSD: ssh_config,v 1.21 20"..., 4096) = 1827 read(3, "", 4096) = 0 close(3) = 0 munmap(0x2acb46f1e000, 4096) = 0 open("/dev/urandom", O_RDONLY|O_NOCTTY|O_NONBLOCK) = 3 fstat(3, {st_mode=S_IFCHR|0444, st_rdev=makedev(1, 9), ...}) = 0 poll([{fd=3, events=POLLIN}], 1, 10) = 1 ([{fd=3, revents=POLLIN}]) read(3, "^\266\301\227\n!\340\267\216\317\327\204\231\247\357\224\10Q\332\227PjE5\310\6\246\273\371\225\332f"..., 48) = 48 close(3) = 0 getuid() = 0 open("/etc/nsswitch.conf", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=1696, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46f1e000 read(3, "#\n# /etc/nsswitch.conf\n#\n# An ex"..., 4096) = 1696 read(3, "", 4096) = 0 close(3) = 0 munmap(0x2acb46f1e000, 4096) = 0 open("/etc/ld.so.cache", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=100036, ...}) = 0 mmap(NULL, 100036, PROT_READ, MAP_PRIVATE, 3, 0) = 0x2acb46f1e000 close(3) = 0 open("/lib64/libnss_files.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\37\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=53880, ...}) = 0 mmap(NULL, 2139432, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x2acb4a4fd000 mprotect(0x2acb4a507000, 2093056, PROT_NONE) = 0 mmap(0x2acb4a706000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x9000) = 0x2acb4a706000 close(3) = 0 mprotect(0x2acb4a706000, 4096, PROT_READ) = 0 munmap(0x2acb46f1e000, 100036) = 0 open("/etc/services", O_RDONLY) = 3 fcntl(3, F_GETFD) = 0 fcntl(3, F_SETFD, FD_CLOEXEC) = 0 fstat(3, {st_mode=S_IFREG|0644, st_size=362031, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2acb46f1e000 read(3, "# /etc/services:\n# $Id: services"..., 4096) = 4096 close(3) = 0 munmap(0x2acb46f1e000, 4096) = 0 socket(PF_FILE, SOCK_STREAM, 0) = 3 fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0 connect(3, {sa_family=AF_FILE, path="/var/run/nscd/socket"...}, 110) = 0 sendto(3, "\2\0\0\0\r\0\0\0\6\0\0\0hosts\0", 18, MSG_NOSIGNAL, NULL, 0) = 18 poll([{fd=3, events=POLLIN|POLLERR|POLLHUP}], 1, 5000) = 1 ([{fd=3, revents=POLLIN|POLLHUP}]) recvmsg(3, {msg_name(0)=NULL, msg_iov(2)=[{"hosts\0", 6}, {"\270O\3\0\0\0\0\0", 8}], msg_controllen=24, {cmsg_len=20, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, {4}}, msg_flags=0}, 0) = 14 mmap(NULL, 217016, PROT_READ, MAP_SHARED, 4, 0) = 0x2acb46f1e000 close(4) = 0 close(3) = 0 socket(PF_INET, SOCK_STREAM, IPPROTO_TCP) = 3 connect(3, {sa_family=AF_INET, sin_port=htons(22), sin_addr=inet_addr("130.39.13.67")}, 16) = -1 EHOSTUNREACH (No route to host) close(3) = 0 write(2, "ssh: connect to host phys.lsu.ed"..., 61ssh: connect to host phys.lsu.edu port 22: No route to host ) = 61 exit_group(255) = ? [root@testbedwww ~]#

1 0

[libvirt] Memory
by Jaromír Červenka 17 Jul '10

17 Jul '10

Hello, Could anybody explain me a little bit what is the difference between <currentMemory> and <maxMemory>. I use qemu-kvm hypervisor*. *When I have 1024MB maxMemory and 512MB of currentMemory, I can see just 512MB in guest os (free -m).* *Is it ok? Does it have something to do with ballooning technique? What happened if guest will needs more memory than 512MB? Thank you for answers :) Kind regards, Jaromír Červenka Official openSUSE community member Web: http://www.cervajz.com/ Jabber: cervajz(a)cervajz.com MSN: jara.cervenka(a)seznam.cz Tel.: +420 607 592 687 Alt. e-mails: jaromir.cervenka(a)opensuse.org, jaromir.cervenka(a)speel.cz

2 3

[libvirt] [PATCH] libvirtd: add man page for libvirtd
by Justin Clift 17 Jul '10

17 Jul '10

From: Justin Clift <justin(a)salasaga.org> Gracious thanks to Chris Lalancette for helping knock the description section into shape. This addresses BZ #595350 https://bugzilla.redhat.com/show_bug.cgi?id=595350 --- daemon/Makefile.am | 40 +++++++++++- daemon/libvirtd.pod.in | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+), 1 deletions(-) create mode 100644 daemon/libvirtd.pod.in diff --git a/daemon/Makefile.am b/daemon/Makefile.am index df34ef1..332e895 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -32,9 +32,12 @@ EXTRA_DIST = \ THREADING.txt \ libvirt-guests.init.in \ libvirt-guests.sysconf \ + libvirtd.pod.in \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) +man_MANS = libvirtd.8 + BUILT_SOURCES = if WITH_LIBVIRTD @@ -50,6 +53,41 @@ augeas_DATA = libvirtd.aug augeastestsdir = $(datadir)/augeas/lenses/tests augeastests_DATA = test_libvirtd.aug +POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" -s 8 + +if WITH_REMOTE +libvirtd.pod: libvirtd.pod.in + sed \ + -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \ + -e 's![@]localstatedir[@]!$(localstatedir)!g' \ + -e 's![@]tls_line1[@]!=item F<$(sysconfdir)/pki/CA/cacert.pem>!g' \ + -e 's![@]tls_line2[@]!The TLS B<Certificate Authority> certificate libvirtd will use.!g' \ + -e 's![@]tls_line3[@]!=item F<$(sysconfdir)/pki/libvirt/servercert.pem>!g' \ + -e 's![@]tls_line4[@]!The TLS B<Server> certificate libvirtd will use.!g' \ + -e 's![@]tls_line5[@]!=item F<$(sysconfdir)/pki/libvirt/private/serverkey.pem>!g' \ + -e 's![@]tls_line6[@]!The TLS B<Server> private key libvirtd will use.!g' \ + -e 's![@]remote_pid_file[@]!$(REMOTE_PID_FILE)!g' \ + < $< > $@-t + mv $@-t $@ +else +libvirtd.pod: libvirtd.pod.in + sed \ + -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \ + -e 's![@]localstatedir[@]!$(localstatedir)!g' \ + -e 's![@]tls_line1[@]!!g' \ + -e 's![@]tls_line2[@]!!g' \ + -e 's![@]tls_line3[@]!!g' \ + -e 's![@]tls_line4[@]!!g' \ + -e 's![@]tls_line5[@]!!g' \ + -e 's![@]tls_line6[@]!!g' \ + -e 's![@]remote_pid_file[@]!$(REMOTE_PID_FILE)!g' \ + < $< > $@-t + mv $@-t $@ +endif + +libvirtd.8: libvirtd.pod + $(AM_V_GEN)$(POD2MAN) $< $@ + libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L @@ -285,5 +323,5 @@ uninstall-data-sasl: endif -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) $(man1_MANS) CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in new file mode 100644 index 0000000..33437c9 --- /dev/null +++ b/daemon/libvirtd.pod.in @@ -0,0 +1,168 @@ +=head1 NAME + +libvirtd - libvirtd management daemon + +=head1 SYNOPSIS + +B<libvirtd> [ -dlv ] [ -f config_file ] [ -p pid_file ] [ -t timeout_seconds ] + +B<libvirtd> --version + +=head1 DESCRIPTION + +The B<libvirtd> program is the server side daemon component of the libvirt +virtualization management system. + +This daemon runs on host servers and performs required management tasks for +virtualized guests. This includes activities such as starting, stopping +and migrating guests between host servers, configuring and manipulating +networking, and managing storage for use by guests. + +The libvirt client libraries and utilities connect to this daemon to issue +tasks and collect information about the configuration and resources of the host +system and guests. + +By default, the libvirtd daemon listens for requests on a local Unix domain +socket. Using the B<-l>|B<--listen> command line option, the libvirtd daemon +can be instructed to additionally listen on a TCP/IP socket. The TCP/IP socket +to use is defined in the libvirtd configuration file. + +Restarting libvirtd does not impact running guests. Guests continue to operate +and will be picked up automatically if their XML configuration has been +defined. Any guests whose XML configuration has not been defined will be lost +from the configuration. + +=head1 OPTIONS + +=over + +=item B<-d, --daemon> + +Run as a daemon & write PID file. + +=item B<-f, --config> I<FILE> + +Use this configuration file, overriding the default value. + +=item B<-l, --listen> + +Listen for TCP/IP connections. + +=item B<-p, --pid-file> I<FILE> + +Use this name for the PID file, overriding the default value. + +=item B<-t, --timeout> I<SECONDS> + +Exit after timeout period (in seconds) expires. + +=item B<-v, --verbose> + +Enable output of verbose messages. + +=item B< --version> + +Display version information then exit. + +=back + +=head1 SIGNALS + +On receipt of B<SIGHUP> libvirtd will reload its configuration. + +=head1 FILES + +=over + +=item F<@sysconfdir@/libvirtd.conf> + +The default configuration file used by libvirtd, unless overridden on the +command line using the B<-f>|B<--config> option. + +=item F<@localstatedir@/run/libvirt/libvirt-sock> + +=item F<@localstatedir@/run/libvirt/libvirt-sock-ro> + +The sockets libvirtd will use when B<run as root>. + +=item F<$HOME/.libvirt/libvirt-sock> + +The socket libvirtd will use when run as a B<non-root> user. + +@tls_line1@ + +@tls_line2@ + +@tls_line3@ + +@tls_line4@ + +@tls_line5@ + +@tls_line6@ + +=item F<@remote_pid_file@> + +The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. + +=back + +=head1 EXAMPLES + +To retrieve the version of libvirtd: + + # libvirtd --version + libvirtd (libvirt) 0.8.2 + # + +To start libvirtd, instructing it to daemonize and create a PID file: + + # libvirtd -d + # ls -la @remote_pid_file@ + -rw-r--r-- 1 root root 6 Jul 9 02:40 @remote_pid_file@ + # + +=head1 BUGS + +Please report all bugs you discover. This should be done via either: + +=over + +=item a) the mailing list + +L<http://libvirt.org/contact.html> + +=item or, + +B<> + +=item b) the bug tracker + +L<http://libvirt.org/bugs.html> + +=item Alternatively, you may report bugs to your software distributor / vendor. + +=back + +=head1 AUTHORS + + Andrew Puch <apuch @ redhat.com> + Daniel Veillard <veillard @ redhat.com> + +=head1 COPYRIGHT + +Copyright (C) 2010 Red Hat, Inc. + +=head1 LICENSE + +libvirtd is distributed under the terms of the GNU LGPL v2.1+. +This is free software; see the source for copying conditions. There +is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE + +=head1 SEE ALSO + +L<virsh(1)>, L<virt-install(1)>, L<virt-xml-validate(1)>, L<virt-top(1)>, +L<virt-mem(1)>, L<virt-df(1)>, L<http://www.libvirt.org/> + +=cut -- 1.7.1

4 17

[libvirt] FYI; pushed trivial patch
by Chris Lalancette 16 Jul '10

16 Jul '10

I've pushed the attached trivial patch to fix the compile on i686. -- Chris Lalancette

1 0

[libvirt] [PATCH] docs: remove all generated doc files when a clean target is used
by Justin Clift 16 Jul '10

16 Jul '10

Properly removes all of the generated .html and .xml files in the docs area with make clean and make maintainer-clean. Otherwise they're just left there and get in the way when working on docs. --- docs/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index a6a6d07..463a466 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -150,10 +150,10 @@ $(python_generated_files): $(srcdir)/apibuild.py \ check-local: all clean-local: - rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html + rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html html/index.html \ + $(devhelphtml) $(python_generated_files) maintainer-clean-local: clean-local - rm -rf libvirt-api.xml libvirt-refs.xml rebuild: api all -- 1.7.1.1

1 0

[libvirt] [RFC] Slides for FISL presentation
by Eduardo Otubo 16 Jul '10

16 Jul '10

Hello all, This is the first draft for my presentation at FISL. I would like you to take a look and give your opinions. Any comment is always welcome :-) Thank you! https://docs.google.com/leaf?id=0B67FxRV5aa7_YWI4YzQ2MWQtZWQwYi00NjE0LWEyZD… ps.: I didn't know where to put the file, I hosted at google docs and made it public. You all should be able to download it. Any issues, please let me know. Thanks again. -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

2 2

[libvirt] where is "virsh pool-stop"?
by Harald Dunkel 15 Jul '10

15 Jul '10

Hi folks, Suggestion: "virsh pool-destroy" sounds highly destructive. There is a "pool-start" command, so how about "pool-stop"? Similar commands could be introduced for the other *-start commands. This would make using virsh _much_ easier. In Unix world "start" and "stop" belong together, "start" and "destroy" don't. Regards Harri

5 4

[libvirt] Segfault in virDomainObjListSearchName when listing domains (qemu backend)
by Guido Winkelmann 15 Jul '10

15 Jul '10

Hi, I'm seeing a crash in libvirt when trying to list all domains using virsh. Here's the backtrace: ===================== Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffeebfd710 (LWP 1691)] 0x00007ffff7411746 in __strcmp_sse42 () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install openssl-1.0.0a-1.fc12.x86_64 (gdb) bt #0 0x00007ffff7411746 in __strcmp_sse42 () from /lib64/libc.so.6 #1 0x00007ffff7ac9d79 in virDomainObjListSearchName (payload=0x73fdd0, name=<value optimized out>, data=0x7fffdc0008c0) at conf/domain_conf.c:367 #2 0x00007ffff7ab476e in virHashSearch (table=0x6f9c30, iter=0x7ffff7ac9d50 <virDomainObjListSearchName>, data=0x7fffdc0008c0) at util/hash.c:582 #3 0x00007ffff7ac9d33 in virDomainFindByName (doms=<value optimized out>, name=0x7fffdc0008c0 "basiccentos54image") at conf/domain_conf.c:377 #4 0x00000000004430f6 in qemudDomainLookupByName (conn=0x7fffe8000a80, name=0x7fffdc0008c0 "basiccentos54image") at qemu/qemu_driver.c:4166 #5 0x00007ffff7af95cd in virDomainLookupByName (conn=0x7fffe8000a80, name=0x7fffdc0008c0 "basiccentos54image") at libvirt.c:2169 #6 0x0000000000423e64 in remoteDispatchDomainLookupByName (server=<value optimized out>, client=<value optimized out>, conn=0x7fffe8000a80, hdr=<value optimized out>, rerr=0x7fffeebfcc70, args=<value optimized out>, ret=0x7fffeebfcbc0) at remote.c:2030 #7 0x0000000000426a91 in remoteDispatchClientCall (server=<value optimized out>, client=0x7ffff0001300, msg=0x7ffff0041570) at dispatch.c:506 #8 0x0000000000426e43 in remoteDispatchClientRequest (server=0x6e3cd0, client=0x7ffff0001300, msg=0x7ffff0041570) at dispatch.c:388 #9 0x0000000000417ed8 in qemudWorker (data=0x7ffff0000908) at libvirtd.c:1568 #10 0x00007ffff7878a3a in start_thread () from /lib64/libpthread.so.0 #11 0x00007ffff73d377d in clone () from /lib64/libc.so.6 #12 0x0000000000000000 in ?? () (gdb) ===================== This is with the newest version from git, pulled about 30 minutes ago. This happens when I try to start up one of the defined domains using either libvirt or virsh and then try to list all the defined domains in virsh using list --all. The attempt to start one of the domains already fails with the following output: ===================== virsh # start testserver-a error: Failed to start domain testserver-a error: internal error process exited while connecting to monitor: 17:21:14.760: debug : virCgroupNew:542 : New group /libvirt/qemu/testserver-a 17:21:14.760: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /mnt/cgroups/cpu in /sysdefault 17:21:14.760: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /mnt/cgroups/cpuacct in /sysdefault 17:21:14.760: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /mnt/cgroups/memory in /sysdefault 17:21:14.760: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /mnt/cgroups/devices in /sysdefault 17:21:14.760: debug : virCgroupMakeGroup:484 : Make group /libvirt/qemu/testserver-a 17:21:14.760: debug : virCgroupMakeGroup:496 : Make controller /mnt/cgroups/cpu/sysdefault/libvirt/qemu/testserver-a/ 17:21:14.760: debug : virCgroupMakeGroup:496 : Make controller /mnt/cgroups/cpuacct/sysdefault/libvirt/qemu/testserver-a/ 17:21:14.760: debug : virCgroupMakeGroup:496 : Make controller /mnt/cgroups/memory/sysdefault/libvirt/qemu/testserver-a/ ===================== This happens with all the domains I have currently defined. Calling list --all before that produces no problems. Calling list --all after that always produces said crash. qemu is qemu-kvm 0.12.4, built from sources. The host system is a Fedora 12 install. Guido

2 12

[libvirt] [PATCH 00/11] CVE: Multiple flaws in disk handling
by Daniel P. Berrange 15 Jul '10

15 Jul '10

This patch series attempts to fix 3 security flaws in the handling of virtual disk formats. This is just another occurrance of the problem previously identified in Xen https://www.redhat.com/security/data/cve/CVE-2008-2004.html In essence, if a guest is configured with a disk, hda, backed in the host by a plain file, then admin in the guest OS can run 'qemu-img -f qcow2 /dev/hda' to write a qcow2 header into the disk. If the host OS ever probes the backing file to identify its format, then it will see it as a qcow2 file now, instead of the expected raw. In QEMU this problem is addressed in two ways - When configuring a guest with -drive, always set format=raw|qcow2|etc Libvirt will always set this when <driver type='raw|qcow2|etc'> is set for a disk. - When creating a qcow2 guest, always set an explicit backing store format with -o backing_store_format=raw|qcow2|etc or -F raw|qcow2|etc. Libvirt will always set this when a <format type='raw|qcow2'/> is set for a volume backing store Despite having support for these QEMU features to prevent probing, there are flaws in the way libvirt handles disks in various places. - In the security drivers (SELinux, CGroups, DAC) when labelling files on the host, instead of looking at the <driver type='raw|qcow2'/> in the XML to identify the disk format, libvirt probes the file for magic data. Thus even if the app has taken the care to set an explicit format, for all disks, libvirt can be tricked into setting security labels on files that it shouldn't. If the guest OS somehow manages to break out and compromise QEMU it can take advantage of this labelling flaw to access files it shouldn't. - In the security drivers (SELinux, CGroups, DAC) when labelling the backing store for files on the host, instead of looking at embedded backing store format in the master disk image, libvirt probes magic data. Thus even if the app has taken the care to set an explicit format, for all disk backing stores, libvirt can be tricked into setting security labels on files that it shouldn't. If the guest OS somehow manages to break out and compromise QEMU it can take advantage of this labelling flaw to access files it shouldn't. - In the storage driver that creates qcow2 files, the backing store format is only set explicitly if the kvm-img binary is found. Any users with just a qemu-img binary will not have the backing store format set, even if qemu-img supports this capability. As a general matter of policy, libvirt does not mandate use of the <driver type='raw|qcow2'/> tag in the XML for disks, and if omitted will allow QEMU to probe disk formats. This is a weak default policy. If no explicit driver is set, libvirt should presume raw, since that is the only safe option. It should require a host level configuration option for the QEMU driver, to allow probing to be used. This patch series addresses all three of the security flaws, and also changes the default QEMU driver policy to disable all disk format probing out of the box. This latter change will break some existing deployments, so it is possible to turn it off in qemu.conf. The changes required significant re-factoring of the util/storage_file.c code and centralizes all processing of disk backing stores to minimise the risk of mistakes. There are also 5 additional test cases to the TCK, 3 to verify the security flaws, and 2 to verify that libvirtd is configured to disallow disk format probing. The file based storage pool needs to report the format of every volume in the pool. There is no way todo this other than to probe the volume metadata. Unfortunately if an application like virt-manager directly copies the <format> from the storage volume XML, straight into the <driver type=> of the guest disk, all our work to avoid the security problems is potentially null & void. NB, this is only a problem if re-using a pre-existing storage volume. If creating a new storage vol when provisioning a guest / hotplugging a disk, virt-manager can trust the storage volume format. I think we need to advise applications that when picking a pre-existing storage volume from a pool, they must not trust the volume format, and must confirm with the user whether to use the probed format, or force to raw The CVEs are https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2010-2237 https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2010-2238 https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2010-2239 In addition, this patch series fixes the problem of mutually recursive backing stores which would cause an infinite loop in libvirtd. Regards, Daniel

2 22

[libvirt] [PATCH 0/2] Explicitly manage balloon devices
by Daniel P. Berrange 15 Jul '10

15 Jul '10

The balloon device is not present in the XML currently. This means we can't track custom PCI addresses for it. This means we can't provide a way for apps to get the same PCI address ordering as found with older QEMU

1 2

[libvirt] [PATCH] Remove inappropriate use of VIR_ERR_NO_SUPPORT
by Daniel P. Berrange 15 Jul '10

15 Jul '10

The VIR_ERR_NO_SUPPORT refers to an API which is not implemented. There is a separate VIR_ERR_CONFIG_UNSUPPORTED for XML config options that are not available with the current hypervisor. * src/qemu/qemu_conf.c, src/qemu/qemu_driver.c: Remove many VIR_ERR_NO_SUPPORT replace with VIR_ERR_CONFIG_UNSUPPORTED --- src/qemu/qemu_conf.c | 18 +++++++++--------- src/qemu/qemu_driver.c | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 1d0bd88..4fee43e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1839,7 +1839,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) ret = virAsprintf(&devname, "xenblk%d", devid); break; default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported disk name mapping for bus '%s'"), virDomainDiskBusTypeToString(disk->bus)); return -1; @@ -3390,7 +3390,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, goto cleanup; if (!ncpus || !host) { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU specification not supported by hypervisor")); goto cleanup; } @@ -3564,7 +3564,7 @@ int qemudBuildCommandLine(virConnectPtr conn, if (migrateFrom) { if (STRPREFIX(migrateFrom, "tcp")) { if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP)) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("TCP migration is not supported with this QEMU binary")); return -1; } @@ -3572,13 +3572,13 @@ int qemudBuildCommandLine(virConnectPtr conn, if (qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC) { migrateFrom = "exec:cat"; } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO)) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("STDIO migration is not supported with this QEMU binary")); return -1; } } else if (STRPREFIX(migrateFrom, "exec")) { if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC)) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("STDIO migration is not supported with this QEMU binary")); return -1; } @@ -4030,7 +4030,7 @@ int qemudBuildCommandLine(virConnectPtr conn, /* QEMU doesn't implement a SATA driver */ if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("SATA is not supported with this QEMU binary")); goto error; } @@ -4386,7 +4386,7 @@ int qemudBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_CHR_TARGET_TYPE_GUESTFWD: if (!(qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) || !(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("guestfwd requires QEMU to support -chardev & -device")); goto error; } @@ -4411,7 +4411,7 @@ int qemudBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_CHR_TARGET_TYPE_VIRTIO: if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio channel requires QEMU to support -device")); goto error; } @@ -4743,7 +4743,7 @@ int qemudBuildCommandLine(virConnectPtr conn, goto error; ADD_ARG(devstr); } else { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("PCI device assignment is not supported by this version of qemu")); goto error; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 96277cd..21ae084 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -809,7 +809,7 @@ getVolumeQcowPassphrase(virConnectPtr conn, enc = disk->encryption; if (!conn) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot find secrets without a connection")); goto cleanup; } @@ -7540,7 +7540,7 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, int vlan; if (!(qemuCmdFlags & QEMUD_CMD_FLAG_HOST_NET_ADD)) { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("installed qemu version does not support host_net_add")); return -1; } @@ -7548,7 +7548,7 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (priv->monConfig->type != VIR_DOMAIN_CHR_TYPE_UNIX) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("network device type '%s' cannot be attached: " "qemu is not using a unix socket monitor"), virDomainNetTypeToString(net->type)); @@ -7559,7 +7559,7 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, return -1; } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { if (priv->monConfig->type != VIR_DOMAIN_CHR_TYPE_UNIX) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("network device type '%s' cannot be attached: " "qemu is not using a unix socket monitor"), virDomainNetTypeToString(net->type)); @@ -7592,7 +7592,7 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, vlan = qemuDomainNetVLAN(net); if (vlan < 0) { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unable to attach network devices without vlan")); goto cleanup; } @@ -7928,7 +7928,7 @@ static int qemudDomainAttachHostDevice(struct qemud_driver *driver, unsigned long long qemuCmdFlags) { if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hostdev mode '%s' not supported"), virDomainHostdevModeTypeToString(hostdev->mode)); return -1; @@ -7970,7 +7970,7 @@ static int qemudDomainAttachHostDevice(struct qemud_driver *driver, break; default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hostdev subsys type '%s' not supported"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); goto error; @@ -8066,7 +8066,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, if (ret == 0) dev->data.disk = NULL; } else { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk bus '%s' cannot be hotplugged."), virDomainDiskBusTypeToString(dev->data.disk->bus)); /* fallthrough */ @@ -8074,7 +8074,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, break; default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device type '%s' cannot be hotplugged"), virDomainDiskDeviceTypeToString(dev->data.disk->device)); /* Fallthrough */ @@ -8091,7 +8091,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, if (ret == 0) dev->data.controller = NULL; } else { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk controller bus '%s' cannot be hotplugged."), virDomainControllerTypeToString(dev->data.controller->type)); /* fallthrough */ @@ -8107,7 +8107,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, if (ret == 0) dev->data.hostdev = NULL; } else { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("device type '%s' cannot be attached"), virDomainDeviceTypeToString(dev->type)); goto endjob; @@ -8296,7 +8296,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk bus '%s' cannot be updated."), virDomainDiskBusTypeToString(dev->data.disk->bus)); break; @@ -8314,7 +8314,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, break; default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device type '%s' cannot be updated"), virDomainDiskDeviceTypeToString(dev->data.disk->device)); break; @@ -8892,7 +8892,7 @@ static int qemudDomainDetachHostDevice(struct qemud_driver *driver, int ret; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hostdev mode '%s' not supported"), virDomainHostdevModeTypeToString(hostdev->mode)); return -1; @@ -8906,7 +8906,7 @@ static int qemudDomainDetachHostDevice(struct qemud_driver *driver, ret = qemudDomainDetachHostUsbDevice(driver, vm, dev, qemuCmdFlags); break; default: - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hostdev subsys type '%s' not supported"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); return -1; @@ -8967,7 +8967,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom, qemuCmdFlags); } else { - qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This type of disk cannot be hot unplugged")); } } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { @@ -8977,7 +8977,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom, ret = qemudDomainDetachPciControllerDevice(driver, vm, dev, qemuCmdFlags); } else { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk controller bus '%s' cannot be hotunplugged."), virDomainControllerTypeToString(dev->data.controller->type)); /* fallthrough */ @@ -8985,7 +8985,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom, } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { ret = qemudDomainDetachHostDevice(driver, vm, dev, qemuCmdFlags); } else { - qemuReportError(VIR_ERR_NO_SUPPORT, + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This type of device cannot be hot unplugged")); } -- 1.7.1.1

1 0

[libvirt] [RFC][PATCH] Fix a deadlock in bi-directional p2p concurrent migration.
by Chris Lalancette 15 Jul '10

15 Jul '10

If you try to execute two concurrent migrations p2p from A->B and B->A, the two libvirtd's will deadlock trying to perform the migrations. The reason for this is that in p2p migration, the libvirtd's are responsible for making the RPC Prepare, Migrate, and Finish calls. However, they are currently holding the driver lock while doing so, which basically guarantees deadlock in this scenario. This patch fixes the situation by adding qemuDomainObjEnterRemoteWithDriver and qemuDomainObjExitRemoteWithDriver helper methods. The Enter take an additional object reference, then drops both the domain object lock and the driver lock. The Exit takes both the driver and domain object lock, then drops the reference. Adding calls to these Enter and Exit helpers around remote calls in the various migration methods seems to fix the problem for me in testing. I *believe* that this makes the situation safe, though I'm not 100% certain. The additional domain object reference ensures that the domain object won't disappear while this operation is happening. The BeginJob that is called inside of qemudDomainMigratePerform ensures that we can't execute a second migrate (or shutdown, or save, etc) job while the migration is active. That being said, my understanding of the locking is still a bit shaky, so I'd like some additional confirmation that this is indeed safe. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f2607c..e81af84 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -531,6 +531,21 @@ static void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virD } } +static void qemuDomainObjEnterRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + virDomainObjRef(obj); + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); +} + +static void qemuDomainObjExitRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + qemuDriverLock(driver); + virDomainObjLock(obj); + virDomainObjUnref(obj); +} static int qemuCgroupControllerActive(struct qemud_driver *driver, int controller) @@ -10753,9 +10768,11 @@ static int doTunnelMigrate(virDomainPtr dom, /* virStreamNew only fails on OOM, and it reports the error itself */ goto cleanup; + qemuDomainObjEnterRemoteWithDriver(driver, vm); internalret = dconn->driver->domainMigratePrepareTunnel(dconn, st, flags, dname, resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (internalret < 0) /* domainMigratePrepareTunnel sets the error for us */ @@ -10833,8 +10850,10 @@ cancel: finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); cleanup: if (client_sock != -1) @@ -10873,16 +10892,20 @@ static int doNonTunnelMigrate(virDomainPtr dom, virDomainPtr ddomain = NULL; int retval = -1; char *uri_out = NULL; + int rc; + qemuDomainObjEnterRemoteWithDriver(driver, vm); /* NB we don't pass 'uri' into this, since that's the libvirtd * URI in this context - so we let dest pick it */ - if (dconn->driver->domainMigratePrepare2(dconn, - NULL, /* cookie */ - 0, /* cookielen */ - NULL, /* uri */ - &uri_out, - flags, dname, - resource, dom_xml) < 0) + rc = dconn->driver->domainMigratePrepare2(dconn, + NULL, /* cookie */ + 0, /* cookielen */ + NULL, /* uri */ + &uri_out, + flags, dname, + resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (rc < 0) /* domainMigratePrepare2 sets the error for us */ goto cleanup; @@ -10899,8 +10922,10 @@ static int doNonTunnelMigrate(virDomainPtr dom, finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri_out, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (ddomain) virUnrefDomain(ddomain); -- 1.7.1.1

3 2

[libvirt] [PATCH] CVE-2010-2242 Apply a source port mapping to virtual network masquerading
by Daniel P. Berrange 15 Jul '10

15 Jul '10

For https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2010-2242 IPtables will seek to preserve the source port unchanged when doing masquerading, if possible. NFS has a pseudo-security option where it checks for the source port <= 1023 before allowing a mount request. If an admin has used this to make the host OS trusted for mounts, the default iptables behaviour will potentially allow NAT'd guests access too. This needs to be stopped. With this change, the iptables -t nat -L -n -v rules for the default network will be Chain POSTROUTING (policy ACCEPT 95 packets, 9163 bytes) pkts bytes target prot opt in out source destination 14 840 MASQUERADE tcp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 75 5752 MASQUERADE udp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 * src/network/bridge_driver.c: Add masquerade rules for TCP and UDP protocols * src/util/iptables.c, src/util/iptables.c: Add source port mappings for TCP & UDP protocols when masquerading. --- src/network/bridge_driver.c | 73 ++++++++++++++++++++++++++++++++++++++++-- src/util/iptables.c | 70 +++++++++++++++++++++++++++++------------ src/util/iptables.h | 6 ++- 3 files changed, 122 insertions(+), 27 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 72255c1..80ed57a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -638,18 +638,74 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, goto masqerr2; } - /* enable masquerading */ + /* + * Enable masquerading. + * + * We need to end up with 3 rules in the table in this order + * + * 1. protocol=tcp with sport mapping restricton + * 2. protocol=udp with sport mapping restricton + * 3. generic any protocol + * + * The sport mappings are required, because default IPtables + * MASQUERADE is maintain port number unchanged where possible. + * + * NFS can be configured to only "trust" port numbers < 1023. + * + * Guests using NAT thus need to be prevented from having port + * numbers < 1023, otherwise they can bypass the NFS "security" + * check on the source port number. + * + * Since we use '--insert' to add rules to the header of the + * chain, we actually need to add them in the reverse of the + * order just mentioned ! + */ + + /* First the generic masquerade rule for other protocols */ if ((err = iptablesAddForwardMasquerade(driver->iptables, network->def->network, - network->def->forwardDev))) { + network->def->forwardDev, + NULL))) { virReportSystemError(err, _("failed to add iptables rule to enable masquerading to '%s'"), network->def->forwardDev ? network->def->forwardDev : NULL); goto masqerr3; } + /* UDP with a source port restriction */ + if ((err = iptablesAddForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + "udp"))) { + virReportSystemError(err, + _("failed to add iptables rule to enable UDP masquerading to '%s'"), + network->def->forwardDev ? network->def->forwardDev : NULL); + goto masqerr4; + } + + /* TCP with a source port restriction */ + if ((err = iptablesAddForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + "tcp"))) { + virReportSystemError(err, + _("failed to add iptables rule to enable TCP masquerading to '%s'"), + network->def->forwardDev ? network->def->forwardDev : NULL); + goto masqerr5; + } + return 1; + masqerr5: + iptablesRemoveForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + "udp"); + masqerr4: + iptablesRemoveForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + NULL); masqerr3: iptablesRemoveForwardAllowRelatedIn(driver->iptables, network->def->network, @@ -814,8 +870,17 @@ networkRemoveIptablesRules(struct network_driver *driver, if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) { if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT) { iptablesRemoveForwardMasquerade(driver->iptables, - network->def->network, - network->def->forwardDev); + network->def->network, + network->def->forwardDev, + "tcp"); + iptablesRemoveForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + "udp"); + iptablesRemoveForwardMasquerade(driver->iptables, + network->def->network, + network->def->forwardDev, + NULL); iptablesRemoveForwardAllowRelatedIn(driver->iptables, network->def->network, network->def->bridge, diff --git a/src/util/iptables.c b/src/util/iptables.c index d06b857..f63e8c6 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -692,25 +692,49 @@ iptablesRemoveForwardRejectIn(iptablesContext *ctx, */ static int iptablesForwardMasquerade(iptablesContext *ctx, - const char *network, - const char *physdev, - int action) + const char *network, + const char *physdev, + const char *protocol, + int action) { - if (physdev && physdev[0]) { - return iptablesAddRemoveRule(ctx->nat_postrouting, - action, - "--source", network, - "!", "--destination", network, - "--out-interface", physdev, - "--jump", "MASQUERADE", - NULL); + if (protocol && protocol[0]) { + if (physdev && physdev[0]) { + return iptablesAddRemoveRule(ctx->nat_postrouting, + action, + "--source", network, + "-p", protocol, + "!", "--destination", network, + "--out-interface", physdev, + "--jump", "MASQUERADE", + "--to-ports", "1024-65535", + NULL); + } else { + return iptablesAddRemoveRule(ctx->nat_postrouting, + action, + "--source", network, + "-p", protocol, + "!", "--destination", network, + "--jump", "MASQUERADE", + "--to-ports", "1024-65535", + NULL); + } } else { - return iptablesAddRemoveRule(ctx->nat_postrouting, - action, - "--source", network, - "!", "--destination", network, - "--jump", "MASQUERADE", - NULL); + if (physdev && physdev[0]) { + return iptablesAddRemoveRule(ctx->nat_postrouting, + action, + "--source", network, + "!", "--destination", network, + "--out-interface", physdev, + "--jump", "MASQUERADE", + NULL); + } else { + return iptablesAddRemoveRule(ctx->nat_postrouting, + action, + "--source", network, + "!", "--destination", network, + "--jump", "MASQUERADE", + NULL); + } } } @@ -719,6 +743,7 @@ iptablesForwardMasquerade(iptablesContext *ctx, * @ctx: pointer to the IP table context * @network: the source network name * @physdev: the physical input device or NULL + * @protocol: the network protocol or NULL * * Add rules to the IP table context to allow masquerading * network @network on @physdev. This allow the bridge to @@ -729,9 +754,10 @@ iptablesForwardMasquerade(iptablesContext *ctx, int iptablesAddForwardMasquerade(iptablesContext *ctx, const char *network, - const char *physdev) + const char *physdev, + const char *protocol) { - return iptablesForwardMasquerade(ctx, network, physdev, ADD); + return iptablesForwardMasquerade(ctx, network, physdev, protocol, ADD); } /** @@ -739,6 +765,7 @@ iptablesAddForwardMasquerade(iptablesContext *ctx, * @ctx: pointer to the IP table context * @network: the source network name * @physdev: the physical input device or NULL + * @protocol: the network protocol or NULL * * Remove rules from the IP table context to stop masquerading * network @network on @physdev. This stops the bridge from @@ -749,7 +776,8 @@ iptablesAddForwardMasquerade(iptablesContext *ctx, int iptablesRemoveForwardMasquerade(iptablesContext *ctx, const char *network, - const char *physdev) + const char *physdev, + const char *protocol) { - return iptablesForwardMasquerade(ctx, network, physdev, REMOVE); + return iptablesForwardMasquerade(ctx, network, physdev, protocol, REMOVE); } diff --git a/src/util/iptables.h b/src/util/iptables.h index 7d55a6d..b47d854 100644 --- a/src/util/iptables.h +++ b/src/util/iptables.h @@ -85,9 +85,11 @@ int iptablesRemoveForwardRejectIn (iptablesContext *ctx, int iptablesAddForwardMasquerade (iptablesContext *ctx, const char *network, - const char *physdev); + const char *physdev, + const char *protocol); int iptablesRemoveForwardMasquerade (iptablesContext *ctx, const char *network, - const char *physdev); + const char *physdev, + const char *protocol); #endif /* __QEMUD_IPTABLES_H__ */ -- 1.6.6.1

2 1

[libvirt] [PATCH] daemon: dispatch.c should include stdio.h (and stdarg.h)
by Ryota Ozaki 15 Jul '10

15 Jul '10

dispatch.c requires stdio.h (and stdarg.h), however, currently dispatch.c implicitly relys on rpc/xdr.h to include stdio.h. If rpc/xdr.h unxpectedly does not include stdio.h, the compilation of dispatch.c fails. This can happen, for example, when portablexdr is installed under /usr/local; because portablexdr's rpc/xdr.h does not include stdio.h and gcc looks up it not /usr/include/rpc/xdr.h. Note that stdarg.h is also included according to man va_start, although stdio.h seems including it anyway. --- daemon/dispatch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index 8f55eaa..966db71 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -23,6 +23,9 @@ #include <config.h> +#include <stdio.h> +#include <stdarg.h> + #include "dispatch.h" #include "remote.h" -- 1.6.6.1

2 3

[libvirt] [PATCH] uml_driver: correct logic error in umlMonitorCommand
by Jim Meyering 14 Jul '10

14 Jul '10

The stray "< 0" removed by the fix below would have made umlMonitorCommand always fail with its "incomplete reply ..." diagnostic. >From 5f075332e33f7e9bf2d7979934b8dc7c3312b6e8 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 13 Jul 2010 15:28:35 -0500 Subject: [PATCH] uml_driver: correct logic error in umlMonitorCommand * src/uml/uml_driver.c (umlMonitorCommand): Correct flaw that would cause unconditional "incomplete reply ..." failure, since "nbytes" was always 0 or 1. --- src/uml/uml_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 110179e..1e0f5ac 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -730,7 +730,7 @@ static int umlMonitorCommand(const struct uml_driver *driver, ssize_t nbytes; addrlen = sizeof(addr); nbytes = recvfrom(priv->monitor, &res, sizeof res, 0, - (struct sockaddr *)&addr, &addrlen) < 0; + (struct sockaddr *)&addr, &addrlen); if (nbytes < 0) { if (errno == EAGAIN || errno == EINTR) continue; -- 1.7.1.460.gf3c4c

2 2

[libvirt] [PATCH] qemuConnectMonitor: do not mask SELinux failure
by Jim Meyering 14 Jul '10

14 Jul '10

coverity spotted the expressions that could never be true: (a && b && c) < 0. Here's the fix: >From 6d61d90a6df81900f4b2be752403758175000973 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 13 Jul 2010 15:15:04 -0500 Subject: [PATCH] qemuConnectMonitor: fix a bug that would have masked SELinux failure * src/qemu/qemu_driver.c (qemuConnectMonitor): Correct erroneous parenthesization in two expressions. Without this fix, failure to set or clear SELinux security context in the monitor would go undiagnosed. Also correct a diagnostic and split some long lines. --- src/qemu/qemu_driver.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 487bfa3..96277cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1194,10 +1194,12 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; - if ((driver->securityDriver && - driver->securityDriver->domainSetSecuritySocketLabel && - driver->securityDriver->domainSetSecuritySocketLabel(driver->securityDriver,vm)) < 0) { - VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); + if (driver->securityDriver && + driver->securityDriver->domainSetSecuritySocketLabel && + driver->securityDriver->domainSetSecuritySocketLabel + (driver->securityDriver,vm) < 0) { + VIR_ERROR(_("Failed to set security context for monitor for %s"), + vm->def->name); goto error; } @@ -1213,10 +1215,12 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) if (priv->mon == NULL) virDomainObjUnref(vm); - if ((driver->securityDriver && - driver->securityDriver->domainClearSecuritySocketLabel && - driver->securityDriver->domainClearSecuritySocketLabel(driver->securityDriver,vm)) < 0) { - VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); + if (driver->securityDriver && + driver->securityDriver->domainClearSecuritySocketLabel && + driver->securityDriver->domainClearSecuritySocketLabel + (driver->securityDriver,vm) < 0) { + VIR_ERROR(_("Failed to clear security context for monitor for %s"), + vm->def->name); goto error; } -- 1.7.1.460.gf3c4c

2 2

[libvirt] [PATCH] python: Fix IOErrorReasonCallback bindings
by Cole Robinson 14 Jul '10

14 Jul '10

A copy and paste error was causing us to dispatch the incorrect routine. Spotted by Dan Kenigsberg. --- python/libvirt-override.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index ad55940..54a84c2 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3258,7 +3258,7 @@ libvirt_virConnectDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_ /* Call the Callback Dispatcher */ pyobj_ret = PyObject_CallMethod(pyobj_conn, - (char*)"dispatchDomainEventIOErrorCallback", + (char*)"dispatchDomainEventIOErrorReasonCallback", (char*)"OssisO", pyobj_dom, srcPath, devAlias, action, reason, -- 1.6.6.1

2 2

[libvirt] libvirtError: internal error unknown boot device 'floppy'
by John Lumby 14 Jul '10

14 Jul '10

Hello. I believe I've found a bug in libvirtd but not sure. Using libvirt-0.8.1 and virtinst-0.500.3 (and virt-manager-0.8.4 and Python 2.6.5 if relevant) on a linux system (kernel 2.6.35-rc4 if relevant) I ran this virt-install command , which is trying to create a windows2k virt mc by importing an existing system consisting of a boot-floppy image on a file (the boot device) and one real disk device on /dev/sdc virt-install --connect qemu:///system --name=RH7win2k --ram=392 --cpuset=0 --description="win2k on RH7 disk on usb, nat network" --import --network=network=default --virt-type=kqemu --accelerate --vnc --vncport=5905 --video=cirrus --disk=/mnt/soltbakp/commonfiles/win2k_boot.floppage,device=floppy --disk=/dev/sdc,device=disk --os-type=windows --os-variant=win2k and it fails like so ERROR internal error unknown boot device 'floppy' ERROR internal error unknown boot device 'floppy' Traceback (most recent call last): File "/usr/local/bin/virt-install", line 1033, in <module> main() File "/usr/local/bin/virt-install", line 915, in main start_time, guest.start_install) File "/usr/local/bin/virt-install", line 957, in do_install dom = install_func(conscb, progresscb, wait=(not wait)) File "/usr/local/lib/python2.6/site-packages/virtinst/Guest.py", line 972, in start_install return self._do_install(consolecb, meter, removeOld, wait) File "/usr/local/lib/python2.6/site-packages/virtinst/Guest.py", line 1037, in _do_install "install") File "/usr/local/lib/python2.6/site-packages/virtinst/Guest.py", line 1021, in _create_guest self.domain = self.conn.defineXML(final_xml) File "/usr/local/lib/python2.6/site-packages/libvirt.py", line 1224, in defineXML if ret is None:raise libvirtError('virDomainDefineXML() failed', conn=self) libvirtError: internal error unknown boot device 'floppy' but if I repeat the command with just interchanging the order of the floppy and disk definitions, (so that I am telling it to use the disk as boot device), then the virt-install works ok as far as setup goes, but of course fails during boot (and I can then alter the boot order back to what I should be in virt-manager and it then boots) Is this a bug? and if so is it already known? (I couldn't find how to search the archives for this list and don't see it in google) John Lumby _________________________________________________________________ MSN Dating: Find someone special. Start now. http://go.microsoft.com/?linkid=9734384

2 3

[libvirt] [PATCH] cpuCompare: Fix comparison of two host CPUs
by Jiri Denemark 14 Jul '10

14 Jul '10

When a CPU to be compared with host CPU describes a host CPU instead of a guest CPU, the result is incorrect. This is because instead of treating additional features in host CPU description as required, they were treated as if they were mentioned with all possible policies at the same time. --- src/cpu/cpu_x86.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 114235c..ab7c8cc 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -826,8 +826,7 @@ x86ModelFromCPU(const virCPUDefPtr cpu, struct x86_model *model = NULL; int i; - if (cpu->type == VIR_CPU_TYPE_HOST - || policy == VIR_CPU_FEATURE_REQUIRE) { + if (policy == VIR_CPU_FEATURE_REQUIRE) { if ((model = x86ModelFind(map, cpu->model)) == NULL) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown CPU model %s"), cpu->model); @@ -839,6 +838,8 @@ x86ModelFromCPU(const virCPUDefPtr cpu, } else if (VIR_ALLOC(model) < 0) goto no_memory; + else if (cpu->type == VIR_CPU_TYPE_HOST) + return model; for (i = 0; i < cpu->nfeatures; i++) { const struct x86_feature *feature; @@ -1181,7 +1182,7 @@ x86Compute(virCPUDefPtr host, } if (!(map = x86LoadMap()) || - !(host_model = x86ModelFromCPU(host, map, 0)) || + !(host_model = x86ModelFromCPU(host, map, VIR_CPU_FEATURE_REQUIRE)) || !(cpu_force = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORCE)) || !(cpu_require = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_REQUIRE)) || !(cpu_optional = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_OPTIONAL)) || @@ -1611,7 +1612,7 @@ x86Baseline(virCPUDefPtr *cpus, if (!(map = x86LoadMap())) goto error; - if (!(base_model = x86ModelFromCPU(cpus[0], map, 0))) + if (!(base_model = x86ModelFromCPU(cpus[0], map, VIR_CPU_FEATURE_REQUIRE))) goto error; if (VIR_ALLOC(cpu) < 0 || @@ -1630,7 +1631,7 @@ x86Baseline(virCPUDefPtr *cpus, for (i = 1; i < ncpus; i++) { const char *vn = NULL; - if (!(model = x86ModelFromCPU(cpus[i], map, 0))) + if (!(model = x86ModelFromCPU(cpus[i], map, VIR_CPU_FEATURE_REQUIRE))) goto error; if (cpus[i]->vendor && model->vendor && @@ -1710,7 +1711,7 @@ x86Update(virCPUDefPtr guest, union cpuData *data = NULL; if (!(map = x86LoadMap()) || - !(host_model = x86ModelFromCPU(host, map, 0))) + !(host_model = x86ModelFromCPU(host, map, VIR_CPU_FEATURE_REQUIRE))) goto cleanup; for (i = 0; i < guest->nfeatures; i++) { -- 1.7.1.1

4 6

[libvirt] [PATCH] esx: Add autodetection for the SCSI controller model
by Matthias Bolte 13 Jul '10

13 Jul '10

This works for file-backed SCSI disk device with a datastore related source path. --- docs/drvesx.html.in | 6 ++ docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/esx/esx_vi_generator.input | 149 +++++++++++++++++++++++++++++++++ src/esx/esx_vi_generator.py | 3 + src/esx/esx_vmx.c | 180 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vmx.h | 8 ++- 8 files changed, 344 insertions(+), 5 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index f4e7530..75c24cb 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -292,6 +292,12 @@ ethernet0.checkMACAddress = "false" <h4>SCSI controller models</h4> <dl> + <dt><code>auto</code></dt> + <dd> + This isn't a actual controller model. If specified the ESX driver + tries to detect the SCSI controller model referenced in the + <code>.vmdk</code> file and use it. <span class="since">Since 0.8.3</span> + </dd> <dt><code>buslogic</code></dt> <dd> BusLogic SCSI controller for older guests. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index b171d01..e090366 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -673,6 +673,7 @@ <optional> <attribute name="model"> <choice> + <value>auto</value> <value>buslogic</value> <value>lsilogic</value> <value>lsisas1068</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3cd43c4..eb7fa13 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -140,6 +140,7 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "virtio-serial") VIR_ENUM_IMPL(virDomainControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, + "auto", "buslogic", "lsilogic", "lsisas1068", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3451302..890fa0b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -196,6 +196,7 @@ enum virDomainControllerType { enum virDomainControllerModel { + VIR_DOMAIN_CONTROLLER_MODEL_AUTO, VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index ff65178..b4b33f6 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -184,6 +184,40 @@ object Event end +object FileInfo + String path r + Long fileSize o + DateTime modification o +end + + +object FileQuery +end + + +object FileQueryFlags + Boolean fileType r + Boolean fileSize r + Boolean modification r +end + + +object FloppyImageFileInfo extends FileInfo +end + + +object FloppyImageFileQuery extends FileQuery +end + + +object FolderFileInfo extends FileInfo +end + + +object FolderFileQuery extends FileQuery +end + + object HostCpuIdInfo Int level r String vendor o @@ -194,6 +228,22 @@ object HostCpuIdInfo end +object HostDatastoreBrowserSearchResults + ManagedObjectReference datastore o + String folderPath o + FileInfo file ol +end + + +object HostDatastoreBrowserSearchSpec + FileQuery query ol + FileQueryFlags details o + Boolean searchCaseInsensitive o + String matchPattern ol + Boolean sortFoldersFirst o +end + + object HostFileSystemVolume String type r String name r @@ -225,6 +275,14 @@ object HostVmfsVolume extends HostFileSystemVolume end +object IsoImageFileInfo extends FileInfo +end + + +object IsoImageFileQuery extends FileQuery +end + + object LocalDatastoreInfo extends DatastoreInfo String path o end @@ -424,6 +482,14 @@ object TaskInfo end +object TemplateConfigFileInfo extends VmConfigFileInfo +end + + +object TemplateConfigFileQuery extends VmConfigFileQuery +end + + object TraversalSpec extends SelectionSpec String type r String path r @@ -502,6 +568,82 @@ object VirtualMachineSnapshotTree end +object VmConfigFileInfo extends FileInfo + Int configVersion o +end + + +object VmConfigFileQuery extends FileQuery + VmConfigFileQueryFilter filter o + VmConfigFileQueryFlags details o +end + + +object VmConfigFileQueryFilter + Int matchConfigVersion ol +end + + +object VmConfigFileQueryFlags + Boolean configVersion r +end + + +object VmDiskFileInfo extends FileInfo + String diskType o + Long capacityKb o + Int hardwareVersion o + String controllerType o + String diskExtents ol +end + + +object VmDiskFileQuery extends FileQuery + VmDiskFileQueryFilter filter o + VmDiskFileQueryFlags details o +end + + +object VmDiskFileQueryFilter + String diskType ol + Int matchHardwareVersion ol + String controllerType ol +end + + +object VmDiskFileQueryFlags + Boolean diskType r + Boolean capacityKb r + Boolean hardwareVersion r + Boolean controllerType o + Boolean diskExtents o +end + + +object VmLogFileInfo extends FileInfo +end + + +object VmLogFileQuery extends FileQuery +end + + +object VmNvramFileInfo extends FileInfo +end + + +object VmNvramFileQuery extends FileQuery +end + + +object VmSnapshotFileInfo extends FileInfo +end + + +object VmSnapshotFileQuery extends FileQuery +end + + object VmfsDatastoreInfo extends DatastoreInfo HostVmfsVolume vmfs o end @@ -658,6 +800,13 @@ method RevertToSnapshot_Task returns ManagedObjectReference r end +method SearchDatastore_Task returns ManagedObjectReference r + ManagedObjectReference _this r + String datastorePath r + HostDatastoreBrowserSearchSpec searchSpec o +end + + method SessionIsActive returns Boolean r ManagedObjectReference _this:SessionManager r String sessionID r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index ff3e3d1..82bc9b6 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1123,7 +1123,10 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE additional_object_features = { "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, + "FileInfo" : Object.FEATURE__DYNAMIC_CAST, + "FileQuery" : Object.FEATURE__DYNAMIC_CAST, "HostCpuIdInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST, + "HostDatastoreBrowserSearchResults" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST, "PerfCounterInfo" : Object.FEATURE__LIST, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 46875f3..f57e046 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -29,6 +29,7 @@ #include "virterror_internal.h" #include "memory.h" #include "logging.h" +#include "esx_vi_methods.h" #include "esx_private.h" #include "esx_util.h" #include "esx_vmx.h" @@ -707,8 +708,172 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, int -esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], - bool present[4]) +esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, + virDomainDiskDefPtr def, int *model) +{ + int result = -1; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePath = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; + esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; + esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + esxVI_TaskInfo *taskInfo = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + + if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK || + def->bus != VIR_DOMAIN_DISK_BUS_SCSI || + def->type != VIR_DOMAIN_DISK_TYPE_FILE || + def->src == NULL || + ! STRPREFIX(def->src, "[")) { + /* + * This isn't a file-based SCSI disk device with a datastore related + * source path => do nothing. + */ + return 0; + } + + if (esxUtil_ParseDatastoreRelatedPath(def->src, &datastoreName, + &directoryName, &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + /* Lookup HostDatastoreBrowser */ + if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || + esxVI_LookupDatastoreByName(ctx, datastoreName, propertyNameList, + &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetManagedObjectReference(datastore, "browser", + &hostDatastoreBrowser, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Build HostDatastoreBrowserSearchSpec */ + if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || + esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { + goto cleanup; + } + + searchSpec->details->fileType = esxVI_Boolean_True; + searchSpec->details->fileSize = esxVI_Boolean_False; + searchSpec->details->modification = esxVI_Boolean_False; + + if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || + esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { + goto cleanup; + } + + vmDiskFileQuery->details->diskType = esxVI_Boolean_False; + vmDiskFileQuery->details->capacityKb = esxVI_Boolean_False; + vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; + vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; + vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; + + if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { + goto cleanup; + } + + searchSpec->matchPattern->value = fileName; + + /* Search datastore for file */ + if (esxVI_SearchDatastore_Task(ctx, hostDatastoreBrowser, datastorePath, + searchSpec, &task) < 0 || + esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Boolean_False, + &taskInfoState) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not serach in datastore '%s'"), datastoreName); + goto cleanup; + } + + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo) < 0 || + esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType + (taskInfo->result, &searchResults) < 0) { + goto cleanup; + } + + /* Interpret search result */ + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(searchResults->file); + + if (vmDiskFileInfo == NULL || vmDiskFileInfo->controllerType == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not lookup controller model for '%s'"), def->src); + goto cleanup; + } + + if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualBusLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicSASController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "ParaVirtualSCSIController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI; + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Found unexpected controller model '%s' for disk '%s'"), + vmDiskFileInfo->controllerType, def->src); + goto cleanup; + } + + result = 0; + + cleanup: + /* Don't double free fileName */ + if (searchSpec != NULL && searchSpec->matchPattern != NULL) { + searchSpec->matchPattern->value = NULL; + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePath); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); + esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); + esxVI_ManagedObjectReference_Free(&task); + esxVI_TaskInfo_Free(&taskInfo); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); + + return result; +} + + + +int +esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, + int virtualDev[4], bool present[4]) { int i; virDomainDiskDefPtr disk; @@ -737,6 +902,14 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], return -1; } + if (ctx != NULL && + controller->model == VIR_DOMAIN_CONTROLLER_MODEL_AUTO) { + if (esxVMX_AutodetectSCSIControllerModel(ctx, disk, + &controller->model) < 0) { + return -1; + } + } + if (controller->model != -1 && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && @@ -2611,7 +2784,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, } } - if (esxVMX_GatherSCSIControllers(def, scsi_virtualDev, scsi_present) < 0) { + if (esxVMX_GatherSCSIControllers(ctx, def, scsi_virtualDev, + scsi_present) < 0) { goto failure; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index a9015fb..3ccae7a 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -48,8 +48,12 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, virDomainDiskDefPtr disk); int -esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], - bool present[4]); +esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, + virDomainDiskDefPtr def, int *model); + +int +esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, + int virtualDev[4], bool present[4]); char * esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Make esxVI_*_Deserialize dynamically dispatched
by Matthias Bolte 13 Jul '10

13 Jul '10

This will be used to deserialize the response from a call to esxVI_SearchDatastore_Task (to be added in the next patch) properly. --- src/esx/esx_vi_generator.py | 45 ++++++++++++++++++------ src/esx/esx_vi_types.c | 82 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8df0e80..ff3e3d1 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -469,18 +469,21 @@ class Object: return source - def generate_dynamic_cast_code(self): + def generate_dynamic_cast_code(self, is_first = True): global objects_by_name source = "" if self.extended_by is not None: + if not is_first: + source += "\n" + source += " /* %s */\n" % self.name for extended_by in self.extended_by: source += " ESX_VI__TEMPLATE__DYNAMIC_CAST__ACCEPT(%s)\n" % extended_by for extended_by in self.extended_by: - source += objects_by_name[extended_by].generate_dynamic_cast_code() + source += objects_by_name[extended_by].generate_dynamic_cast_code(False) return source @@ -820,18 +823,38 @@ class Object: source += "ESX_VI__TEMPLATE__LIST__SERIALIZE(%s)\n\n" % self.name # deserilaize - if self.features & Object.FEATURE__DESERIALIZE: - source += "/* esxVI_%s_Deserialize */\n" % self.name - source += "ESX_VI__TEMPLATE__DESERIALIZE(%s,\n" % self.name - source += "{\n" + if self.extended_by is None: + if self.features & Object.FEATURE__DESERIALIZE: + source += "/* esxVI_%s_Deserialize */\n" % self.name + source += "ESX_VI__TEMPLATE__DESERIALIZE(%s,\n" % self.name + source += "{\n" - source += self.generate_deserialize_code() + source += self.generate_deserialize_code() - source += "})\n\n" + source += "})\n\n" - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_DeserializeList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" % self.name + if self.features & Object.FEATURE__LIST: + source += "/* esxVI_%s_DeserializeList */\n" % self.name + source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" % self.name + else: + if self.features & Object.FEATURE__DESERIALIZE: + source += "/* esxVI_%s_Deserialize */\n" % self.name + source += "ESX_VI__TEMPLATE__DYNAMIC_DESERIALIZE(%s,\n" % self.name + source += "{\n" + + for extended_by in self.extended_by: + source += " ESX_VI__TEMPLATE__DISPATCH__DESERIALIZE(%s)\n" % extended_by + + source += "},\n" + source += "{\n" + + source += self.generate_deserialize_code() + + source += "})\n\n" + + if self.features & Object.FEATURE__LIST: + source += "/* esxVI_%s_DeserializeList */\n" % self.name + source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" % self.name source += "\n\n" diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 3f34fee..6e75995 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -250,12 +250,14 @@ -#define ESX_VI__TEMPLATE__DESERIALIZE(_type, _deserialize) \ +#define ESX_VI__TEMPLATE__DESERIALIZE_EXTRA(_type, _extra, _deserialize) \ int \ esxVI_##_type##_Deserialize(xmlNodePtr node, esxVI_##_type **ptrptr) \ { \ xmlNodePtr childNode = NULL; \ \ + _extra \ + \ if (ptrptr == NULL || *ptrptr != NULL) { \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", \ _("Invalid argument")); \ @@ -293,6 +295,11 @@ +#define ESX_VI__TEMPLATE__DESERIALIZE(_type, _deserialize) \ + ESX_VI__TEMPLATE__DESERIALIZE_EXTRA(_type, /* nothing */, _deserialize) + + + #define ESX_VI__TEMPLATE__DESERIALIZE_NUMBER(_type, _xsdType, _min, _max) \ int \ esxVI_##_type##_Deserialize(xmlNodePtr node, esxVI_##_type **number) \ @@ -544,6 +551,12 @@ +#define ESX_VI__TEMPLATE__DISPATCH__DESERIALIZE(_type) \ + case esxVI_Type_##_type: \ + return esxVI_##_type##_Deserialize(node, (esxVI_##_type **)ptrptr); + + + #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ ESX_VI__TEMPLATE__DISPATCH(__type, _dispatch, /* nothing */) \ @@ -584,6 +597,73 @@ +#define ESX_VI__TEMPLATE__DYNAMIC_DESERIALIZE(__type, _dispatch, \ + _deserialize) \ + ESX_VI__TEMPLATE__DESERIALIZE_EXTRA(__type, \ + esxVI_Type type = esxVI_Type_Undefined; \ + \ + if (esxVI_GetActualObjectType(node, esxVI_Type_##__type, &type) < 0) { \ + return -1; \ + } \ + \ + switch (type) { \ + _dispatch \ + \ + case esxVI_Type_##__type: \ + break; \ + \ + default: \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ + _("Call to %s for unexpected type '%s'"), \ + __FUNCTION__, esxVI_Type_ToString(type)); \ + return -1; \ + }, \ + _deserialize) + + + +static int +esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, + esxVI_Type *actualType) +{ + int result = -1; + char *type = NULL; + + if (actualType == NULL || *actualType != esxVI_Type_Undefined) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + type = (char *)xmlGetNsProp + (node, BAD_CAST "type", + BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); + + if (type == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s is missing 'type' property"), + esxVI_Type_ToString(baseType)); + return -1; + } + + *actualType = esxVI_Type_FromString(type); + + if (*actualType == esxVI_Type_Undefined) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Unknown value '%s' for %s 'type' property"), + type, esxVI_Type_ToString(baseType)); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(type); + + return result; +} + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSI: Type */ -- 1.7.0.4

2 2

[libvirt] [PATCH 0/1] RFC: Canonicalize block device paths
by David Allan 13 Jul '10

13 Jul '10

I had a look at the problem of finding the devices representing the partitions of a block device, and it's a messy problem. There are a lot of different conventions that are used depending on what kind of device is partitioned. The following patch seems like a promising approach, but before I spend a bunch of time testing that it works in a variety of cases, I thought I should send it out for comment. Dave David Allan (1): RFC: Canonicalize block device paths src/Makefile.am | 9 +++++++-- src/storage/parthelper.c | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-)

3 3

[libvirt] [PATCH] Add openauth example to demonstrate a custom auth callback
by Matthias Bolte 13 Jul '10

13 Jul '10

--- Makefile.am | 2 +- configure.ac | 1 + examples/openauth/.gitignore | 5 + examples/openauth/Makefile.am | 5 + examples/openauth/openauth.c | 287 +++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 3 +- 6 files changed, 301 insertions(+), 2 deletions(-) create mode 100644 examples/openauth/.gitignore create mode 100644 examples/openauth/Makefile.am create mode 100644 examples/openauth/openauth.c diff --git a/Makefile.am b/Makefile.am index 286b13b..a6af20f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ - examples/xml/nwfilter + examples/xml/nwfilter examples/openauth ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 diff --git a/configure.ac b/configure.ac index c9c5b53..eece723 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,6 +2129,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ examples/domain-events/events-c/Makefile \ examples/domsuspend/Makefile \ examples/dominfo/Makefile \ + examples/openauth/Makefile \ examples/python/Makefile \ examples/hellolibvirt/Makefile \ examples/xml/nwfilter/Makefile) diff --git a/examples/openauth/.gitignore b/examples/openauth/.gitignore new file mode 100644 index 0000000..1431557 --- /dev/null +++ b/examples/openauth/.gitignore @@ -0,0 +1,5 @@ +Makefile +Makefile.in +openauth +.deps +.libs diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am new file mode 100644 index 0000000..279a032 --- /dev/null +++ b/examples/openauth/Makefile.am @@ -0,0 +1,5 @@ +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +noinst_PROGRAMS = openauth +openauth_CFLAGS = $(WARN_CFLAGS) +openauth_SOURCES = openauth.c +openauth_LDADD = @top_builddir@/src/libvirt.la diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c new file mode 100644 index 0000000..ff830cb --- /dev/null +++ b/examples/openauth/openauth.c @@ -0,0 +1,287 @@ +/* This is a copy of the hellolibvirt example demonstaring how to use + * virConnectOpenAuth with a custom auth callback */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> + +static void +showError(virConnectPtr conn) +{ + int ret; + virErrorPtr err; + + err = malloc(sizeof(*err)); + if (NULL == err) { + printf("Could not allocate memory for error data\n"); + goto out; + } + + ret = virConnCopyLastError(conn, err); + + switch (ret) { + case 0: + printf("No error found\n"); + break; + + case -1: + printf("Parameter error when attempting to get last error\n"); + break; + + default: + printf("libvirt reported: \"%s\"\n", err->message); + break; + } + + virResetError(err); + free(err); + +out: + return; +} + + +static int +showHypervisorInfo(virConnectPtr conn) +{ + int ret = 0; + unsigned long hvVer, major, minor, release; + const char *hvType; + + /* virConnectGetType returns a pointer to a static string, so no + * allocation or freeing is necessary; it is possible for the call + * to fail if, for example, there is no connection to a + * hypervisor, so check what it returns. */ + hvType = virConnectGetType(conn); + if (NULL == hvType) { + ret = 1; + printf("Failed to get hypervisor type\n"); + showError(conn); + goto out; + } + + if (0 != virConnectGetVersion(conn, &hvVer)) { + ret = 1; + printf("Failed to get hypervisor version\n"); + showError(conn); + goto out; + } + + major = hvVer / 1000000; + hvVer %= 1000000; + minor = hvVer / 1000; + release = hvVer % 1000; + + printf("Hypervisor: \"%s\" version: %lu.%lu.%lu\n", + hvType, + major, + minor, + release); + +out: + return ret; +} + + +static int +showDomains(virConnectPtr conn) +{ + int ret = 0, i, numNames, numInactiveDomains, numActiveDomains; + char **nameList = NULL; + + numActiveDomains = virConnectNumOfDomains(conn); + if (-1 == numActiveDomains) { + ret = 1; + printf("Failed to get number of active domains\n"); + showError(conn); + goto out; + } + + numInactiveDomains = virConnectNumOfDefinedDomains(conn); + if (-1 == numInactiveDomains) { + ret = 1; + printf("Failed to get number of inactive domains\n"); + showError(conn); + goto out; + } + + printf("There are %d active and %d inactive domains\n", + numActiveDomains, numInactiveDomains); + + nameList = malloc(sizeof(*nameList) * numInactiveDomains); + + if (NULL == nameList) { + ret = 1; + printf("Could not allocate memory for list of inactive domains\n"); + goto out; + } + + numNames = virConnectListDefinedDomains(conn, + nameList, + numInactiveDomains); + + if (-1 == numNames) { + ret = 1; + printf("Could not get list of defined domains from hypervisor\n"); + showError(conn); + goto out; + } + + if (numNames > 0) { + printf("Inactive domains:\n"); + } + + for (i = 0 ; i < numNames ; i++) { + printf(" %s\n", *(nameList + i)); + /* The API documentation doesn't say so, but the names + * returned by virConnectListDefinedDomains are strdup'd and + * must be freed here. */ + free(*(nameList + i)); + } + +out: + free(nameList); + return ret; +} + +/* Struct to pass the credentials to the auth callback via the cbdata pointer */ +struct _AuthData { + char *username; + char *password; +}; + +typedef struct _AuthData AuthData; + +/* This function will be called by libvirt to obtain credentials in order to + * authenticate to the hypervisor */ +static int +authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) +{ + int i; + AuthData *authData = cbdata; + + /* libvirt might request multiple credentials in a single call. + * This example supports VIR_CRED_AUTHNAME and VIR_CRED_PASSPHRASE + * credentials only, but there are several other types. + * + * A request may also contain a prompt message that can be displayed + * to the user and a challenge. The challenge is specific to the + * credential type and hypervisor type. + * + * For example the ESX driver passes the hostname of the ESX or vCenter + * server as challenge. This allows a auth callback to return the + * proper credentials. */ + for (i = 0; i < ncred ; ++i) { + switch (cred[i].type) { + case VIR_CRED_AUTHNAME: + cred[i].result = strdup(authData->username); + + if (cred[i].result == NULL) { + return -1; + } + + cred[i].resultlen = strlen(cred[i].result); + break; + + case VIR_CRED_PASSPHRASE: + cred[i].result = strdup(authData->password); + + if (cred[i].result == NULL) { + return -1; + } + + cred[i].resultlen = strlen(cred[i].result); + break; + + default: + return -1; + } + } + + return 0; +} + + +/* The list of credential types supported by our auth callback */ +static int credTypes[] = { + VIR_CRED_AUTHNAME, + VIR_CRED_PASSPHRASE +}; + + +/* The auth struct that will be passed to virConnectOpenAuth */ +static virConnectAuth auth = { + credTypes, + sizeof(credTypes) / sizeof(int), + authCallback, + NULL, // cbdata will be initialized in main +}; + + +int +main(int argc, char *argv[]) +{ + int ret = 0; + virConnectPtr conn; + char *uri; + AuthData authData; + + if (argc != 4) { + ret = 1; + printf("Usage: %s <uri> <username> <password>\n", argv[0]); + goto out; + } + + uri = argv[1]; + authData.username = argv[2]; + authData.password = argv[3]; + auth.cbdata = &authData; + + printf("Attempting to connect to hypervisor\n"); + + conn = virConnectOpenAuth(uri, &auth, 0); + + if (NULL == conn) { + ret = 1; + printf("No connection to hypervisor\n"); + showError(conn); + goto out; + } + + uri = virConnectGetURI(conn); + if (NULL == uri) { + ret = 1; + printf("Failed to get URI for hypervisor connection\n"); + showError(conn); + goto disconnect; + } + + printf("Connected to hypervisor at \"%s\"\n", uri); + free(uri); + + if (0 != showHypervisorInfo(conn)) { + ret = 1; + goto disconnect; + } + + if (0 != showDomains(conn)) { + ret = 1; + goto disconnect; + } + +disconnect: + if (0 != virConnectClose(conn)) { + printf("Failed to disconnect from hypervisor\n"); + showError(conn); + ret = 1; + } else { + printf("Disconnected from hypervisor\n"); + } + +out: + return ret; +} diff --git a/libvirt.spec.in b/libvirt.spec.in index 33e757c..ce58f2a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -585,7 +585,7 @@ gzip -9 ChangeLog rm -fr %{buildroot} %makeinstall -for i in domain-events/events-c dominfo domsuspend hellolibvirt python xml/nwfilter +for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth python xml/nwfilter do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -887,6 +887,7 @@ fi %doc examples/domain-events/events-c %doc examples/dominfo %doc examples/domsuspend +%doc examples/openauth %doc examples/xml %if %{with_python} -- 1.7.0.4

2 2

[libvirt] [PATCH] Eliminate compiler warning due to gettext string with no format args
by Laine Stump 13 Jul '10

13 Jul '10

From: Laine Stump <laine(a)redhat.com> I just pushed this trivial fix, since it breaks the build for anyone who uses -Wformat-security -Werror. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8e6e2b4..38ecc0f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1462,7 +1462,7 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) hassave = virDomainHasManagedSaveImage(dom, 0); if (hassave < 0) { - vshError(ctl, _("Failed to check for domain managed save image")); + vshError(ctl, "%s", _("Failed to check for domain managed save image")); goto cleanup; } -- 1.7.1.1

1 0

[libvirt] [PATCH] docs: fix so generated .html files are removed with make clean
by Justin Clift 12 Jul '10

12 Jul '10

--- This is a simple fix so generated .html files in the docs directory are removed when make clean is run. Otherwise they're left in place. docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 1183321..a6a6d07 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -150,7 +150,7 @@ $(python_generated_files): $(srcdir)/apibuild.py \ check-local: all clean-local: - rm -f *~ *.bak *.hierarchy *.signals *-unused.txt + rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local rm -rf libvirt-api.xml libvirt-refs.xml -- 1.7.1.1

2 2

[libvirt] [PATCH] cpuCompare: Fix crash on unexpected CPU XML
by Jiri Denemark 12 Jul '10

12 Jul '10

When comparing a CPU without <model> element, such as <cpu> <topology sockets='1' cores='1' threads='1'/> </cpu> libvirt would happily crash without warning. --- src/cpu/cpu.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 279eee7..def6974 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -90,6 +90,12 @@ cpuCompareXML(virCPUDefPtr host, if (cpu == NULL) goto cleanup; + if (!cpu->model) { + virCPUReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("no CPU model specified")); + goto cleanup; + } + ret = cpuCompare(host, cpu); cleanup: -- 1.7.1.1

2 3

[libvirt] [PATCH] cpu: Fail when CPU type cannot be detected from XML
by Jiri Denemark 12 Jul '10

12 Jul '10

When autodetecting whether XML describes guest or host CPU, the presence of <arch> element is checked. If it's present, we treat the XML as host CPU definition. Which is right, since guest CPU definitions do not contain <arch> element. However, if at the same time the root <cpu> element contains `match' attribute, we would silently ignore it and still treat the XML as host CPU. We should rather refuse such invalid XML. --- src/conf/cpu_conf.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index d9aa69c..35bcce8 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -130,9 +130,15 @@ virCPUDefParseXML(const xmlNodePtr node, } if (mode == VIR_CPU_TYPE_AUTO) { - if (virXPathBoolean("boolean(./arch)", ctxt)) + if (virXPathBoolean("boolean(./arch)", ctxt)) { + if (virXPathBoolean("boolean(./@match)", ctxt)) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("'arch' element element cannot be used inside 'cpu'" + " element with 'match' attribute'")); + goto error; + } def->type = VIR_CPU_TYPE_HOST; - else + } else def->type = VIR_CPU_TYPE_GUEST; } else def->type = mode; -- 1.7.1.1

2 2

[libvirt] [PATCH] qemu: Use -nodefconfig when probing for CPU models
by Jiri Denemark 12 Jul '10

12 Jul '10

In case qemu supports -nodefconfig, libvirt adds uses it when launching new guests. Since this option may affect CPU models supported by qemu, we need to use it when probing for available models. --- src/qemu/qemu_conf.c | 16 ++++++++++++---- src/qemu/qemu_conf.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 988220b..1d0bd88 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -718,11 +718,17 @@ error: int qemudProbeCPUModels(const char *qemu, + unsigned long long qemuCmdFlags, const char *arch, unsigned int *count, const char ***cpus) { - const char *const qemuarg[] = { qemu, "-cpu", "?", NULL }; + const char *const qemuarg[] = { + qemu, + "-cpu", "?", + (qemuCmdFlags & QEMUD_CMD_FLAG_NODEFCONFIG) ? "-nodefconfig" : NULL, + NULL + }; const char *const qemuenv[] = { "LC_ALL=C", NULL }; enum { MAX_MACHINES_OUTPUT_SIZE = 1024*4 }; char *output = NULL; @@ -916,7 +922,7 @@ qemudCapsInitGuest(virCapsPtr caps, guest->arch.defaultInfo.emulator_mtime = binary_mtime; if (caps->host.cpu && - qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 && + qemudProbeCPUModels(binary, 0, info->arch, &ncpus, NULL) == 0 && ncpus > 0 && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) goto error; @@ -3365,6 +3371,7 @@ static int qemuBuildCpuArgStr(const struct qemud_driver *driver, const virDomainDefPtr def, const char *emulator, + unsigned long long qemuCmdFlags, const struct utsname *ut, char **opt) { @@ -3378,7 +3385,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, int i; if (def->cpu && def->cpu->model) { - if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) + if (qemudProbeCPUModels(emulator, qemuCmdFlags, ut->machine, + &ncpus, &cpus) < 0) goto cleanup; if (!ncpus || !host) { @@ -3706,7 +3714,7 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT(def->os.machine); } - if (qemuBuildCpuArgStr(driver, def, emulator, &ut, &cpu) < 0) + if (qemuBuildCpuArgStr(driver, def, emulator, qemuCmdFlags, &ut, &cpu) < 0) goto error; if (cpu) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ab5f158..dfdc0bb 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -289,6 +289,7 @@ int qemudProbeMachineTypes (const char *binary, int *nmachines); int qemudProbeCPUModels (const char *qemu, + unsigned long long qemuCmdFlags, const char *arch, unsigned int *count, const char ***cpus); -- 1.7.1.1

2 2

[libvirt] [PATCH] virsh: Fix man page syntax
by Jiri Denemark 12 Jul '10

12 Jul '10

pod2man prints the following warning when generating virsh.1: tools/virsh.pod:890: Unmatched =back --- tools/virsh.pod | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 64cd0d0..e03dbe8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -781,6 +781,8 @@ Returns the UUID of the named I<pool>. =head1 VOLUME COMMANDS +=over 4 + =item B<vol-create> I<pool-or-uuid> I<FILE> Create a volume from an XML <file>. -- 1.7.1.1

2 2

[libvirt] [PATCH] Fix potential crash in QEMU monitor JSON impl
by Daniel P. Berrange 12 Jul '10

12 Jul '10

An indentation mistake meant that a check for return status was not properly performed in all cases. This could result in a crash on NULL pointer in a following line. * src/qemu/qemu_monitor_json.c: Fix check for return status when processing JSON for blockstats --- src/qemu/qemu_monitor_json.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 01be86d..4487ff5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1059,11 +1059,10 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (ret == 0) { + if (ret == 0) ret = qemuMonitorJSONCheckError(cmd, reply); - if (ret < 0) - goto cleanup; - } + if (ret < 0) + goto cleanup; ret = -1; devices = virJSONValueObjectGet(reply, "return"); @@ -1164,11 +1163,13 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, if (!cmd) return -1; - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + if (ret < 0) goto cleanup; + ret = -1; devices = virJSONValueObjectGet(reply, "return"); if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) { -- 1.7.1.1

2 1

[libvirt] Suggestions on how to add "Available from version: 0.x.x"?
by Justin Clift 12 Jul '10

12 Jul '10

Hi all, Looking at how to add extra info to the API docs. Specifically, listing with each function the version of libvirt it became available in. As is done with the GLib/GTK docs. Example here: http://library.gnome.org/devel/glib/stable/glib-Base64-Encoding.html#g-base… Looking at our present API docs though, they seem to be autogenerated, so I'm no sure how to approach this. My initial thinking is maybe having the list of each function per version in a separate (text?) file, and then somehow pull that info in. But, not even sure that will work. Anyone have ideas? Regards and best wishes, Justin Clift

3 2

[libvirt] FYI: a short guide to libvirt & network filtering iptables/ebtables use
by Daniel P. Berrange 10 Jul '10

10 Jul '10

I just wrote this to assist some Red Hat folks understanding what libvirt does with iptables, and thought it is useful info for the whole libvirt community. When I have time I'll adjust this content so that it can fit into the website in relevant pages/places. Firewall / network filtering in libvirt ======================================= There are three pieces of libvirt functionality which do network filtering of some type. At a high level they are: - The virtual network driver. This provides a isolated bridge device (ie no physical NICs enslaved). Guest TAP devices are attached to this bridge. Guests can talk to each other & the host, and optionally the wider world. - The QEMU driver MAC filtering This provides a generic filtering of MAC addresses to prevent the guest spoofing its MAC address. This is mostly obsoleted by the next item, so won't be discussed further. - The network filter driver This provides fully configurable, arbitrary network filtering of traffic on guest NICs. Generic rulesets are defined at the host level to control traffic in some manner. Rules sets are then associated with individual NICs of a guest. While not as expressive as directly using iptables/ebtables, this can still do nearly everything you would want to on a guest NIC filter. The virtual network driver ========================== The typical configuration for guests is to use bridging of the physical NIC on the host to connect the guest directly to the LAN. In RHEL6 there is also the possibility of using macvtap/sr-iov and VEPA connectivity. None of this stuff plays nicely with wireless NICs, since they will typically silently drop any traffic with a MAC address that doesn't match that of the physical NIC. Thus the virtual network driver in libvirt was invented. This takes the form of an isolated bridge device (ie one with no physical NICs enslaved). The TAP devices associated with the guest NICs are attached to the bridge device. This immediately allows guests on a single host to talk to each other and to the host OS (modulo host IPtables rules). libvirt then uses iptables to control what further connectivity is available. There are three configurations possible for a virtual network at time of writing - isolated: all off-node traffic is completely blocked - nat: outbound traffic to the LAN is allowed, but MASQUERADED - forward: outbound traffic to the LAN is allowed The latter 'forward' case requires the virtual network be on a separate sub-net from the main LAN, and that the LAN admin has configured routing for this subnet. In the future we intend to add support for IP subnetting and/or proxy-arp. This allows for the virtual network to use the same subnet as the main LAN & should avoid need for the LAN admin to configure special routing. Libvirt will optionally also provide DHCP services to the virtual network using DNSMASQ. In all cases, we need to allow DNS/DHCP queries to the host OS. Since we can't predict whether the host firewall setup is already allowing this, we insert 4 rules into the head of the INPUT chain target prot opt in out source destination ACCEPT udp -- virbr0 * 0.0.0.0/0 0.0.0.0/0 udp dpt:53 ACCEPT tcp -- virbr0 * 0.0.0.0/0 0.0.0.0/0 tcp dpt:53 ACCEPT udp -- virbr0 * 0.0.0.0/0 0.0.0.0/0 udp dpt:67 ACCEPT tcp -- virbr0 * 0.0.0.0/0 0.0.0.0/0 tcp dpt:67 Note we have restricted our rules to just the bridge associated with the virutal network, to avoid opening undesirable holes in the host firewall wrt the LAN/WAN. The next rules depend on the type of connectivity allowed, and go in the main FORWARD chain: type=isolated ------------- Allow traffic between guests. Deny inbound. Deny outbound. target prot opt in out source destination ACCEPT all -- virbr1 virbr1 0.0.0.0/0 0.0.0.0/0 REJECT all -- * virbr1 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable REJECT all -- virbr1 * 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable type=nat -------- Allow inbound related to an established connection. Allow outbound, but only from our expected subnet. Allow traffic between guests. Deny all other inbound. Deny all other outbound. target prot opt in out source destination ACCEPT all -- * virbr0 0.0.0.0/0 192.168.122.0/24 state RELATED,ESTABLISHED ACCEPT all -- virbr0 * 192.168.122.0/24 0.0.0.0/0 ACCEPT all -- virbr0 virbr0 0.0.0.0/0 0.0.0.0/0 REJECT all -- * virbr0 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable REJECT all -- virbr0 * 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable type=routed ----------- Allow inbound, but only to our expected subnet. Allow outbound, but only from our expected subnet. Allow traffic between guests. Deny all other inbound. Deny all other outbound. target prot opt in out source destination ACCEPT all -- * virbr2 0.0.0.0/0 192.168.124.0/24 ACCEPT all -- virbr2 * 192.168.124.0/24 0.0.0.0/0 ACCEPT all -- virbr2 virbr2 0.0.0.0/0 0.0.0.0/0 REJECT all -- * virbr2 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable REJECT all -- virbr2 * 0.0.0.0/0 0.0.0.0/0 reject-with icmp-port-unreachable Finally, with type=nat, there is also an entry in the POSTROUTING chain to apply masquerading target prot opt in out source destination MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 The network filter driver ========================= This driver provides a fully configurable network filtering capability that leverages ebtables, iptables and ip6tables. This was written by the libvirt guys at IBM and although its XML schema is defined by libvirt, the conceptual model is closely aligned with the DMTF CIM schema for network filtering http://www.dmtf.org/standards/cim/cim_schema_v2230/CIM_Network.pdf The filters are managed in libvirt as a top level, standalone object. This allows the filters to then be referenced by any libvirt object that requires their functionality, instead tieing them only to use by guest NICs. In the current implementation, filters can be associated with individual guest NICs via the libvirt domain XML format. In the future we might allow filters to be associated with the virtual network objects. Further we're expecting to define a new 'virtual switch' object to remove the complexity of configuring bridge/sriov/vepa networking modes. This make also end up making use of network filters. There are a new set of virsh commands for managing network filters virsh nwfilter-define define or update a network filter from an XML file virsh nwfilter-undefine undefine a network filter virsh nwfilter-dumpxml network filter information in XML virsh nwfilter-list list network filters virsh nwfilter-edit edit XML configuration for a network filter There are equivalently named C APIs for each of these commands. As with all objects libvirt manages, network filters are configured using an XML format. At a high level the format looks like this: <filter name='no-spamming' chain='XXXX'> <uuid>d217f2d7-5a04-0e01-8b98-ec2743436b74</uuid> <rule ...> .... </rule> <filterref filter='XXXX'/> </filter> Every filter has a name and UUID which serve as unique identifiers. A filter can have zero-or-more <rule> elements which are used to actually define network controls. Filters can be arranged into a DAG, so zero-or-more <filterref/> elements are also allowed. Cycles in the graph are not allowed. The <rule> element is where all the interesting stuff happens. It has three attributes, an action, a traffic direction and an optional priority. eg <rule action='drop' direction='out' priority='500'> Within the rule there are a wide variety of elements allowed, which do protocol specific matching. Supported protocols currently include 'mac', 'arp', 'rarp', 'ip', 'ipv6', 'tcp/ip', 'icmp/ip', 'igmp/ip', 'udp/ip', 'udplite/ip' 'esp/ip', 'ah/ip', 'sctp/ip', 'tcp/ipv6', 'icmp/ipv6', 'igmp/ipv6', 'udp/ipv6', 'udplite/ipv6', 'esp/ipv6', 'ah/ipv6', 'sctp/ipv6'. Each protocol defines what is valid inside the <rule> element, the general pattern though is <protocol match='yes|no' attribute1='value1' attribute2='value2'/> so, eg a TCP protocol, matching ports 0-1023 would be expressed as: <tcp match='yes' srcportstart='0' srcportend='1023'/> Attributes can included references to variables defined by the object using the rule. So the guest XML format allows each NIC to have a MAC address and IP address defined. These are made available to filters via the variables $IP and $MAC. So to define a filter the prevents IP address spoofing we can simply match on source IP address != $IP <filter name='no-ip-spoofing' chain='ipv4'> <rule action='drop' direction='out'> <ip match='no' srcipaddr='$IP' /> </rule> </filter> I'm not going to go into details on all the other protocol matches you can do, because it'll take far too much space. You can read about the options here http://libvirt.org/formatnwfilter.html#nwfelemsRulesProto Out of the box in RHEL6/Fedora rawhide, libvirt ships with a set of default useful rules # virsh nwfilter-list UUID Name ---------------------------------------------------------------- 15b1ab2b-b1ac-1be2-ed49-2042caba4abb allow-arp 6c51a466-8d14-6d11-46b0-68b1a883d00f allow-dhcp 7517ad6c-bd90-37c8-26c9-4eabcb69848d allow-dhcp-server 3d38b406-7cf0-8335-f5ff-4b9add35f288 allow-incoming-ipv4 5ff06320-9228-2899-3db0-e32554933415 allow-ipv4 db0b1767-d62b-269b-ea96-0cc8b451144e clean-traffic f88f1932-debf-4aa1-9fbe-f10d3aa4bc95 no-arp-spoofing 772f112d-52e4-700c-0250-e178a3d91a7a no-ip-multicast 7ee20370-8106-765d-f7ff-8a60d5aaf30b no-ip-spoofing d5d3c490-c2eb-68b1-24fc-3ee362fc8af3 no-mac-broadcast fb57c546-76dc-a372-513f-e8179011b48a no-mac-spoofing dba10ea7-446d-76de-346f-335bd99c1d05 no-other-l2-traffic f5c78134-9da4-0c60-a9f0-fb37bc21ac1f no-other-rarp-traffic 7637e405-4ccf-42ac-5b41-14f8d03d8cf3 qemu-announce-self 9aed52e7-f0f3-343e-fe5c-7dcb27b594e5 qemu-announce-self-rarp Most of these are just building blocks. The interesting one here is 'clean-traffic'. This pulls together all the building blocks into one filter that you can then associate with a guest NIC. This stops the most common bad things a guest might try, IP spoofing, arp spoofing and MAC spoofing. To look at the rules for any of these just do virsh nwfilter-dumpxml FILTERNAME|UUID They are all stored in /etc/libvirt/nwfilter, but don't edit files there directly. Use 'virsh nwfilter-define' to update them. This ensures the guests have their iptables/ebtables rules recreated. To associate the clean-trafffic filter with a guest, edit the guest XML config and change the <interface> element to include a <filterref> and also specify the whitelisted <ip addres/> the guest is allowed to use <interface type='bridge'> <mac address='52:54:00:56:44:32'/> <source bridge='br1'/> <ip address='10.33.8.131'/> <target dev='vnet0'/> <model type='virtio'/> <filterref filter='clean-traffic'/> </interface> If no <ip address> is included, the network filter driver will activate its 'learning mode'. This uses libpcap to snoop on network traffic the guest sends and attempts to identify the first IP address it uses. It then locks traffic to this address. Obviously this isn't entirely secure, but it does offer some protection against the guest being trojaned once up & running. In the future we intend to enhance the learning mode so that it looks for DHCPOFFERS from a trusted DHCP server and only allows the offered IP address to be used. Now, how is all this implemented... The network filter driver uses a combination of ebtables, iptables and ip6tables, depending on which protocols are referenced in a filter. The out of the box 'clean-traffic' filter rules only require use of ebtables. If you want to do matching at tcp/udp/etc protocols (eg to add a new filter 'no-email-spamming' to block port 25), then iptables will also be used. The driver attempts to keep its rules separate from those that the host admin might already have configured. So the first thing it does with ebtables, is to add two hooks in POSTROUTING & PREROUTING chains, to redirect traffic to custom chains. These hooks match on the TAP device name of the guest NIC, so they should not interact badly with any administrator defined rules Bridge chain: PREROUTING, entries: 1, policy: ACCEPT -i vnet0 -j libvirt-I-vnet0 Bridge chain: POSTROUTING, entries: 1, policy: ACCEPT -o vnet0 -j libvirt-O-vnet0 To keep things managable & easy to follow, the driver will then create further sub-chains for each protocol then it needs to match against: Bridge chain: libvirt-I-vnet0, entries: 5, policy: ACCEPT -p IPv4 -j I-vnet0-ipv4 -p ARP -j I-vnet0-arp -p 0x8035 -j I-vnet0-rarp -p 0x835 -j ACCEPT -j DROP Bridge chain: libvirt-O-vnet0, entries: 4, policy: ACCEPT -p IPv4 -j O-vnet0-ipv4 -p ARP -j O-vnet0-arp -p 0x8035 -j O-vnet0-rarp -j DROP Finally, come the actual implementation of the filters. These example is showing the 'clean-traffic' filter implementation. I'm not going to explain what this is doing now :-) Bridge chain: I-vnet0-ipv4, entries: 2, policy: ACCEPT -s ! 52:54:0:56:44:32 -j DROP -p IPv4 --ip-src ! 10.33.8.131 -j DROP Bridge chain: O-vnet0-ipv4, entries: 1, policy: ACCEPT -j ACCEPT Bridge chain: I-vnet0-arp, entries: 6, policy: ACCEPT -s ! 52:54:0:56:44:32 -j DROP -p ARP --arp-mac-src ! 52:54:0:56:44:32 -j DROP -p ARP --arp-ip-src ! 10.33.8.131 -j DROP -p ARP --arp-op Request -j ACCEPT -p ARP --arp-op Reply -j ACCEPT -j DROP Bridge chain: O-vnet0-arp, entries: 5, policy: ACCEPT -p ARP --arp-op Reply --arp-mac-dst ! 52:54:0:56:44:32 -j DROP -p ARP --arp-ip-dst ! 10.33.8.131 -j DROP -p ARP --arp-op Request -j ACCEPT -p ARP --arp-op Reply -j ACCEPT -j DROP Bridge chain: I-vnet0-rarp, entries: 2, policy: ACCEPT -p 0x8035 -s 52:54:0:56:44:32 -d Broadcast --arp-op Request_Reverse --arp-ip-src 0.0.0.0 --arp-ip-dst 0.0.0.0 --arp-mac-src 52:54:0:56:44:32 --arp-mac-dst 52:54:0:56:44:32 -j ACCEPT -j DROP Bridge chain: O-vnet0-rarp, entries: 2, policy: ACCEPT -p 0x8035 -d Broadcast --arp-op Request_Reverse --arp-ip-src 0.0.0.0 --arp-ip-dst 0.0.0.0 --arp-mac-src 52:54:0:56:44:32 --arp-mac-dst 52:54:0:56:44:32 -j ACCEPT -j DROP NB, we would have liked to include the prefix 'libvirt-' in all of our chain names, but unfortunately the kernel limits names to a very short maximum length. So only the first two custom chains can include that prefix. The others just include the TAP device name + protocol name. If I define a new filter 'no-spamming' and then add this to the 'clean-traffic' filter, I can illustrate how iptables usage works. # cat > /root/spamming.xml <<EOF <filter name='no-spamming' chain='root'> <uuid>d217f2d7-5a04-0e01-8b98-ec2743436b74</uuid> <rule action='drop' direction='out' priority='500'> <tcp dstportstart='25' dstportend='25'/> </rule> </filter> EOF # virsh nwfilter-define /root/spamming.xml # virsh nwfilter-edit clean-traffic ...add <filterref filter='no-spamming'/> All active guests immediately have their iptables/ebtables rules rebuilt. The network filter driver deals with iptables in a very similar way. First it separates out its rules from those the admin may have defined, by adding a couple of hooks into the INPUT/FORWARD chains Chain INPUT (policy ACCEPT 13M packets, 21G bytes) target prot opt in out source destination libvirt-host-in all -- * * 0.0.0.0/0 0.0.0.0/0 Chain FORWARD (policy ACCEPT 5532K packets, 3010M bytes) target prot opt in out source destination libvirt-in all -- * * 0.0.0.0/0 0.0.0.0/0 libvirt-out all -- * * 0.0.0.0/0 0.0.0.0/0 libvirt-in-post all -- * * 0.0.0.0/0 0.0.0.0/0 These custom chains, then do matching based on the TAP device name, so they won't open holes in the admin defined matches for the LAN/WAN (if any). Chain libvirt-host-in (1 references) target prot opt in out source destination HI-vnet0 all -- * * 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 Chain libvirt-in (1 references) target prot opt in out source destination FI-vnet0 all -- * * 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-in vnet0 Chain libvirt-in-post (1 references) target prot opt in out source destination ACCEPT all -- * * 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 Chain libvirt-out (1 references) target prot opt in out source destination FO-vnet0 all -- * * 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 Finally, we can see the interesting bit which is the actual implementation of my filter to block port 25 access: Chain FI-vnet0 (1 references) target prot opt in out source destination DROP tcp -- * * 0.0.0.0/0 0.0.0.0/0 tcp dpt:25 Chain FO-vnet0 (1 references) target prot opt in out source destination DROP tcp -- * * 0.0.0.0/0 0.0.0.0/0 tcp spt:25 Chain HI-vnet0 (1 references) target prot opt in out source destination DROP tcp -- * * 0.0.0.0/0 0.0.0.0/0 tcp dpt:25 One thing in looking at this that you may notice is that if there are many guests all using the same filters, we will be duplicating the iptables rules over & over for each guest. This is merely a limitation of the current rules engine implementation. At the libvirt object modelling level you can clearly see we've designed the model so that filter rules are define in one place, and indirectly referenced by guests. Thus it should be possible to change the impl in the future so that we can share the actual iptables/ebtables rules for each guest to create a more scalable system. The stuff in current libvirt is more or less the very first working impl we've had of this stuff, so there's not been much optimization work yet. Also notice that at the XML level we don't expose the fact that we are using iptables or ebtables at all. The rule definition is done in terms of network protocols. Thus if we ever find a need, we could plug in an alternative implementation that calls out to a different firewall implementation instead of ebtables/iptables (providing that impl was suitably expressive of course) Finally, in terms of problems we have in deployment. The biggest problem is that if the admin does 'service iptables restart' all our work gets blown away. We've experimented with using lokkit to record our custom rules in a persistent config file, but that caused different problem. Admins who were not using lokkit for their config found that all their own rules got blown away. So we threw away our lokkit code. Instead we document that if you run 'service iptables restart', you need to send SIGHUP to libvirt to make it recreate its rules. Finally a reminder, that the main documentation we have on this is online at http://libvirt.org/formatnwfilter.html Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

6 9

[libvirt] KVM Forum 2010: schedule and registration reminder
by KVM Forum 2010 Program Committee 09 Jul '10

09 Jul '10

As a reminder...the registration fees will increase on July 15th, so register now to save the fees. KVM Forum registration link is here: http://events.linuxfoundation.org/component/registrationpro/?func=details&d… Hotel and travel information is here (same hotel and venue as LinuxCon): http://events.linuxfoundation.org/events/linuxcon/hotel Here is the schedule (should be up on the LF site with more details shortly). Monday, August 9th ------------------ 9:00 9:30 Welcome + Keynote 9:30 10:15 Desktop virtualization with spice 10:15 10:45 Developing tests for the KVM autotest framework 10:45 11:00 - break - 11:00 11:30 Threading the QEMU Device Model 11:30 12:00 QEMU's new device model qdev 12:00 12:30 KVM on Server Class PowerPC 12:30 13:30 - lunch - 13:30 14:00 Transparent Hugepage Support 14:00 14:30 Migration: how to hop from machine to machine without losing state 14:30 15:00 Sheepdog: distributed storage system for QEMU 15:00 15:30 - break - 15:30 16:00 How to keep time correctly, and avoid SDR-awk cab emit peek problems 16:00 16:30 PV-DMA using IOMMU Emulation 16:30 16:45 Network Virtualization in KVM 16:45 17:00 Ganeti as a KVM cluster management interface 17:00 17:15 Porting virtio to PowerVM Hypervisors 17:15 17:30 lightning talks 17:30 19:00 BoFs Tuesday, August 10th -------------------- 9:00 9:15 Keynote 9:15 9:45 vhost-net and virtio-net: need for speed 9:45 10:15 The QEMU Monitor Protocol (QMP) 10:15 10:45 Integrating KVM with Linux 10:45 11:00 - break - 11:00 11:30 KVM in Embedded: Requirements, Experiences and Open Challenges 11:30 12:00 Kemari: Fault Tolerant Virtual Machine Synchronization based on KVM 12:00 12:30 Managing Resources on Over-committed Virtualization Hosts 12:30 13:30 - lunch - 13:30 14:00 A Walkthrough on some recent KVM performance improvements 14:00 14:30 Examing KVM as Nested Virtualization Friendly Guest 14:30 15:00 PCI direct device assignment: pwned! all your devices are belong to guest 15:00 15:30 - break - 15:30 16:00 Performance and Scalability of Server Consolidation using KVM 16:00 16:15 WinKVM: Windows kernel-based Virtual Machine 16:15 16:30 Nahanni: Inter-VM Shared Memory 16:30 16:45 Asynchronous Page Faults: AIX did it. 16:45 17:00 PCI Express support in QEmu 17:00 17:15 lightning talks 17:15 17:30 Closing comments 17:30 19:00 BoFs We look forward to seeing you there. thanks, -KVM Forum 2010 Program Commitee

1 0

[libvirt] Question about libxml.
by erik.e.bengtson＠americas.bnpparibas.com 09 Jul '10

09 Jul '10

Hi, I saw a post by Daniel veillard regarding memory leaks using libxml. The suggestion was to use malloc_trim(0), to correct the issue. However, I canot find it anywhere on Solaris. Do you know if this is located on Solaris 5.10, and if so, what header file is it located in. If it is not on Solaris, do you know of an alternative function that could take it's place ? Apologies if this is directed to a group, but the post I saw Daniels name did not have a personal email address. Regards, Erik This message and any attachments (the "message") is intended solely for the addressees and is confidential. If you receive this message in error, please delete it and immediately notify the sender. Any use not in accord with its purpose, any dissemination or disclosure, either whole or partial, is prohibited except formal approval. The internet can not guarantee the integrity of this message. BNP PARIBAS (and its subsidiaries) shall (will) not therefore be liable for the message if modified. Please note that certain functions and services for BNP Paribas may be performed by BNP Paribas RCC, Inc.

1 0

[libvirt] [PATCHv2 1/2] virsh: add new --details option to pool-list
by Justin Clift 09 Jul '10

09 Jul '10

This patch adds a new --details option to the virsh pool-list command, making its output more useful to people who use virsh for significant lengths of time. Addresses BZ # 605543 https://bugzilla.redhat.com/show_bug.cgi?id=605543 --- Output from the new option (hopefully this doesn't wrap): virsh # pool-list Name State Autostart ----------------------------------------- default active yes image_dir active yes virsh # pool-list --all Name State Autostart ----------------------------------------- default active yes image_dir active yes tmp inactive no virsh # pool-list --details Name State Autostart Persistent Capacity Allocation Available -------------------------------------------------------------------------------------- default running yes yes 1.79 TB 1.47 TB 326.02 GB image_dir running yes yes 1.79 TB 1.47 TB 326.02 GB virsh # pool-list --all --details Name State Autostart Persistent Capacity Allocation Available -------------------------------------------------------------------------------------- default running yes yes 1.79 TB 1.47 TB 326.02 GB image_dir running yes yes 1.79 TB 1.47 TB 326.02 GB tmp inactive no yes - - - virsh # Much more practical than running pool-info individually on each pool. tools/virsh.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++------ tools/virsh.pod | 6 ++- 2 files changed, 119 insertions(+), 17 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d8d2220..afa84e6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4882,14 +4882,17 @@ static const vshCmdInfo info_pool_list[] = { static const vshCmdOptDef opts_pool_list[] = { {"inactive", VSH_OT_BOOL, 0, N_("list inactive pools")}, {"all", VSH_OT_BOOL, 0, N_("list inactive & active pools")}, + {"details", VSH_OT_BOOL, 0, N_("display extended details for pools")}, {NULL, 0, 0, NULL} }; static int cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { + virStoragePoolInfo info; int inactive = vshCommandOptBool(cmd, "inactive"); int all = vshCommandOptBool(cmd, "all"); + int details = vshCommandOptBool(cmd, "details"); int active = !inactive || all ? 1 : 0; int maxactive = 0, maxinactive = 0, i; char **activeNames = NULL, **inactiveNames = NULL; @@ -4937,36 +4940,114 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), _("Autostart")); - vshPrintExtra(ctl, "-----------------------------------------\n"); + + /* Display the appropriate heading */ + if (details) { + vshPrintExtra(ctl, "%-20s %-10s %-10s %-11s %-9s %-11s %-10s\n", + _("Name"), _("State"), _("Autostart"), _("Persistent"), + _("Capacity"), _("Allocation"), _("Available")); + vshPrintExtra(ctl, + "--------------------------------------------------------------------------------------\n"); + } else { + vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), + _("Autostart")); + vshPrintExtra(ctl, "-----------------------------------------\n"); + } for (i = 0; i < maxactive; i++) { - virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, activeNames[i]); - const char *autostartStr; - int autostart = 0; + const char *autostartStr, *persistentStr, *stateStr = NULL; + int autostart = 0, persistent = 0; /* this kind of work with pools is not atomic operation */ + virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, activeNames[i]); if (!pool) { VIR_FREE(activeNames[i]); continue; } + /* Retrieve the pool autostart status */ if (virStoragePoolGetAutostart(pool, &autostart) < 0) autostartStr = _("no autostart"); else autostartStr = autostart ? _("yes") : _("no"); - vshPrint(ctl, "%-20s %-10s %-10s\n", - virStoragePoolGetName(pool), - _("active"), - autostartStr); + /* If requested, collect the extended information for this pool */ + if (details) { + if (virStoragePoolGetInfo(pool, &info) != 0) { + vshError(ctl, "%s", _("Could not retrieve pool information")); + VIR_FREE(activeNames[i]); + continue; + } + + /* Decide which state string to display */ + switch (info.state) { + case VIR_STORAGE_POOL_INACTIVE: + stateStr = _("inactive"); + break; + case VIR_STORAGE_POOL_BUILDING: + stateStr = _("building"); + break; + case VIR_STORAGE_POOL_RUNNING: + stateStr = _("running"); + break; + case VIR_STORAGE_POOL_DEGRADED: + stateStr = _("degraded"); + break; + case VIR_STORAGE_POOL_INACCESSIBLE: + stateStr = _("inaccessible"); + break; + } + + /* Check if the pool is persistent or not */ + persistent = virStoragePoolIsPersistent(pool); + vshDebug(ctl, 5, "Persistent flag value: %d\n", persistent); + if (persistent < 0) + persistentStr = _("unknown"); + else + persistentStr = persistent ? _("yes") : _("no"); + + /* Display all information for this pool */ + vshPrint(ctl, "%-20s %-10s %-10s %-11s", + virStoragePoolGetName(pool), + stateStr, + autostartStr, + persistentStr); + + /* Display the capacity related quantities */ + if (info.state == VIR_STORAGE_POOL_RUNNING || + info.state == VIR_STORAGE_POOL_DEGRADED) { + double val; + const char *unit; + virBuffer infoBufStr = VIR_BUFFER_INITIALIZER; + + val = prettyCapacity(info.capacity, &unit); + virBufferVSprintf(&infoBufStr, "%.2lf %s", val, unit); + vshPrint(ctl, " %-9s", virBufferContentAndReset(&infoBufStr)); + + val = prettyCapacity(info.allocation, &unit); + virBufferVSprintf(&infoBufStr, "%.2lf %s", val, unit); + vshPrint(ctl, " %-11s", virBufferContentAndReset(&infoBufStr)); + + val = prettyCapacity(info.available, &unit); + virBufferVSprintf(&infoBufStr, "%.2lf %s", val, unit); + vshPrint(ctl, " %-10s\n", virBufferContentAndReset(&infoBufStr)); + } else + vshPrint(ctl, " %-9s %-11s %-10s\n", "-", "-", "-"); + } else { + /* Display basic information pool information */ + vshPrint(ctl, "%-20s %-10s %-10s\n", + virStoragePoolGetName(pool), + _("active"), + autostartStr); + } + virStoragePoolFree(pool); VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, inactiveNames[i]); - const char *autostartStr; - int autostart = 0; + const char *autostartStr, *persistentStr; + int autostart = 0, persistent = 0; /* this kind of work with pools is not atomic operation */ if (!pool) { @@ -4979,10 +5060,29 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else autostartStr = autostart ? _("yes") : _("no"); - vshPrint(ctl, "%-20s %-10s %-10s\n", - inactiveNames[i], - _("inactive"), - autostartStr); + if (details) { + /* Check if the pool is persistent or not */ + persistent = virStoragePoolIsPersistent(pool); + vshDebug(ctl, 5, "Persistent flag value: %d\n", persistent); + if (persistent < 0) + persistentStr = _("unknown"); + else + persistentStr = persistent ? _("yes") : _("no"); + + /* Display detailed pool information */ + vshPrint(ctl, "%-20s %-10s %-10s %-11s %-9s %-11s %-10s\n", + inactiveNames[i], + _("inactive"), + autostartStr, + persistentStr, + "-", "-", "-"); + } else { + /* Display basic pool information */ + vshPrint(ctl, "%-20s %-10s %-10s\n", + inactiveNames[i], + _("inactive"), + autostartStr); + } virStoragePoolFree(pool); VIR_FREE(inactiveNames[i]); diff --git a/tools/virsh.pod b/tools/virsh.pod index b1917ee..cec07e3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -732,11 +732,13 @@ variables, and defaults to C<vi>. Returns basic information about the I<pool> object. -=item B<pool-list> optional I<--inactive> I<--all> +=item B<pool-list> optional I<--inactive> I<--all> I<--details> List pool objects known to libvirt. By default, only pools in use by active domains are listed; I<--inactive> lists just the inactive -pools, and I<--all> lists all pools. +pools, and I<--all> lists all pools. The I<--details> option instructs +virsh to additionally display pool persistence and capacity related +information where available. =item B<pool-name> I<uuid> -- 1.7.0.1

7 41

[libvirt] [PATCH] authors: update my authors details
by Justin Clift 09 Jul '10

09 Jul '10

--- .mailmap | 1 + AUTHORS | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.mailmap b/.mailmap index 8c1eed3..608780d 100644 --- a/.mailmap +++ b/.mailmap @@ -11,3 +11,4 @@ <socketpair(a)gmail.com> <socketpair gmail com> <soren(a)canonical.com> <soren(a)ubuntu.com> <jfehlig(a)novell.com> <jfehlig(a)linux-ypgk.site> +<jclift(a)redhat.com> <justin(a)salasaga.org> diff --git a/AUTHORS b/AUTHORS index 222e1b7..aa1a1cf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -124,7 +124,7 @@ Patches have also been contributed by: Thomas Treutner <thomas(a)scripty.at> Jean-Baptiste Rouault <jean-baptiste.rouault(a)diateam.net> Марк Коренберг <socketpair(a)gmail.com> - Justin Clift <justin(a)salasaga.org> + Justin Clift <jclift(a)redhat.com> Alan Pevec <apevec(a)redhat.com> [....send patches to get your name here....] -- 1.7.1

3 6

[libvirt] qemu hook is not starting
by Csom Gyula 08 Jul '10

08 Jul '10

Hi there! Since our cloud system that is currently under development, might need it, I've tested libvirt domain hooks but unfortunately failed. I've tried the following scenario: 1. create the hook directory... # mkdir /etc/libvirt/hook # chmod 755 /etc/libvirt/hook 2. ... or maybe hooks? # ln -s hook hooks 3. create the hook script # vi /etc/libvirt/hook/qemu # cat /etc/libvirt/hook/qemu #!/bin/bash echo "*****************************************************" >> /tmp/libvirt.log echo "qemu-hook: $@" >> /tmp/libvirt.log echo "*****************************************************" >> /tmp/libvirt.log echo "test error" >&2 exit 1 # chmod 755 /etc/libvirt/hook/qemu 4. Then I restarted the libvirt daemon and created a domain through virsh. Unfortunately nothing happened. That is the vm started - although according to the documentation [1] it should not have to start: "a non-zero return value from the script will abort the domain startup operation, and if an error string is passed on stderr by the hook script, it will be provided back to the user at the libvirt API level". Also the messages echod by the script did not appear in the log. Could you please tell what I missed? What (else) should be done in order to run hooks? Thanks in advance, Gyula --- [1] http://libvirt.org/hooks.html

2 2

[libvirt] Allow to change the maximum migration downtime -- bug 561935
by Alex Jia 08 Jul '10

08 Jul '10

Hi Daniel, I have simulated a slow network by linux bridge on source host machine, but I found that I hardly connected guest by serial or vnc, it is pretty slow, I can't run other big application in the guest, so I change my idea, as long as I have a slow link, whether the network is in source or target machine, finally, I created slow network on target machine, the attachment is a shell script about the network creation process. Using 'tc' to throttle network traffic on the target host # tc qdisc show qdisc tbf 8004: dev eth0 root refcnt 2 rate 128000bit burst 128Kb lat 50.0ms qdisc pfifo_fast 0: dev eth1 root refcnt 2 bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1 WRT big apps, I use stress tool to consume guest memory(current size is 4G), cmd line argument as following: stress --cpu 2 --io 2 --vm 50 --vm-bytes 128M --timeout 480s And then running migration, and open another terminal set maximum migration downtime 60000 milliseconds, the following error information is raised by libvirt: 1.open one terminal run migrate # virsh migrate rhel6 qemu+ssh://10.66.70.152/system root(a)10.66.70.152's password: 2.open another terminal set maximum migration downtime # virsh migrate-setmaxdowntime --domain rhel6 --downtime 60000 error: Requested operation is not valid: domain is not being migrated In fact, step 1 will never be finished. BTW, the guest can be successfully migrated if I don't use the above environment configuration. Best Regards, Alex

2 2

[libvirt] How to clone a domain using Java API?
by Ganesh Pagade 08 Jul '10

08 Jul '10

Couldn't find any Java API or even any function in libvirt documentation: http://libvirt.org/html/libvirt-libvirt.html In case there is no API present can someone please point how this can be achieved using existing Java APIs to get the same behavior as virt-clone? Thanks, -Ganesh

3 2

[libvirt] [PATCH] Ensure we return the callback ID in python events binding
by Daniel P. Berrange 08 Jul '10

08 Jul '10

A missing return statement in the python binding meant that the callers could not get the callback ID, and thus not be able to unregister event callbacks * python/libvirt-override-virConnect.py: Add missing return statement --- python/libvirt-override-virConnect.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 1a1cdd0..52914dc 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -146,3 +146,4 @@ if ret == -1: raise libvirtError ('virConnectDomainEventRegisterAny() failed', conn=self) self.domainEventCallbackID[ret] = opaque + return ret -- 1.6.6.1

2 1

[libvirt] [PATCH] Implement virsh managedsave-remove command.
by Chris Lalancette 08 Jul '10

08 Jul '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 6 ++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2d749de..8e5aa42 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1452,6 +1452,60 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) } /* + * "managedsave-remove" command + */ +static const vshCmdInfo info_managedsaveremove[] = { + {"help", N_("Remove managed save of a domain")}, + {"desc", N_("Remove an existing managed save state file from a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_managedsaveremove[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + char *name; + int ret = FALSE; + int hassave; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) + return FALSE; + + hassave = virDomainHasManagedSaveImage(dom, 0); + if (hassave < 0) { + vshError(ctl, _("Failed to check for domain managed save image")); + goto cleanup; + } + + if (hassave) { + if (virDomainManagedSaveRemove(dom, 0) < 0) { + vshError(ctl, _("Failed to remove managed save image for domain %s"), + name); + goto cleanup; + } + else + vshPrint(ctl, _("Removed managedsave image for domain %s"), name); + } + else + vshPrint(ctl, _("Domain %s has no manage save image; removal skipped"), + name); + + ret = TRUE; + +cleanup: + virDomainFree(dom); + return ret; +} + +/* * "schedinfo" command */ static const vshCmdInfo info_schedinfo[] = { @@ -9273,6 +9327,7 @@ static const vshCmdDef commands[] = { {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, + {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove}, {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, diff --git a/tools/virsh.pod b/tools/virsh.pod index 2b2227f..eb1fd04 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -380,6 +380,12 @@ Ask libvirt to save a running domain state in a place managed by libvirt. If libvirt is asked to restart the domain later on it will resume it from the saved domain state (and the state is discarded). +=item B<managedsave-remove> I<domain-id> + +Remove the managed save file for a domain if it exists. The next time the +domain is started it will not restore to its previous state but instead will +do a full boot. + =item B<migrate> optional I<--live> I<--suspend> I<domain-id> I<desturi> I<migrateuri> Migrate domain to another host. Add --live for live migration; --suspend -- 1.6.6.1

2 2

[libvirt] [PATCH] daemon: Fix compilation error of dispatch.c
by Ryota Ozaki 08 Jul '10

08 Jul '10

[error message] CC libvirtd-dispatch.o dispatch.c: In function 'remoteDispatchFormatError': dispatch.c:83: error: 'va_list' undeclared (first use in this function) dispatch.c:83: error: (Each undeclared identifier is reported only once dispatch.c:83: error: for each function it appears in.) dispatch.c:83: error: expected ';' before 'args' cc1: warnings being treated as errors dispatch.c:87: error: implicit declaration of function 'va_start' [-Wimplicit-function-declaration] dispatch.c:87: error: nested extern declaration of 'va_start' [-Wnested-externs] dispatch.c:87: error: 'args' undeclared (first use in this function) dispatch.c:88: error: implicit declaration of function 'vsnprintf' [-Wimplicit-function-declaration] dispatch.c:89: error: implicit declaration of function 'va_end' [-Wimplicit-function-declaration] dispatch.c:89: error: nested extern declaration of 'va_end' [-Wnested-externs] * daemon/dispatch.c: include stdio.h and stdarg.h --- daemon/dispatch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index 8f55eaa..966db71 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -23,6 +23,9 @@ #include <config.h> +#include <stdio.h> +#include <stdarg.h> + #include "dispatch.h" #include "remote.h" -- 1.6.6.1

3 11

[libvirt] [PATCH v3 0/8]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 07 Jul '10

07 Jul '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. I will point out one particular patch that could use some careful review, namely PATCH 6/8. In there, I change the remote_message_hdr to use an unsigned proc instead of a remote_procedure proc. Now, as far as I can tell the two sizes should be the same, so the wire protocol should be the same. Indeed, testing seems to show that older virsh can talk just fine to a libvirtd with this patch applied. However, the regenerated remote_protocol.c file for parsing remote_message_header has some strange bits in it that I don't quite understand. I'm hoping someone else can look at it and confirm that it is OK. Thanks to Dan Berrange and Eric Blake for their reviews already, and to DV for the Relax NG schema changes. Changes since v2 are listed in the individual patches.

4 20

[libvirt] [PATCH] cpu: Add new models from qemu's target-x86_64.conf
by Jiri Denemark 07 Jul '10

07 Jul '10

--- src/cpu/cpu_map.xml | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 283 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 3ec4a7e..986c61d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -353,5 +353,288 @@ <feature name='ssse3'/> <feature name='nx'/> </model> + + <model name='Conroe'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='ssse3'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Penryn'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='ssse3'/> + <feature name='sse4.1'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Nehalem'> + <vendor>Intel</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='ssse3'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='popcnt'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='lahf_lm'/> + </model> + + <model name='Opteron_G1'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + </model> + + <model name='Opteron_G2'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='rdtscp'/> + <feature name='svm'/> + <feature name='lahf_lm'/> + </model> + + <model name='Opteron_G3'> + <vendor>AMD</vendor> + <feature name='sse2'/> + <feature name='sse'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='sep'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='mtrr'/> + <feature name='clflush'/> + <feature name='mca'/> + <feature name='pse36'/> + <feature name='pni'/> + <feature name='cx16'/> + <feature name='monitor'/> + <feature name='popcnt'/> + <feature name='fxsr'/> + <feature name='mmx'/> + <feature name='pat'/> + <feature name='cmov'/> + <feature name='pge'/> + <feature name='apic'/> + <feature name='cx8'/> + <feature name='mce'/> + <feature name='pae'/> + <feature name='msr'/> + <feature name='tsc'/> + <feature name='pse'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='lm'/> + <feature name='syscall'/> + <feature name='nx'/> + <feature name='rdtscp'/> + <feature name='svm'/> + <feature name='sse4a'/> + <feature name='abm'/> + <feature name='misalignsse'/> + <feature name='lahf_lm'/> + </model> </arch> </cpus> -- 1.7.1.1

2 2

[libvirt] [PATCH] cpuBaseline: Detect empty set of common features
by Jiri Denemark 07 Jul '10

07 Jul '10

In case the set of CPUs has no features in common, report incompatible CPUs instead of returning the simplest CPU model with all features disabled. --- src/cpu/cpu_x86.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 30a2db6..0266ce9 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -233,6 +233,26 @@ x86DataSubtract(union cpuData *data1, } +static bool +x86DataIsEmpty(union cpuData *data) +{ + struct cpuX86cpuid zero = { 0, 0, 0, 0, 0 }; + unsigned int i; + + for (i = 0; i < data->x86.basic_len; i++) { + if (!x86cpuidMatch(data->x86.basic + i, &zero)) + return false; + } + + for (i = 0; i < data->x86.extended_len; i++) { + if (!x86cpuidMatch(data->x86.extended + i, &zero)) + return false; + } + + return true; +} + + static union cpuData * x86DataFromModel(const struct x86_model *model) { @@ -1363,6 +1383,12 @@ x86Baseline(virCPUDefPtr *cpus, if (!(data = x86DataFromModel(base_model))) goto no_memory; + if (x86DataIsEmpty(data)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("CPUs are incompatible")); + goto error; + } + if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; -- 1.7.1.1

2 2