- 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 <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>Since 0.8.2 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. Since 0.8.3 + </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

[libvirt] [PATCH] cpuBaseline: Don't mess with the CPU returned by arch driver
by Jiri Denemark 07 Jul '10

07 Jul '10

All features in the baseline CPU definition were always created with policy='require' even though an arch driver returned them with different policy settings. --- src/cpu/cpu.c | 12 +----------- src/cpu/cpu_x86.c | 2 ++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 580b767..8d6c22b 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -354,7 +354,6 @@ cpuBaseline(virCPUDefPtr *cpus, unsigned int nmodels) { struct cpuArchDriver *driver; - virCPUDefPtr cpu; unsigned int i; VIR_DEBUG("ncpus=%u, nmodels=%u", ncpus, nmodels); @@ -394,16 +393,7 @@ cpuBaseline(virCPUDefPtr *cpus, return NULL; } - if ((cpu = driver->baseline(cpus, ncpus, models, nmodels))) { - cpu->type = VIR_CPU_TYPE_GUEST; - cpu->match = VIR_CPU_MATCH_EXACT; - VIR_FREE(cpu->arch); - - for (i = 0; i < cpu->nfeatures; i++) - cpu->features[i].policy = VIR_CPU_FEATURE_REQUIRE; - } - - return cpu; + return driver->baseline(cpus, ncpus, models, nmodels); } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f7473bf..30a2db6 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1366,6 +1366,8 @@ x86Baseline(virCPUDefPtr *cpus, if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; + VIR_FREE(cpu->arch); + cleanup: x86DataFree(data); x86ModelFree(base_model); -- 1.7.1.1

2 2

[libvirt] [PATCH] Make html docs in non-srcdir build
by Jiri Denemark 07 Jul '10

07 Jul '10

--- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index c01e085..1183321 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -53,7 +53,7 @@ gif = \ architecture.gif \ node.gif -dot_html_in = $(wildcard *.html.in) +dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) dot_html = $(dot_html_in:%.html.in=%.html) patches = $(wildcard api_extension/*.patch) -- 1.7.1.1

2 2

[libvirt] [PATCH] esx: Allow 'pvscsi' as SCSI controller model
by Matthias Bolte 07 Jul '10

07 Jul '10

--- docs/drvesx.html.in | 13 ++++++++++++- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/esx/esx_vmx.c | 12 +++++++----- tests/vmx2xmldata/vmx2xml-scsi-driver.vmx | 5 +++++ tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 6 ++++++ tests/xml2vmxdata/xml2vmx-scsi-driver.vmx | 5 +++++ tests/xml2vmxdata/xml2vmx-scsi-driver.xml | 5 +++++ 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index bc7e1a0..f4e7530 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -302,7 +302,13 @@ ethernet0.checkMACAddress = "false" </dd> <dt><code>lsisas1068</code></dt> <dd> - LSI Logic SAS 1068 controller. + LSI Logic SAS 1068 controller. Since 0.8.0 + </dd> + <dt><code>pvscsi</code></dt> + <dd> + Special VMware Paravirtual SCSI controller, requires VMware tools inside + the guest. See <a href="http://kb.vmware.com/kb/1010398">VMware KB1010398</a> + for details. Since 0.8.3 </dd> </dl> @@ -642,5 +648,10 @@ Enter administrator password for example-vcenter.com: VMware VMX config parameters </a> </li> + <li> + <a href="http://www.vmware.com/pdf/vsp_4_pvscsi_perf.pdf"> + VMware ESX 4.0 PVSCSI Storage Performance + </a> + </li> </ul> </body></html> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fd57917..b171d01 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -676,6 +676,7 @@ <value>buslogic</value> <value>lsilogic</value> <value>lsisas1068</value> + <value>pvscsi</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 378c06e..3cd43c4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -142,7 +142,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, VIR_ENUM_IMPL(virDomainControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, "buslogic", "lsilogic", - "lsisas1068") + "lsisas1068", + "pvscsi") VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 01da17e..3451302 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -199,6 +199,7 @@ enum virDomainControllerModel { VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068, + VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_LAST }; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e10e745..46875f3 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -740,11 +740,12 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], if (controller->model != -1 && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068) { + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML attribute 'model' of entry " "'controller' to be 'buslogic' or 'lsilogic' or " - "'lsisas1068' but found '%s'"), + "'lsisas1068' or 'pvscsi' but found '%s'"), virDomainControllerModelTypeToString(controller->model)); return -1; } @@ -1483,11 +1484,12 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, bool *present, if (*virtualDev == -1 || (*virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068)) { + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_PVSCSI)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " - "or 'lsisas1068' but found '%s'"), virtualDev_name, - virtualDev_string); + "or 'lsisas1068' or 'pvscsi' but found '%s'"), + virtualDev_name, virtualDev_string); goto failure; } } diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx index cb055f6..64d7c99 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx @@ -6,6 +6,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "harddisk1.vmdk" @@ -15,3 +17,6 @@ scsi1:0.fileName = "harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "harddisk4.vmdk" diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index d39415d..f5739d9 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -26,8 +26,14 @@ <target dev='sdae' bus='scsi'/> <address type='drive' controller='2' bus='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + <address type='drive' controller='3' bus='0' unit='0'/> + </disk> <controller type='scsi' index='0' model='buslogic'/> <controller type='scsi' index='1' model='lsilogic'/> <controller type='scsi' index='2' model='lsisas1068'/> + <controller type='scsi' index='3' model='pvscsi'/> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx index 7cceca0..a92d7fc 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx @@ -11,6 +11,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk1.vmdk" @@ -20,3 +22,6 @@ scsi1:0.fileName = "/vmfs/volumes/datastore/directory/harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "/vmfs/volumes/datastore/directory/harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "/vmfs/volumes/datastore/directory/harddisk4.vmdk" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml index 797a26e..ae3a43c 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml @@ -21,5 +21,10 @@ <source file='[datastore] directory/harddisk3.vmdk'/> <target dev='sdae' bus='scsi'/> </disk> + <disk type='file' device='disk'> + <driver name='pvscsi'/> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + </disk> </devices> </domain> -- 1.7.0.4

2 1

Re: [libvirt] Get IP address of a running domain
by Camilo Aguilar 06 Jul '10

06 Jul '10

Hi Adrian, afaik, there is no a direct function to get the domain ip address if the address is acquired through DHCP regards, Camilo Aguilar On Tue, Jul 6, 2010 at 3:14 PM, adrian wyssen <wyssenadrian(a)gmail.com>wrote: > year, i can find the mac address of the machine with virDomainGetXMLDesc, > but not the ip. and since the machine is remote, the ip is not in my arp > cache. is there no other way or can i get the ip out of mac (even if this is > a "virtual" mac)? > > I must be able to contact the virtual domain via it's IP from within the > same network. > > thanks for your help! > adrian > > 2010/7/6 Camilo Aguilar <camilo(a)cloudescape.com> > > You should take a look in http://libvirt.org/formatdomain.html and >> http://libvirt.org/html/libvirt-libvirt.html#virDomainGetXMLDesc >> >> regards, >> Camilo Aguilar >> >> On Tue, Jul 6, 2010 at 2:23 PM, adrian wyssen <wyssenadrian(a)gmail.com>wrote: >> >>> Hi, >>> Sorry bothering you again, but I have another question: I did not find >>> any possibility to get the IP address of a running domain with libvirt. I >>> can get the domain pointer but I did not find any function in the API >>> returning my the IP address of the domain. I just can get other information >>> about the domain with virDomainGetInfo, but no IP. I want to be able to get >>> either a static assigned IP or a dynamically received IP from a DHCP server. >>> >>> PS: I use the ESX driver. >>> Thanks for giving me a hint. >>> Adrian >>> >>> -- >>> libvir-list mailing list >>> libvir-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/libvir-list >>> >> >> >

1 0

[libvirt] Get IP address of a running domain
by adrian wyssen 06 Jul '10

06 Jul '10

Hi, Sorry bothering you again, but I have another question: I did not find any possibility to get the IP address of a running domain with libvirt. I can get the domain pointer but I did not find any function in the API returning my the IP address of the domain. I just can get other information about the domain with virDomainGetInfo, but no IP. I want to be able to get either a static assigned IP or a dynamically received IP from a DHCP server. PS: I use the ESX driver. Thanks for giving me a hint. Adrian

1 0

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

06 Jul '10

----- Forwarded Message ----- From: "Alex Jia" <ajia(a)redhat.com> To: "Daniel Berrange" <berrange(a)redhat.com> Cc: libvir-list(a)redhat.com Sent: Friday, July 2, 2010 10:32:58 AM GMT +00:00 Monrovia Subject: Allow to change the maximum migration downtime -- bug 561935 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 can be finished, but it need very very long time. BTW, the guest can be successfully migrated if I don't use the above environment configuration. Best Regards, Alex

1 0

[libvirt] ESXi support
by adrian wyssen 06 Jul '10

06 Jul '10

Hello everyone I am really new to libvirt and I have to use it with ESXi. I was writing code for listing the virtual machines in a ESXi server. If I connect me with the virsh to the ESXi server, it works. But since I can not create any certificates on the server (ESXi does not have any console...) I have to use the no_verify option (esx://host/?no_verify=1) I want to do the same with the API, but when I use this string in the uri parameter of the following code conn = virConnectOpenAuth(uri, virConnectAuthPtrDefault, 0); the system returns "libvir: Remote error : Cannot access CA certificate '/etc/pki/CA/cacert.pem': No such file or directory No connection to hypervisor" What method can I use to be able to connect to the server by ignoring the missing certificate? Another question is: Are there any example codes for using ESX(i), because as I said I am really new with libvirt and I did not find any examples. Thanks a lot for your help. Adrian

2 3

[libvirt] Bugs when installing Windows XP
by Laurent Léonard 06 Jul '10

06 Jul '10

Hi, There are 2 bugs (regressions) when installing Windows XP, it can be reproduced with libvirt 0.8.x. After the first installation stage, the machine reboots but: - the CD-ROM is removed, so the second stage asks for the CD-ROM. - if I force the shutdown, the machine reboots. If I force the shutdown again after the reboot the machine shuts off as expected. Thank you, -- Laurent Léonard

2 1

[libvirt] Migrate not running guests
by Juan Quintela 06 Jul '10

06 Jul '10

Hi In an exercise to use more libvirt, I am trying to use libvirt with my normal use. First, I will explain how I normally run my guests. I install guests on a machine with virt-install <....> I store all my guests images in a shared directory that is mounted in all my hosts. Now, it is trivial for me to launch qemu-kvm <options> on any machine, it don't matters if I have to use a rhel5, rhel6, fedora13 host. Everything works as expected. Except for the little fact that I have to remember the whole command line when I go from one machine to other, to use ide/virtio/rtl8139/.... You get the idea. And thing got worse the more guests that I have. Now I can run virt-manager on my desktop (machine A). Connect to host B. And launch my guests VM1 (on host B). No problem so far. I can indeed migrate my guests to machine C. No problem so far. And now I can start my guest VM1 in both host B and host C. It is there on virt-manager, one click away of launching. The functionality that I would really like is a "way" to store my guest information on my desktop (machine A), and be able to launch the guest on any host. I.e. a menu option when I click on the guest, that let me launch it in a different host, not in the one that it is defined. If that is difficult to implement for now, a "migrate" for a shut off guest will do by now. It should be something like virsh dumpxml foo > foo.xml virsh define foo.xml (this is the way that I do it by hand now). Why do I need this? because I have hosts with RHEL5/RHEL6/F13/.... And just now, I have to reinstall, do the previous dumpxml/define each time that I have to reproduce one bug in one host or another. To make things worse, sometimes RHEL5.4 and RHEL6.0 xml's are not completely compatible and I have to fix it by hand. Any better ideas about how to do this? Notice that I think that RHEV-M does something like this, but debugging on a RHEV-M host is an exercise on pain (everything is read only, ...) Later, Juan.

2 1

[libvirt] Release of libvirt-0.8.2
by Daniel Veillard 05 Jul '10

05 Jul '10

Following Dan advice, I decided to not wait for more patches and push the current git head as the release. Let's plan to have another release by this month end with the QEmu debugging and hacking APIs. The release is available as usual at ftp://libvirt.org/libvirt Quite a lot of bug fixes during the two months since 0.8.1, and a few new feature. It also tagged more commits as being documentation or portability fixes, it's good :-) Features: - phyp: adding support for IVM (Eduardo Otubo) - libvirt: introduce domainCreateWithFlags API (Eric Blake) - add 802.1Qbh and 802.1Qbg switches handling (Stefan Berger) - Support for VirtualBox version 3.2 (Jean-Baptiste Rouault) - Init script for handling guests on shutdown/boot (Jiri Denemark) - qemu: live migration with non-shared storage for kvm (Kenneth Nagin) Documentation: - html docs: add link to PHP bindings by Radek Hladik (Justin Clift) - virsh: document attach-disk better (Eric Blake) - bridge_driver.c: fix file description (Alan Pevec) - nwfilter: extensions of docs with (Stefan Berger) - Fix description of virStorageVolGetInfo() (Philipp Hahn) - virsh: improve help text for vol query commands (Justin Clift) - virsh: fixed trivial comment and debug message in vshCommandOptVolBy function (Justin Clift) - virsh: remove xen reference in header comment (Justin Clift) - virsh: add the volume commands to the virsh man page (Justin Clift) - virsh: fix minor virsh man page typos and formatting problems (Justin Clift) - Trivial virsh.pod additions --all for "list" command and similar (Justin Clift) - Add docs on drive <serial> element (Марк Коренберг) - daemon: sysconf: Update comment about VNC audio (Cole Robinson) - nwfilter: documentation (Stefan Berger) - docs: distribute more coding convention documentation (Eric Blake) - note a typo: VIR_MIGRATE_TUNNELLED should be VIR_MIGRATE_TUNNELED, (Jim Meyering) - datatypes: fix comment typo (Eric Blake) - Fix a typo in docs (Ersek Laszlo) - docs: hacking: explain why using curly braces well is important (Jim Meyering) Portability: - cgroup: Fix compilation broken on MinGW due to dirent->d_type (Ryota Ozaki) - parthelper: fix compilation without optimization (Eric Blake) - build: fix some mingw issues (Eric Blake) - build: avoid pthreads-win32 on mingw (Eric Blake) - build: fix cygwin build, correctly this time (Eric Blake) - build: fix up some compiler flags (Eric Blake) - build: avoid compile failure on linux kernels older than 2.6.19 (Jim Meyering) - libvirt_proxy: link with -lpthread if needed (Eric Blake) - build: allow older gettext (Eric Blake) - mingw32-libvirt.spec: bring up to date (Eric Blake) - avoid link error in tests using libvirt_util; due to pthread_sigmask (Jim Meyering) - configure.ac: Avoid uname, which breaks cross-compilation (Matthias Bolte) - mingw: Fix two undefined symbols (Matthias Bolte) - build: avoid compiler warning (Eric Blake) - build: prefer WIN32 over __MINGW32__ checks (Eric Blake) - dnsmasqReload: avoid mingw link failure (Eric Blake) - mingw: Fix symbol export (Matthias Bolte) Bug Fixes: - Avoid invoking the qemu monitor destroy callback if the constructor fails (Daniel P. Berrange) - cgroup: Add missing errno == ENOENT check in virCgroupRemoveRecursively (Ryota Ozaki) - Fix crash when detaching devices from qemu domains. (Chris Lalancette) - virFileResolveLink: guarantee an absolute path (Eric Blake) - phyp: don't steal storage management from other drivers (Eric Blake) - Avoid calling virStorageFileIsSharedFS with NULL (Laine Stump) - lxc: Fix virsh console doesn't work after restarting libvirtd (Ryota Ozaki) - lxc: Fix error handlings in lxcContainerRenameAndEnableInterfaces (Ryota Ozaki) - Set proper selinux label on image file during qemu domain restore (Laine Stump) - build: fix regression with libvirt-api.xml generation (Eric Blake) - Fix a reference leak for node devices. (Chris Lalancette) - Don't squash file permissions when migration fails (Daniel P. Berrange) - Fix migration in text mode and shared storage migration in json mode (Daniel P. Berrange) - Add missing parameter in python Disk IO error callback (Daniel P. Berrange) - Check for presence of qemu -nodefconfig option before using it (Laine Stump) - cgroup: Change virCgroupRemove to remove all descendant groups at first (Ryota Ozaki) - Fix reference handling leak on qemuMonitor (Daniel P. Berrange) - Don't leak open fd to virsh in libvirt-guests init script (Jiri Denemark) - nwfilter: fix loadable module support (Stefan Berger) - Do not free static buffer with UUID (Jiri Denemark) - qemu: Fix crash on failed VM startup (Cole Robinson) - Add several missing vir*Free calls in libvirtd's remote code (Matthias Bolte) - Fix enumeration of partitions in disks with a trailing digit in path (Daniel P. Berrange) - vbox: check getenv("DISPLAY") for NULL in vboxDomainDumpXML (Matthias Bolte) - Check getenv("PATH") for NULL in virFindFileInPath (Matthias Bolte) - Fix cgroup setup code to cope with root squashing NFS (Daniel P. Berrange) - Fix leaks in udev device add/remove v3 (David Allan) - Ensure that PCI device is reattached to host if hotadd fails (Daniel P. Berrange) - Don't raise errors in the selinux restore code (Daniel P. Berrange) - Fix check for errors in device_add command in QEMU text monitor (Daniel P. Berrange) - Network duplicate UUID/name checking (Daniel P. Berrange) - Storage pool duplicate UUID/name checking (Daniel P. Berrange) - Fix auto-adding of virtio serial controllers (Daniel P. Berrange) - Ensure UNIX domain sockets are removed on daemon shutdown (Daniel P. Berrange) - Fix AppArmor save/restore.Add stdin_path to qemudStartVMDaemon() args. (Jamie Strandboge) - Adjust block size used by dd to speed QEMU domain save operations. (Laine Stump) - Fix dereference of potentially freed pointer in qemudDomainSaveFlags (Laine Stump) - Update nodedev scsi_host data before use (David Allan) - Fix device destroy return value (David Allan) - storage: Check for invalid storage mode before opening (Cole Robinson) - Improve nodedev parent/child relationships (David Allan) - network: bridge: Don't start network if it collides with host routing (Cole Robinson) - Fix integer overflow in hotplug methods (Daniel P. Berrange) - Fix failing virGetHostname. (Chris Lalancette) - storage: Sanitize pool target paths (Cole Robinson) - Fix handling of disk backing stores with cgroups (Daniel P. Berrange) - Fix up basic migration. (Chris Lalancette) - qemu: Release bus address on PCI host device remove (Alex Williamson) - qemu: avoid corrupting guest info struct on host device PCI hot add (Alex Williamson) - Query block allocation extent from QEMU monitor (Daniel P. Berrange) - Don't overwrite virDomainAssignDef errors. (Chris Lalancette) - Fix race in finding available vnc port (Jim Fehlig) - qemu driver: fix version check typos (Chris Wright) - daemon: A few initscript corrections (Cole Robinson) - qemu: Properly cleanup in security startup error path (Cole Robinson) - qemudDomainMigrateFinish2: handle a case of virDomainSaveStatus failure (Jim Meyering) - Fix potential NULL dereference in remoteDomainMigratePrepare2 (Jiri Denemark) - qemudDomainRestore: handle a case of virDomainSaveStatus failure (Jim Meyering) - python: don't ignore virInitialize failure in module initialization (Jim Meyering) - tests: do not ignore virInitialize failure (Jim Meyering) - qemuMonitorTextMigrate: avoid leak on OOM-error path (Jim Meyering) - virNWFilterDefParseXML: avoid leak on error paths (Jim Meyering) - virDomainNetDefParseXML: avoid leak upon multiple "filterref" (Jim Meyering) - ebiptablesWriteToTempFile: don't close a negative file descriptor (Jim Meyering) - Protect against NULL pointer flaws in monitor usage (Daniel P. Berrange) - Fix multiple potential NULL pointer references in monitor usage (Daniel P. Berrange) - umlAutostartDomain: avoid NULL-deref upon virGetLastError failure (Jim Meyering) - x86ModelHasFeature: avoid NULL-dereference for unmatched CPU "feature" (Jim Meyering) - qemudDomainSetVcpus: avoid NULL-deref (Jim Meyering) - nwfilter: Add missing driver lock in qemu driver (Stefan Berger) - Fix a misuse of virAsprintf in qemudDomainMemoryPeek (Ryota Ozaki) - Don't reset user/group/security label on shared filesystems during migrate (Daniel P. Berrange) - Fix handling of disk backing stores with cgroups (Daniel P. Berrange) - Fix possible crash in handling IO Error event (Daniel P. Berrange) - Fix monitor ref counting when adding event handle (Jiri Denemark) - Remove watches before calling REMOTE_PROC_CLOSE (Jiri Denemark) - node_device: udev: Fix PCI product/vendor swappage (Cole Robinson) - virsh: schedinfo --set invalid=value would simply ignore the option (Jim Meyering) - Remove unused nwfilter field from struct remote_error (Matthew Booth) - util: fix va_start usage bug (Eric Blake) - Don't wipe generated iface target in active domains (Jiri Denemark) - Various fixes for the spec file (Daniel Veillard) - lxc: Check domain is active/inactive as required by operation (Jiri Denemark) - lxc: Make SetMemory work for active domains only (Jiri Denemark) - cgroup: Fix possible memory leak in virCgroupMakeGroup (Ryota Ozaki) - Fix memory leaks in cmdInterfaceEdit and cmdNWFilterEdit. (Laine Stump) - lxc: Fix failure on starting a domain with multiple interfaces (Ryota Ozaki) Improvements: - vbox: Let configure detect/set the XPCOMC directory (Matthias Bolte) - udev: Parse PCI devices even if libpciaccess fails (Cole Robinson) - qemu: Improve some qemu.conf error reporting (Cole Robinson) - util: virExec: Dispatch all errors raised after fork (Cole Robinson) - virsh: tweak help output for VSH_OT_DATA (Eric Blake) - Check for active PCI devices when doing nodedevice operations. (Chris Lalancette) - virsh: add new --details option to pool-list (Justin Clift) - Selectively ignore domainSetSecurityAllLabel failure in domain restore (Laine Stump) - use virStorageFileIsSharedFS utility function in qemudDomainSaveFlag (Laine Stump) - Enhance virStorageFileIsSharedFS (Laine Stump) - phyp: optimize use of sed (Eric Blake) - phyp: add storage management driver (Eduardo Otubo) - phyp: add rudimentary storage driver (Eduardo Otubo) - maint: add gnulib gettimeofday module (Eric Blake) - Avoid blocking all APIs during incoming migration (Daniel P. Berrange) - Set labelling for character devices in security drivers (Daniel P. Berrange) - Add API for iterating over all character devices (Daniel P. Berrange) - Adding Storage Management driver (style and indentation) (Eduardo Otubo) - esx: Add support for the controller element (Matthias Bolte) - Add optional model attribute to the controller element (Matthias Bolte) - Add wide SCSI bus disk address generation support (Matthias Bolte) - cgroup: Enable memory.use_hierarchy of cgroup for domain (Ryota Ozaki) - network: allow tftp port if tftp is defined (Alan Pevec) - Add '-nodefconfig' command line arg to QEMU (Daniel P. Berrange) - Make checks for inactive QEMU guest more robust (Daniel P. Berrange) - Improve some error messages about unsupported APIs/URIs (Daniel P. Berrange) - Index hashes by UUID instead of name (Jiri Denemark) - Allow one-or-more <boot dev="..."/> entries (Philipp Hahn) - virsh: add --uuid option to vol-pool (Justin Clift) - nwfilter: add XML attribute to control iptables state match (Stefan Berger) - virsh: ensure persistence and autostart are shown for dominfo and pool-info (Justin Clift) - nwfilter: use match target on incoming traffic (Stefan Berger) - macvtap: work-around for 2.6.32 and older kernels (Stefan Berger) - virsh: add pool support to vol-key command (Justin Clift) - esx: Update case insensitive .vmx tests (Matthias Bolte) - esx: Accept 'disk' as harddisk device type in .vmx files (Matthias Bolte) - virsh: mark autostart answers for translation (Justin Clift) - virsh: add start --paused support (Eric Blake) - qemu: support starting persistent domain paused (Eric Blake) - drivers: add virDomainCreateWithFlags if virDomainCreate exists (Eric Blake) - remote: protocol implementation for virDomainCreateWithFlags (Eric Blake) - uml: sanity check external data before using it (Eric Blake) - Improve error message for disabled client-side drivers (Matthias Bolte) - virsh: add snapshot backing store support to vol-create-as (Justin Clift) - esx: Add proxy query parameter (Matthias Bolte) - esx: Refactor esxUtil_ParseQuery's parameter handling (Matthias Bolte) - virsh: add new vol-pool command (Justin Clift) - virsh: add --paused option to create (Eric Blake) - qemu: allow creation of a paused domain (Eric Blake) - virDomainCreateXML: support new flag (Eric Blake) - Add multiIQN tests (David Allan) - Add multiiqn XML dump (David Allan) - Fix test breakage from virtio serial changes (Daniel P. Berrange) - Enable probing of VPC disk format type (Daniel P. Berrange) - Prefer UDEV to HAL drivers if both a compiled (Daniel P. Berrange) - Add support for setting socket MLS level in SELinux driver (Daniel J Walsh) - Fix error codes for missing storage pools (Daniel P. Berrange) - Include port number with virtio serial devices (Daniel P. Berrange) - Disable use of 'reason' field in block IO event in QEMU (Daniel P. Berrange) - Add stdin_path to qemudStartVMDaemon() args. (Jamie Strandboge) - Allocate buffer to hold xend response (Jim Fehlig) - phyp: Strict check when listing domains (Eduardo Otubo) - hostusb: Properly handle 'usbX' sysfs files (Cole Robinson) - Add --source-format argument to virsh pool-define-as and pool-create-as (Justin Clift) - Add --source-format argument to virsh pool-define-as and pool-create-as (Justin Clift) - build: fix VPATH 'make syntax-check' (Eric Blake) - qemu: Add a qemu.conf option for clearing capabilities (Cole Robinson) - macvtap: cannot support target device name (Stefan Berger) - Fix libvirt-guests init script (Jiri Denemark) - maint: new syntax-check rule to ensure that AUTHORS stays in sync (Jim Meyering) - maint: update AUTHORS with recent contributors (Eric Blake) - xen: Fix chardev listen sexpr formatting (Cole Robinson) - v2 of Cole's wlan support (David Allan) - Install, distribute and package domainsnapshot.rng (Matthias Bolte) - build: support 'make check' in pristine tree (Eric Blake) - esx: Expose host UUID in the capabilities XML (Matthias Bolte) - Pass pre-opened PCI device sysfs config file to QEMU (Alex Williamson) - xen-proxy build broken (Matthias Bolte) - esx: Add read-only storage pool access (Matthias Bolte) - libvirtd: diagnose invalid host UUID (Jim Meyering) - vepa: parsing for 802.1Qb{g|h} XML (Stefan Berger) - vepa+vsi: Introduce dependency on libnl (Stefan Berger) - Expose a host UUID in the capabilities XML (Daniel P. Berrange) - qemu: Allow using regular audio backends with VNC (Cole Robinson) - lxcSetSchedulerParameters: reverse order of tests; diagnose a failure (Jim Meyering) - libvirtd: start each diagnostic with "argv0: " (Jim Meyering) - libvirtd: mark strings for translation, including --help output (Jim Meyering) - build: force init scripts to rebuild on changed --prefix (Eric Blake) - build: Distribute the whole tests/qemuhelpdata directory (Matthias Bolte) - Add defines for QEMU_VNC_PORT_{MIN,MAX} and use them (Jim Fehlig) - Add simple bitmap operations to utils (Jim Fehlig) - daemon: Export SDL audio environment variables (Cole Robinson) - Autostart domains using virDomainObjStart (Jiri Denemark) - maint: update po/POTFILES.in (Jim Meyering) - maint: enforce policy wrt VIR_DEBUG and VIR_DEBUG0 (Jim Meyering) - maint: enforce policy wrt VIR_ERROR and VIR_ERROR0 (Jim Meyering) - maint: change "" in err ? err->message : "" to _("unknown error"), ... (Jim Meyering) - qemu: Use ShutdownVMDaemon for all startup cleanup paths (Cole Robinson) - Domain snapshot RNG and tests. (Chris Lalancette) - Fix up the python bindings for snapshotting. (Chris Lalancette) - qemu_conf.c: also recognize new first line of qemu -help output (Jim Meyering) - lxc_controller.c: don't ignore failed "accept" (Jim Meyering) - qemu: Don't deny ShutdownVMDaemon for non-running VMs (Cole Robinson) - libvirtd: don't ignore virInitialize failure (Jim Meyering) - maint: prohibit newline at end of diagnostic (Jim Meyering) - maint: remove unwanted newline at end of diagnostic (Jim Meyering) - build: distribute missing file (Eric Blake) - esx: Make esxVI_*_CastFromAnyType dynamically dispatched (Matthias Bolte) - esx: Allow esxVI_X_DynamicCast to be called successfully on X objects (Matthias Bolte) - tests: the remote_protocol check also accommodates older pdwtags (Jim Meyering) - maint: enforce no-markup policy wrt VIR_WARN-like macros (Jim Meyering) - Add support for SSE4.1 and SSE4.2 CPU features (Jiri Denemark) - maint: add more free-like functions to the list and deal with fallout (Jim Meyering) - maint: add virCgroupFree to the list of free-like functions (Jim Meyering) - qemudDomainSetVcpus: avoid NULL-deref on failed uuid look-up (Jim Meyering) - Add CIFS to the list of network file systems (Matthias Bolte) - Add VIR_STORAGE_POOL_INACCESSIBLE to denote inaccessible storage pools (Matthias Bolte) - qemu_conf: fix flag value (Eric Blake) - qemu: Clarify a couple error messages (Cole Robinson) - virFileResolveLink: fix return value (Eric Blake) - tests: Skip daemon-conf test if dir exceeds UNIX_PATH_MAX (Cole Robinson) - pci: Give an explicit error if device not found (Cole Robinson) - qemu: Report cmdline output if VM dies early (Cole Robinson) - qemu_driver: avoid NULL dereference (Jim Meyering) - Make domain save work when dynamic_ownership=0 (Daniel P. Berrange) - Add support for NIC hotplug using netdev_add in QEMU (Daniel P. Berrange) - build: update gnulib (Eric Blake) - tests: correct PATH in new test, for when running manually (Jim Meyering) - Add env variable for debugging gnutls usage (Daniel P. Berrange) - maint: allow VPATH use of remote_protocol-structs (Eric Blake) - help avoid accidental remote_protocol.x changes (Jim Meyering) - build: use LIBADD, not LDFLAGS, for adding libraries (Eric Blake) - Implement SCSI disk unplugging (Wolfgang Mauerer) - qemu: use better types (Eric Blake) - Refactor disk unplugging (Wolfgang Mauerer) - build: simplify checks for sched.h (Eric Blake) - build: use gnulib's sys/wait.h (Eric Blake) - build: use gnulib's uname (Eric Blake) - build: rely on gnulib's pthread module (Eric Blake) - rpmbuild: add ebtables & ip(6)tables dependency for rpm (Stefan Berger) - lxc: Use virDomainFindByUUID for domain lookup (Jiri Denemark) - nwfilter: skip some interfaces on filter update (Stefan Berger) - pass info where request stems from to have rules applied (Stefan Berger) - dnsmasq.c: Fix OOM error reporting (Matthias Bolte) - autobuild.sh: provide default prefix (Eric Blake) Cleanups: - lxc: Change VIR_ERROR to VIR_DEBUG for just a debugging message (Ryota Ozaki) - phyp: reduce scope of driver functions (Eric Blake) - Fix test case failure due to missing -nodefconfig (Daniel P. Berrange) - esx: Use bool instead of int where appropriated (Matthias Bolte) - Cleanup some LIBADD and CFLAGS (Matthias Bolte) - virsh: remove a doubled up include for errno.h (Justin Clift) - Misc cleanups (Jiri Denemark) - Remove unnecessary check for non-NULL uuid (Jiri Denemark) - qemu: reduce file padding requirements (Eric Blake) - virsh: change printf() calls to vshPrint() (Justin Clift) - phyp: sed cleanups (Eric Blake) - maint: simplify some ignore files (Eric Blake) - avoid syntax-check failure (Jim Meyering) - autobuild.sh: avoid bashism (Eric Blake) - bitmap: reject zero-size bitmap (Eric Blake) - build: depend on correct file (Eric Blake) - build: make cpp indentation conform (Jim Meyering) - hooks: fix typo (Paolo Smiraglia) - build: silence cppi warning, clarify vbox headers (Eric Blake) - xen: Remove unused function (Cole Robinson) - esx: Simplify goto usage (Matthias Bolte) - Use printf instead of echo -e in libvirt.spec.in (Matthias Bolte) - build: fix HTML errors in nwfilter docs (Eric Blake) - build: fix compilation without macvtap (Eric Blake) - tests: avoid new failure of the daemon-conf test (Jim Meyering) - storage: mpath: Fix incorrect VIR_ERROR use (Cole Robinson) - Allow nwfilter functions to be compiled with C++ (Chris Lalancette) - storage: Combine some duplicate code (Cole Robinson) - storage: mpath: Clean up some error handling (Cole Robinson) - Remove dead code after refactoring qemudDomainStart (Jiri Denemark) - build: fix cppi warnings (Eric Blake) - Remove isValidIfname. (Chris Lalancette) - Refactor qemudDomainStart (Jiri Denemark) - Factor out def assignment to existing domain from virDomainAssignDef (Jiri Denemark) - Refactor qemudDomainRestore (Jiri Denemark) - maint: don't mark VIR_DEBUG or VIR_DEBUG0 diagnostics for translation (Jim Meyering) - maint: more of same, but manual: convert VIR_ERROR("%s" to VIR_ERROR0( (Jim Meyering) - maint: VIR_ERROR/VIR_ERROR0: mark up the remaining ones manually (Jim Meyering) - maint: mark translatable string args of VIR_ERROR (Jim Meyering) - maint: mark translatable string args of VIR_ERROR0 (Jim Meyering) - maint: use VIR_ERROR0 rather than VIR_ERROR with a bare "%s" (Jim Meyering) - qemu: Remove explicit VNC XML cleanup (Cole Robinson) - Rename qemuBuildCommandLine tapfds -> vmfds. (Alex Williamson) - initialize "meta" in virStorageFileGetMetadata, not in each caller (Jim Meyering) - (qemu*DiskCgroup): avoid dead code (Jim Meyering) - maint: more VIR_WARN corrections: now manually (Jim Meyering) - maint: use VIR_WARN0("...") rather than VIR_WARN("%s", "...") (Jim Meyering) - maint: remove _(...) from VIR_WARN arg manually (Jim Meyering) - maint: don't mark VIR_WARN or VIR_WARN0 diagnostics for translation (Jim Meyering) - do not ignore qemuMonitorAddDrive failure; make uses identical (Jim Meyering) - ebtablesAddRemoveRule, iptablesAddRemoveRule: don't skip va_end (Jim Meyering) - linuxNodeInfoCPUPopulate: avoid used-uninitialized via a test (Jim Meyering) - lxcFreezeContainer: avoid test-after-deref of never-NULL pointer (Jim Meyering) - Remove debugging fprintf() calls (Daniel P. Berrange) - tests: use GPLv2+, not GPLv3 (Jim Meyering) - tests: adjust copyrights on scripts: s/FSF/Red Hat/ (Jim Meyering) - virsh: fix a typo in a diagnostic (Jim Meyering) - delMacvtap: typo fix (Eric Blake) - docs/Makefile.am: remove unnecessary subshells (Eric Blake) - maint: avoid spurious output if program not present (Eric Blake) - storage_encryption: silence clang warning (Eric Blake) - maint: whitespace cleanups (Eric Blake) - qemu: Fix warning about a non-literal format string (Matthias Bolte) - build: drop more redundant configure checks (Eric Blake) - build: silence a clang false positive (Eric Blake) Thanks to everybody who helped for this release by contributing changes or reporting issues ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] virsh: remove embedded space from pool-list --details output
by Justin Clift 05 Jul '10

05 Jul '10

This removes the embedded space in the output of the pool-list --details command, as per the comments from Richard W. M. Jones. Scripting should now be able to parse this output in a reliable manner. --- New output: virsh # pool-list --details Name State Autostart Persistent Capacity Allocation Available -------------------------------------------------------------------------- default running yes yes 19.69GB 16.03GB 3.66GB image_dir running yes yes 1.79TB 1.59TB 203.68GB tmp running no yes 19.69GB 16.03GB 3.66GB virsh # tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 825e0d2..0dff211 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5056,7 +5056,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Create the capacity output string */ val = prettyCapacity(info.capacity, &unit); ret = virAsprintf(&poolInfoTexts[i].capacity, - "%.2lf %s", val, unit); + "%.2lf%s", val, unit); if (ret < 0) { /* An error occurred creating the string, return */ goto asprintf_failure; @@ -5065,7 +5065,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Create the allocation output string */ val = prettyCapacity(info.allocation, &unit); ret = virAsprintf(&poolInfoTexts[i].allocation, - "%.2lf %s", val, unit); + "%.2lf%s", val, unit); if (ret < 0) { /* An error occurred creating the string, return */ goto asprintf_failure; @@ -5074,7 +5074,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Create the available space output string */ val = prettyCapacity(info.available, &unit); ret = virAsprintf(&poolInfoTexts[i].available, - "%.2lf %s", val, unit); + "%.2lf%s", val, unit); if (ret < 0) { /* An error occurred creating the string, return */ goto asprintf_failure; -- 1.7.1

2 2

[libvirt] The (delayed) 0.8.2 release
by Daniel Veillard 05 Jul '10

05 Jul '10

Clearly I failed to meet the deadline I suggested 2 weeks ago for the release of 0.8.2, there have been a awful lot of patches sent for review since then, I had other stuff to chase and didn't managed to keep uptodate with the flow of mail patches and reviews. But hopefully this should be a bit better now, we really need this release soon, too much stuff has accumulated in git, so I'm suggesting to try to release end of next week, but keep the gate for patches open up to Tuesday as most people in the US are likely to be out either today or on the 5th. One thing we should try to get is to provide the qemu command-line and monitor commands hacking/debug APIs to ease the work of the QEmu developpers and early features adopters. Thanks to Erik for providing another batch of reviews, the key point being IMHO the include/libvirt/libvirt-qemu.h file since that's where that API will sit. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH v2] vbox: Let configure detect/set the XPCOMC directory
by Matthias Bolte 03 Jul '10

03 Jul '10

This allows the user to give an explicit path to configure ./configure --with-vbox=/path/to/virtualbox instead of having the VirtualBox driver probe a set of possible paths at runtime. If no explicit path is specified then configure probes the set of "known" paths. https://bugzilla.redhat.com/show_bug.cgi?id=609185 --- v2: - address Eric's comments - wrap AC_HELP_STRING at 80 columns - replace the if/else with a for loop, much nicer, indeed :) - use AC_DEFINE_UNQUOTED instead of AC_SUBST to define VBOX_XPCOMC_DIR configure.ac | 60 +++++++++++++++++++++++++++++++++++++++++++- src/vbox/vbox_XPCOMCGlue.c | 22 ++-------------- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 691ef69..cab01c2 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,9 @@ AC_ARG_WITH([phyp], AC_ARG_WITH([xenapi], AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=check@:>@]),[],[with_xenapi=check]) AC_ARG_WITH([vbox], - AC_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) + AC_HELP_STRING([--with-vbox=@<:@PFX@:>@], + [VirtualBox XPCOMC location @<:@default=check@:>@]),[], + [with_vbox=check]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], @@ -315,6 +317,62 @@ if test "$with_openvz" = "yes"; then fi AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) + +dnl +dnl check for VirtualBox XPCOMC location +dnl + +vbox_xpcomc_dir= + +if test "x$with_vbox" = "xyes" || test "x$with_vbox" = "xcheck"; then + AC_MSG_CHECKING([for VirtualBox XPCOMC location]) + + for vbox in \ + /usr/lib/virtualbox/VBoxXPCOMC.so \ + /usr/lib/VirtualBox/VBoxXPCOMC.so \ + /opt/virtualbox/VBoxXPCOMC.so \ + /opt/VirtualBox/VBoxXPCOMC.so \ + /opt/virtualbox/i386/VBoxXPCOMC.so \ + /opt/VirtualBox/i386/VBoxXPCOMC.so \ + /opt/virtualbox/amd64/VBoxXPCOMC.so \ + /opt/VirtualBox/amd64/VBoxXPCOMC.so \ + /usr/local/lib/virtualbox/VBoxXPCOMC.so \ + /usr/local/lib/VirtualBox/VBoxXPCOMC.so \ + /Application/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib \ + ; do + if test -f "$vbox"; then + vbox_xpcomc_dir=`AS_DIRNAME(["$vbox"])` + break + fi + done + + if test -n "$vbox_xpcomc_dir"; then + AC_MSG_RESULT([$vbox_xpcomc_dir]) + with_vbox=yes + else + if test "x$with_vbox" = "xcheck"; then + AC_MSG_RESULT([not found, disabling VirtualBox driver]) + with_vbox=no + else + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([VirtualBox XPCOMC is required for the VirtualBox driver]) + fi + fi +else + if test "x$with_vbox" != "xno"; then + if test -f ${with_vbox}/VBoxXPCOMC.so || \ + test -f ${with_vbox}/VBoxXPCOMC.dylib; then + vbox_xpcomc_dir=$with_vbox + with_vbox=yes + else + AC_MSG_ERROR([$with_vbox does not contain VirtualBox XPCOMC]) + fi + fi +fi + +AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], + [Location of directory containing VirtualBox XPCOMC library]) + if test "x$with_vbox" = "xyes"; then AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([Unable to find dlopen()])]) case $ac_cv_search_dlopen in diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 0987c1b..fcae0cb 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -192,28 +192,12 @@ int VBoxCGlueInit(void) return tryLoadOne(pszHome, 0); /* - * Try the known standard locations. + * Try the configured location. */ g_szVBoxErrMsg[0] = '\0'; -#if defined(__gnu__linux__) || defined(__linux__) - if (tryLoadOne("/opt/VirtualBox", 1) == 0) - return 0; - if (tryLoadOne("/usr/lib/virtualbox", 1) == 0) - return 0; -#elif defined(__sun__) - if (tryLoadOne("/opt/VirtualBox/amd64", 1) == 0) - return 0; - if (tryLoadOne("/opt/VirtualBox/i386", 1) == 0) - return 0; -#elif defined(__APPLE__) - if (tryLoadOne("/Application/VirtualBox.app/Contents/MacOS", 1) == 0) - return 0; -#elif defined(__FreeBSD__) - if (tryLoadOne("/usr/local/lib/virtualbox", 1) == 0) + + if (tryLoadOne(VBOX_XPCOMC_DIR, 1) == 0) return 0; -#else -# error "port me" -#endif /* * Finally try the dynamic linker search path. -- 1.7.0.4

2 2

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

02 Jul '10

This patch adds a new --details option to the virsh vol-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 --- This new version of the patch uses the existing virsh output format when the --details option isn't given, maintaining backwards compatibility for existing scripts. When the new --details option is given though, the additional info is displayed and all columns are sized to their widest string. Output from the new option (hopefully this doesn't wrap): virsh # vol-list default Name Path ----------------------------------------- CentOS-5.5-x86_64-bin-DVD-1of2.iso /var/lib/libvirt/images/CentOS-5.5-x86_64-bin-DVD-1of2.iso CentOS-5.5-x86_64-bin-DVD-2of2.iso /var/lib/libvirt/images/CentOS-5.5-x86_64-bin-DVD-2of2.iso virsh # vol-list default --details Name Path Type Capacity Allocation --------------------------------------------------------------------------------------------------------------------------- CentOS-5.5-x86_64-bin-DVD-1of2.iso /var/lib/libvirt/images/CentOS-5.5-x86_64-bin-DVD-1of2.iso file 4.09 GB 4.10 GB CentOS-5.5-x86_64-bin-DVD-2of2.iso /var/lib/libvirt/images/CentOS-5.5-x86_64-bin-DVD-2of2.iso file 412.33 MB 412.74 MB virsh # vol-list tmp Name Path ----------------------------------------- disk1.img /tmp/images/disk1.img disk2.img /tmp/images/disk2.img disk3.img /tmp/images/disk3.img disk4.img /tmp/images/disk4.img disk5.img /tmp/images/disk5.img disk6.img /tmp/images/disk6.img virsh # vol-list tmp --details Name Path Type Capacity Allocation ------------------------------------------------------------ disk1.img /tmp/images/disk1.img file 20.00 GB 136.00 KB disk2.img /tmp/images/disk2.img file 20.00 GB 136.00 KB disk3.img /tmp/images/disk3.img file 20.00 GB 136.00 KB disk4.img /tmp/images/disk4.img file 20.00 GB 136.00 KB disk5.img /tmp/images/disk5.img file 20.00 GB 136.00 KB disk6.img /tmp/images/disk6.img file 20.00 GB 136.00 KB virsh # Much nicer to use when pools have a bunch of luns in them. :) tools/virsh.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++------ tools/virsh.pod | 4 +- 2 files changed, 203 insertions(+), 26 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 7261d19..2a9c353 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6075,67 +6075,242 @@ static const vshCmdInfo info_vol_list[] = { static const vshCmdOptDef opts_vol_list[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")}, + {"details", VSH_OT_BOOL, 0, N_("display extended details for volumes")}, {NULL, 0, 0, NULL} }; static int cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { + virStorageVolInfo volumeInfo; virStoragePoolPtr pool; - int maxactive = 0, i; + int details = vshCommandOptBool(cmd, "details"); + int maxAlloc = 0, maxCap = 0, maxName = 0; + int maxPath = 0, maxType = 0; + int numVolumes = 0, i; + int stringLength = 0; + double val; + const char *unit; char **activeNames = NULL; + struct volInfoText { + char *allocation; + char *capacity; + char *path; + char *type; + }; + struct volInfoText **volInfoTexts; + /* Check the connection to libvirtd daemon is still working */ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; + /* Look up the pool information given to us by the user */ if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return FALSE; - maxactive = virStoragePoolNumOfVolumes(pool); - if (maxactive < 0) { + /* Determine the number of volumes in the pool */ + numVolumes = virStoragePoolNumOfVolumes(pool); + if (numVolumes < 0) { virStoragePoolFree(pool); vshError(ctl, "%s", _("Failed to list active vols")); return FALSE; } - if (maxactive) { - activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); - if ((maxactive = virStoragePoolListVolumes(pool, activeNames, - maxactive)) < 0) { + /* Retrieve the list of volume names in the pool */ + if (numVolumes) { + activeNames = vshMalloc(ctl, sizeof(char *) * numVolumes); + if ((numVolumes = virStoragePoolListVolumes(pool, activeNames, + numVolumes)) < 0) { vshError(ctl, "%s", _("Failed to list active vols")); VIR_FREE(activeNames); virStoragePoolFree(pool); return FALSE; } - qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + /* Sort the volume names */ + qsort(&activeNames[0], numVolumes, sizeof(char *), namesorter); } - vshPrintExtra(ctl, "%-20s %-40s\n", _("Name"), _("Path")); - vshPrintExtra(ctl, "-----------------------------------------\n"); - for (i = 0; i < maxactive; i++) { - virStorageVolPtr vol = virStorageVolLookupByName(pool, activeNames[i]); - char *path; + /* Set aside memory for volume information pointers */ + volInfoTexts = vshMalloc(ctl, sizeof(struct volInfoText *) * numVolumes); - /* this kind of work with vols is not atomic operation */ - if (!vol) { - VIR_FREE(activeNames[i]); - continue; + /* Collect the rest of the volume information for display */ + for (i = 0; i < numVolumes; i++) { + /* Retrieve volume info */ + virStorageVolPtr vol = virStorageVolLookupByName(pool, + activeNames[i]); + + /* Allocate memory for one row of volume info */ + volInfoTexts[i] = vshMalloc(ctl, sizeof(struct volInfoText)); + + /* Retrieve the volume path */ + if ((volInfoTexts[i]->path = virStorageVolGetPath(vol)) == NULL) { + /* Something went wrong retrieving a volume path, cope with it */ + volInfoTexts[i]->path = vshStrdup(ctl, _("unknown")); } - if ((path = virStorageVolGetPath(vol)) == NULL) { - virStorageVolFree(vol); - continue; + /* Retrieve volume type and sizing information */ + if (virStorageVolGetInfo(vol, &volumeInfo) != 0) { + /* Something went wrong retrieving volume info, cope with it */ + volInfoTexts[i]->allocation = vshStrdup(ctl, _("unknown")); + volInfoTexts[i]->capacity = vshStrdup(ctl, _("unknown")); + volInfoTexts[i]->type = vshStrdup(ctl, _("unknown")); + } else { + /* Convert the returned volume info into output strings */ + virBuffer bufStr = VIR_BUFFER_INITIALIZER; + + /* Volume type */ + if (volumeInfo.type == VIR_STORAGE_VOL_FILE) + volInfoTexts[i]->type = vshStrdup(ctl, _("file")); + else + volInfoTexts[i]->type = vshStrdup(ctl, _("block")); + + // The capacity value to output + val = prettyCapacity(volumeInfo.capacity, &unit); + virBufferVSprintf(&bufStr, "%.2lf %s", val, unit); + volInfoTexts[i]->capacity = + vshStrdup(ctl, virBufferContentAndReset(&bufStr)); + + // The allocation value to output + val = prettyCapacity(volumeInfo.allocation, &unit); + virBufferVSprintf(&bufStr, "%.2lf %s", val, unit); + volInfoTexts[i]->allocation = + vshStrdup(ctl, virBufferContentAndReset(&bufStr)); } + /** Remember the longest output size of each string, ** + ** so we can use a printf style output format template ** + ** later on for both the header and volume info rows **/ + + /* Keep the length of name string if longest so far */ + stringLength = strlen(activeNames[i]); + if (stringLength > maxName) + maxName = stringLength; - vshPrint(ctl, "%-20s %-40s\n", - virStorageVolGetName(vol), - path); - VIR_FREE(path); + /* Keep the length of path string if longest so far */ + stringLength = strlen(volInfoTexts[i]->path); + if (stringLength > maxPath) + maxPath = stringLength; + + /* Keep the length of type string if longest so far */ + stringLength = strlen(volInfoTexts[i]->type); + if (stringLength > maxType) + maxType = stringLength; + + /* Keep the length of capacity string if longest so far */ + stringLength = strlen(volInfoTexts[i]->capacity); + if (stringLength > maxCap) + maxCap = stringLength; + + /* Keep the length of allocation string if longest so far */ + stringLength = strlen(volInfoTexts[i]->allocation); + if (stringLength > maxAlloc) + maxAlloc = stringLength; + + /* Cleanup memory allocation */ virStorageVolFree(vol); - VIR_FREE(activeNames[i]); } + + /** If the --details option wasn't selected, we output the volume ** + ** info using the fixed string format from previous versions to ** + ** maintain backward compatibility. **/ + + /* Output basic info then return if --details option not selected */ + if (!details) { + /* The old output format */ + vshPrintExtra(ctl, "%-20s %-40s\n", _("Name"), _("Path")); + vshPrintExtra(ctl, "-----------------------------------------\n"); + for (i = 0; i < numVolumes; i++) { + vshPrint(ctl, "%-20s %-40s\n", activeNames[i], + volInfoTexts[i]->path); + + /* Cleanup the memory for this volume row */ + VIR_FREE(volInfoTexts[i]->path); + VIR_FREE(volInfoTexts[i]->type); + VIR_FREE(volInfoTexts[i]->capacity); + VIR_FREE(volInfoTexts[i]->allocation); + VIR_FREE(volInfoTexts[i]); + } + + /* Cleanup remaining memory and return */ + VIR_FREE(volInfoTexts); + VIR_FREE(activeNames); + virStoragePoolFree(pool); + return TRUE; + } + + /** We only get here if the --details option was selected. ** + ** Column now resize to the longest string to be output. **/ + + /* Determine the length of the header strings. These must be + * calculated because we may be outputing a translated heading + */ + /* Use the length of name header string if it's longest */ + stringLength = strlen(_("Name")); + if (stringLength > maxName) + maxName = stringLength; + + /* Use the length of path header string if it's longest */ + stringLength = strlen(_("Path")); + if (stringLength > maxPath) + maxPath = stringLength; + + /* Use the length of type header string if it's longest */ + stringLength = strlen(_("Type")); + if (stringLength > maxType) + maxType = stringLength; + + /* Use the length of capacity header string if it's longest */ + stringLength = strlen(_("Capacity")); + if (stringLength > maxCap) + maxCap = stringLength; + + /* Use the length of allocation header string if it's longest */ + stringLength = strlen(_("Allocation")); + if (stringLength > maxAlloc) + maxAlloc = stringLength; + + /* Display the string lengths for debugging */ + vshDebug(ctl, 5, "Longest name string = %d chars\n", maxName); + vshDebug(ctl, 5, "Longest path string = %d chars\n", maxPath); + vshDebug(ctl, 5, "Longest type string = %d chars\n", maxType); + vshDebug(ctl, 5, "Longest capacity string = %d chars\n", maxCap); + vshDebug(ctl, 5, "Longest allocation string = %d chars\n", maxAlloc); + + /* Create the output template */ + char *outputStr; + virBuffer bufStr = VIR_BUFFER_INITIALIZER; + virBufferVSprintf(&bufStr, "%%-%us %%-%us %%-%us %%-%us %%-%us\n", + maxName, maxPath, maxType, maxCap, maxAlloc); + outputStr = virBufferContentAndReset(&bufStr); + + /* Display the header */ + vshPrint(ctl, outputStr, _("Name"), _("Path"), _("Type"), + ("Capacity"), _("Allocation")); + for (i = maxName + maxPath + maxType + maxCap + maxAlloc + 8; i > 0; i--) + vshPrintExtra(ctl, "-"); + vshPrintExtra(ctl, "\n"); + + /* Display the volume info rows */ + for (i = 0; i < numVolumes; i++) { + vshPrint(ctl, outputStr, + activeNames[i], + volInfoTexts[i]->path, + volInfoTexts[i]->type, + volInfoTexts[i]->capacity, + volInfoTexts[i]->allocation); + + /* Cleanup the memory for this volume row */ + VIR_FREE(volInfoTexts[i]->path); + VIR_FREE(volInfoTexts[i]->type); + VIR_FREE(volInfoTexts[i]->capacity); + VIR_FREE(volInfoTexts[i]->allocation); + VIR_FREE(volInfoTexts[i]); + } + + /* Cleanup remaining memory */ + VIR_FREE(outputStr); + VIR_FREE(volInfoTexts); VIR_FREE(activeNames); virStoragePoolFree(pool); return TRUE; diff --git a/tools/virsh.pod b/tools/virsh.pod index 7c75edc..a217cba 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -839,10 +839,12 @@ Returns basic information about the given storage volume. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. I<vol-name-or-key-or-path> is the name or key or path of the volume to return information for. -=item B<vol-list> I<--pool> I<pool-or-uuid> +=item B<vol-list> [optional I<--pool>] I<pool-or-uuid> optional I<--details> Return the list of volumes in the given storage pool. I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool. +The I<--details> option instructs virsh to additionally display volume +type and capacity related information where available. =item B<vol-pool> [optional I<--uuid>] I<vol-key-or-path> -- 1.7.0.1

2 6

[libvirt] [PATCH] util: virExec: Dispatch all errors raised after fork
by Cole Robinson 02 Jul '10

02 Jul '10

Any error message raised after the process has forked needs to be followed by virDispatchError, otherwise we have no chance of ever seeing it. This was selectively done for hook functions in the past, but really applies to all post-fork errors. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/util.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index d058113..5f2bff5 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -283,7 +283,8 @@ static int virClearCapabilities(void) capng_clear(CAPNG_SELECT_BOTH); if ((ret = capng_apply(CAPNG_SELECT_BOTH)) < 0) { - VIR_ERROR(_("cannot clear process capabilities %d"), ret); + virUtilError(VIR_ERR_INTERNAL_ERROR, + _("cannot clear process capabilities %d"), ret); return -1; } @@ -559,7 +560,7 @@ __virExec(const char *const*argv, /* The fork was sucessful, but after that there was an error * in the child (which was already logged). */ - _exit(1); + goto fork_error; } openmax = sysconf (_SC_OPEN_MAX); @@ -575,19 +576,19 @@ __virExec(const char *const*argv, if (dup2(infd >= 0 ? infd : null, STDIN_FILENO) < 0) { virReportSystemError(errno, "%s", _("failed to setup stdin file handle")); - _exit(1); + goto fork_error; } if (childout > 0 && dup2(childout, STDOUT_FILENO) < 0) { virReportSystemError(errno, "%s", _("failed to setup stdout file handle")); - _exit(1); + goto fork_error; } if (childerr > 0 && dup2(childerr, STDERR_FILENO) < 0) { virReportSystemError(errno, "%s", _("failed to setup stderr file handle")); - _exit(1); + goto fork_error; } if (infd > 0) @@ -605,20 +606,20 @@ __virExec(const char *const*argv, if (setsid() < 0) { virReportSystemError(errno, "%s", _("cannot become session leader")); - _exit(1); + goto fork_error; } if (chdir("/") < 0) { virReportSystemError(errno, "%s", _("cannot change to root directory: %s")); - _exit(1); + goto fork_error; } pid = fork(); if (pid < 0) { virReportSystemError(errno, "%s", _("cannot fork child process")); - _exit(1); + goto fork_error; } if (pid > 0) { @@ -629,7 +630,7 @@ __virExec(const char *const*argv, virReportSystemError(errno, _("could not write pidfile %s for %d"), pidfile, pid); - _exit(1); + goto fork_error; } _exit(0); } @@ -638,15 +639,14 @@ __virExec(const char *const*argv, if (hook) if ((hook)(data) != 0) { VIR_DEBUG0("Hook function failed."); - virDispatchError(NULL); - _exit(1); + goto fork_error; } /* The steps above may need todo something privileged, so * we delay clearing capabilities until the last minute */ if ((flags & VIR_EXEC_CLEAR_CAPS) && virClearCapabilities() < 0) - _exit(1); + goto fork_error; if (envp) execve(argv[0], (char **) argv, (char**)envp); @@ -657,6 +657,8 @@ __virExec(const char *const*argv, _("cannot execute binary %s"), argv[0]); + fork_error: + virDispatchError(NULL); _exit(1); cleanup: -- 1.6.6.1

2 2

[libvirt] [PATCH] qemu: Improve some qemu.conf error reporting
by Cole Robinson 02 Jul '10

02 Jul '10

Log some info if we can't find a config file. Make parse failures fatal, and actually raise an error message. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_conf.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ce42bd6..e2f7b31 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -133,16 +133,21 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, /* Just check the file is readable before opening it, otherwise * libvirt emits an error. */ - if (access (filename, R_OK) == -1) return 0; + if (access (filename, R_OK) == -1) { + VIR_INFO("Could not read qemu config file %s", filename); + return 0; + } conf = virConfReadFile (filename, 0); - if (!conf) return 0; + if (!conf) { + return -1; + } #define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ qemuReportError(VIR_ERR_INTERNAL_ERROR, \ - "remoteReadConfigFile: %s: %s: expected type " #typ, \ - filename, (name)); \ + "%s: %s: %s: expected type " #typ, \ + __func__, filename, (name)); \ virConfFree(conf); \ return -1; \ } -- 1.6.6.1

4 5

[libvirt] [PATCH] udev: Parse PCI devices even if libpciaccess fails
by Cole Robinson 02 Jul '10

02 Jul '10

We only use libpciaccess for resolving device product/vendor. If initializing the library fails (say if using qemu:///session), don't warn so loudly, and carry on as usual. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/node_device/node_device_udev.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 73217c5..f872483 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -363,12 +363,15 @@ static int udevTranslatePCIIds(unsigned int vendor, char **vendor_string, char **product_string) { - int ret = -1; + int ret = -1, pciret; struct pci_id_match m; const char *vendor_name = NULL, *device_name = NULL; - if (pci_system_init() != 0) { - VIR_ERROR0(_("Failed to initialize libpciaccess")); + if ((pciret = pci_system_init()) != 0) { + char ebuf[1024]; + VIR_INFO("Failed to initialize libpciaccess: %s", + virStrerror(pciret, ebuf, sizeof ebuf)); + ret = 0; goto out; } -- 1.6.6.1

2 3

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

02 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 v1 are listed in the individual patches.

2 25

[libvirt] ANNOUNCE: ruby-libvirt bindings 0.2.0
by Chris Lalancette 02 Jul '10

02 Jul '10

Hello all, I'm pleased to announce the release of 0.2.0 of the ruby-libvirt bindings. This release has a number of new features: - Updated Storage class, implementing pool.active?, pool.persistent?, pool.vol_create_xml_from - Updated Connect class, implementing conn.node_free_memory, conn.node_cells_free_memory, conn.node_get_security_model, conn.encrypted?, conn.libversion, and conn.secure? - Updated Network class, implementing network.active? and network.persistent? - Update Domain class, implementing conn.domain_xml_from_native, conn.domain_xml_to_native, dom.migrate_to_uri, dom.migrate_set_max_downtime, dom.managed_save, dom.has_managed_save?, dom.managed_save_remove, dom.security_label, dom.block_stats, dom.memory_stats, dom.blockinfo, dom.block_peek, dom.memory_peek, dom.active?, dom.persistent?, dom.snapshot_create_xml, dom.num_of_snapshots, dom.list_snapshots, dom.lookup_snapshot_by_name, dom.has_current_snapshot?, dom.revert_to_snapshot, dom.current_snapshot, snapshot.xml_desc, snapshot.delete, dom.job_info, and dom.abort_job - Implementation of the NodeDevice class - Implementation of the Secret class - Implementation of the NWFilter class - Implementation of the Interface class - Conversion of the development tree to git - New maintainer (me). David Lutterkort has agreed to transfer maintainership of the bindings over to me, since he is not actively involved in their development anymore. With the above list, almost all of the APIs up to and including libvirt 0.8.1 are covered. There are a few that I have not yet had time to implement; you can look at the list of FIXMEs in the source code to find them. I've uploaded new tarballs and source RPMs to: http://libvirt.org/ruby/download/ The new git repo is here: http://libvirt.org/git/?p=ruby-libvirt.git;a=summary The documentation for the new API's are here: http://libvirt.org/ruby/api/index.html If you have time, and are interested in the bindings, please give these new ones a whirl and let me know if they work for you. As usual, if you have any questions, problems, patches, or bug reports, feel free to email the libvirt development list (and CC me) so that I can take a look at them. -- Chris Lalancette

2 1

Re: [libvirt] Documentation for synchronous hooks
by Jintao Yang 02 Jul '10

02 Jul '10

hi DV, I saw the changelog of 0.7.8, which told the hooks scripts are supported. but is it took away in 0.8.0-4? [root@dhcp-66-70 libvirt]# rpm -ql libvirt | grep etc /etc/libvirt /etc/libvirt/libvirtd.conf /etc/libvirt/lxc.conf /etc/libvirt/nwfilter /etc/libvirt/nwfilter/allow-arp.xml /etc/libvirt/nwfilter/allow-dhcp-server.xml /etc/libvirt/nwfilter/allow-dhcp.xml /etc/libvirt/nwfilter/allow-incoming-ipv4.xml /etc/libvirt/nwfilter/allow-ipv4.xml /etc/libvirt/nwfilter/clean-traffic.xml /etc/libvirt/nwfilter/no-arp-spoofing.xml /etc/libvirt/nwfilter/no-ip-multicast.xml /etc/libvirt/nwfilter/no-ip-spoofing.xml /etc/libvirt/nwfilter/no-mac-broadcast.xml /etc/libvirt/nwfilter/no-mac-spoofing.xml /etc/libvirt/nwfilter/no-other-l2-traffic.xml /etc/libvirt/qemu /etc/libvirt/qemu.conf /etc/libvirt/qemu/networks /etc/libvirt/qemu/networks/autostart /etc/logrotate.d/libvirtd.lxc /etc/logrotate.d/libvirtd.qemu /etc/rc.d/init.d/libvirtd /etc/sysconfig/libvirtd [root@dhcp-66-70 libvirt]# rpm -q libvirt libvirt-0.8.0-4.el6.x86_64 Regards osier ----- Original Message ----- From: "Daniel Veillard" <veillard(a)redhat.com> To: libvir-list(a)redhat.com Sent: Monday, April 12, 2010 11:16:27 PM GMT +08:00 Beijing / Chongqing / Hong Kong / Urumqi Subject: [libvirt] Documentation for synchronous hooks Was still missing from main commits and would be needed for 0.8.0 Add documentation for synchronous hooks * docs/sitemap.html.in: add in navigation under Documentation/Deployment/Hooks * docs/hooks.html.in: new doc describing current support for 0.8.0 diff --git a/docs/hooks.html.in b/docs/hooks.html.in new file mode 100644 index 0000000..4ebeec3 --- /dev/null +++ b/docs/hooks.html.in @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>Hooks for specific system management</h1> + Libvirt includes synchronous hooks starting from version 0.8.0, + this is a way to tie specific tailored system actions at specific + time. This is based on scripts being called on the Host where the + hypervisor is running, if the script is present when the libvirtd + daemon is doing some significant actions. + The scripts are expected to execute quickly, return a zero exit + status if all conditions are set for the daemon to continue the + action (non zero will be considered a failure which may + be ignored but in general will stops the ongoing operation). + The script also should not call back into libvirt as the daemon + is waiting for the script exit and deadlock is likely to occur + otherwise. + The scripts are stored in the directory <code>/etc/libvirt/hooks/</code> + when using a standard installation path + (<code>$SYSCONF_DIR/libvirt/hook/</code> in general). + The scripts gets arguments as parameter on their command line: + <ul> + <li> the first argument is the name of the object involved in the + operation or '-' if there is none. + <li> the second argument is the name of the operation. + <li> the third argument is a suboperation indication like 'start' + 'end' or '-' if there is none. + <li> the last argument is an extra argument string or '-' if there + is none. + </ul> + There is currently scripts for 3 domains of operation: + <ul> + <li><code>/etc/libvirt/hooks/daemon</code> script if + present is called at 3 points in time: + at daemon startup, typically started with the following + arguments: + <pre>/etc/libvirt/hooks/daemon - start - start</pre> + at daemon shutdown when it is about to exit, with the following + arguments: + <pre>/etc/libvirt/hooks/daemon - shutdown - shutdown</pre> + When the daemon is asked to reload its driver state when + receiving the SIGHUP signal, arguments are: + <pre>/etc/libvirt/hooks/daemon - reload begin SIGHUP</pre> + </li> + <li><code>/etc/libvirt/hooks/qemu</code> script and + <code>/etc/libvirt/hooks/lxc</code> to associate hooks for domain + operation on the respective QEmu/KVM and LXC drivers. + The domain related hooks also receive the full XML description + for the concerned domain on their stdin, which allows to get + all the informations from the domain, including UUID or storage + if that is needed for the script operation. + Currently only domain startup and domain end operations + involve the hook, the first one just before the domain gets + created. + For example if starting a QEmu domain named <code>test</code> + the following script will get called: + <pre>/etc/libvirt/hooks/qemu test start begin -</pre> + note that 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. + For domain shutdown, the script will be called just after the + domain has finished execution, and the script will get: + <pre>/etc/libvirt/hooks/qemu test stopped end -</pre> + It is expected that other operation will be associated to hooks + but at the time of 0.8.0 only those 2 are associated to domains + lifecycle + </li> + </ul> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 0c3f0c3..0117c8d 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -50,6 +50,10 @@ <a href="logging.html">Logging</a> The library and the daemon logging support </li> + <li> + <a href="hooks.html">Hooks</a> + Hooks for system specific management + </li> </ul> </li> <li> -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/ -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

5 6

Re: [libvirt] [libvirt-users] C API example
by Dave Allan 01 Jul '10

01 Jul '10

On Thu, Jul 01, 2010 at 01:43:55PM -0700, steven765(a)yahoo.com wrote: > Hi Dave, > Thanks for the reply after getting some sleep the question I should have asked is what libraries do I need to link the application against? If I just try gcc -o a.out hellolibvirt.c it can't find any of the libvirt calls. [cc'ing the list again so the answer gets archived] Libvirt's no different from any other library, you need to link against libvirt, and you need to have the libvirt headers installed. On Fedora, that's: yum install libvirt-devel If you want to build hellolibvirt without using make, you'll need to edit hellolibvirt.c and take out config.h, which is unused. Then you can do: gcc -o hellolibvirt -lvirt hellolibvirt.c Then you just need to learn the API and decide what you want to do with it. ;-) The API is documented at: http://libvirt.org/html/libvirt-libvirt.html Dave > Thanks, > Steve > > --- On Thu, 7/1/10, Dave Allan <dallan(a)redhat.com> wrote: > > > From: Dave Allan <dallan(a)redhat.com> > > Subject: Re: [libvirt-users] C API example > > To: steven765(a)yahoo.com > > Cc: "Justin Clift" <justin(a)salasaga.org>, libvirt-users(a)redhat.com > > Date: Thursday, July 1, 2010, 2:06 PM > > On Wed, Jun 30, 2010 at 07:37:27PM > > -0700, steven765(a)yahoo.com > > wrote: > > > I think so, but I'm locked out at home. I'll have to > > try at school tomorrow. It gave me a remote error, but > > with the correct directory so fingers crossed thanks! > > > > > > > > btw might you or anyone know what I have to include to > > start a clean project of my own? So if I want to just > > build an application that uses the API with nothing else but > > what's necessary? > > > > If you're talking about a C application, you're pretty much > > describing > > hellolibvirt. I tried to put enough in there to > > demonstrate a couple > > of different calls, but hopefully not so much that it's > > overwhelming. > > If it seems like there's a lot there, cut some of it > > out. You don't > > need the showDomains function, for example. Remove > > it, compile and > > see what happens. > > > > Dave > > > > > > > Thanks, > > > Steve > > > > > > --- On Wed, 6/30/10, Justin Clift <justin(a)salasaga.org> > > wrote: > > > > > > > From: Justin Clift <justin(a)salasaga.org> > > > > Subject: Re: [libvirt-users] C API example > > > > To: "Dave Allan" <dallan(a)redhat.com> > > > > Cc: steven765(a)yahoo.com, > > libvirt-users(a)redhat.com > > > > Date: Wednesday, June 30, 2010, 10:09 PM > > > > On 07/01/2010 11:54 AM, Dave Allan > > > > wrote: > > > > <snip> > > > > > ./hellolibvirt \ > > > > > > > > > > > qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock > > > > > > > > Thanks Dave. The +unix:// and ?socket=xxx bits > > are > > > > what I'd not been picking up on. Should be good > > now. > > > > > > > > Steven, is it working for you? > > > > > > > > Regards and best wishes, > > > > > > > > Justin Clift > > > > > > > > -- Salasaga - Open Source eLearning IDE > > > > http://www.salasaga.org > > > > > > > > > > > > > > > > > >

1 0

[libvirt] [PATCH] ruby-libvirt: virNodeGetFreeMemory and virGetLibVersion
by Jaromír Červenka 01 Jul '10

01 Jul '10

Author is Michal Hrušecký <mhrusecky(a)suse.cz>. He was unsure about second patch, maybe adds duplicate functionality, please check it. Greetings, Jaromir.

3 2

[libvirt] make check fails on CentOS 5
by Daniel Berteaud 01 Jul '10

01 Jul '10

Hi. I'm using libvirt on a CentOS 5.4 x86_64 host without issue, until libvirt 0.8.1. I usually just rebuild the available src rpm with the following args: --without xen --without xen-proxy \ --without lxc --without vbox --without esx \ --without phyp --without one --without avahi \ --without openvz --without uml (I only use KVM) But, with libvirt 0.8.1, the buiild process now include make check, and one of the check fails: interfaceschematest Attached is the full build log, you can see the failure line 1841. I really don't know how to debug this. For now, I've just added interfaceschematest to the list of check to skip in the spec file (for i in nodeinfotest daemon-conf seclabeltest interfaceschematest). With this modification, everything works, and I'm actually using it this way. Anybody knows why this test fails ? Regards, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

3 3

[libvirt] Ask for help about libvirt error: can't get physical interface data for kvm.
by Feng Dan Liu 01 Jul '10

01 Jul '10

Hi I find this mail address from the internet and hope I can get the reply from anyone of you, that will be very appreciated. I'm using virsh to manage the KVM(qemu-kvm 0.12.4, libvirt 0.8.1), but I encounter an error as below: I saw both libvirt api and virsh commands support to get the physical interfaces data, but it always fail when I using them for KVM hypervisor. I was thought that it was due to the old version of libvirt/KVM hypervisor, but the error still exist when using the latest libvirt and kvm hypervisor. So I wonder if the following functions of libvirt haven't been implemented for KVM, could you pls help me get the answer about this? Thanks in advance! virConnectListInterfaces virConnectNumOfDefinedInterfaces virConnectNumOfInterfaces virConnectListDefinedInterfaces virInterfaceLookupByName Best Regards, Fengdan Liu Tivoli ITCAM Solution, IBM China Software Development Lab, Tel: 13811762746 Email: liufengd(a)cn.ibm.com 3/F, Haohai Bldg., No.7, 5th Street, Shangdi, Haidian District, Beijing 100085, P.R.China

2 2

[libvirt] Maintenance of ruby bindings
by Neil Wilson 30 Jun '10

30 Jun '10

Hi, Is there anybody looking after the Ruby bindings? Are you still taking patches? It seems quite out of date wrt. the current interface. Rgs Neil Wilson

4 6

[libvirt] Update on PHP libvirt
by Radek Hladik 30 Jun '10

30 Jun '10

I would like to post some update about PHP bindings for libvirt I started last year. As usual I do not have enough time to work on it however the last version 0.3 seems to be quite stable. I did get some reports from people using it and it seems that the code is working without problems. I will probably change the status from alpha to beta. The code (available at http://phplibvirt.cybersales.cz/ ) implements basic Libvirt functions for readonly access and machine live-cycle management. I should be able to add any other libvirt function but i do not know all the libvirt functions so well. So if you miss some function and you are willing to test it I can implement it. I would appreciate any feedback and suggestions on this code. Radek

5 10

[libvirt] [PATCH] cgroup: Fix compilation broken on MinGW due to dirent->d_type
by Ryota Ozaki 30 Jun '10

30 Jun '10

As pointed out by Eric Blake, using dirent->d_type breaks compilation on MinGW. This patch addresses this by using '#if defined' as same as doing for virCgroupForDriver. --- src/util/cgroup.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 9fa64dc..024036a 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -608,6 +608,7 @@ cleanup: } #endif +#if defined _DIRENT_HAVE_D_TYPE static int virCgroupRemoveRecursively(char *grppath) { DIR *grpdir; @@ -656,6 +657,13 @@ static int virCgroupRemoveRecursively(char *grppath) return rc; } +#else +static int virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED) +{ + /* Claim no support */ + return -ENXIO; +} +#endif /** * virCgroupRemove: -- 1.6.5.2

2 3

[libvirt] [PATCH] virsh: tweak help output for VSH_OT_DATA
by Eric Blake 30 Jun '10

30 Jun '10

https://bugzilla.redhat.com/show_bug.cgi?id=609044 complained that 'virsh help pool-create-as' didn't document the shortcut that you can do 'virsh pool-create-as $name $type --target $target' rather than having to supply the four optional source- arguments in order to fill out the necessary positional arguments. This one-liner changes the help output to hopefully make this more obvious: NAME pool-create-as - create a pool from a set of args SYNOPSIS pool-create-as <name> [--print-xml] <type> [<source-host>] [<source-path>] [<source-dev>] [<source-name>] [<target>] [--source-format <string>] DESCRIPTION Create a pool. OPTIONS [--name] <string> name of the pool --print-xml print XML document, but don't define/create [--type] <string> type of the pool [--source-host] <string> source-host for underlying storage [--source-path] <string> source path for underlying storage [--source-dev] <string> source device for underlying storage [--source-name] <string> source name for underlying storage [--target] <string> target for underlying storage --source-format <string> format for underlying storage * tools/virsh.c (vshCmddefHelp): Make it more obvious that data arguments may, but not must, be specified by option leaders. --- Wow - the commit message is 30 times bigger than the commit itself! If additionally wanted, I could make the help output wrap if the left column is long, so that the right column lines up, looking more like: OPTIONS [--name] <string> name of the pool --print-xml print XML document, but don't define/create [--type] <string> type of the pool [--source-host] <string> source-host for underlying storage [--source-path] <string> source path for underlying storage [--source-dev] <string> source device for underlying storage [--source-name] <string> source name for underlying storage [--target] <string> target for underlying storage --source-format <string> format for underlying storage tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f1bb295..cdac9c0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9558,7 +9558,7 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) else if (opt->type == VSH_OT_STRING) snprintf(buf, sizeof(buf), _("--%s <string>"), opt->name); else if (opt->type == VSH_OT_DATA) - snprintf(buf, sizeof(buf), "<%s>", opt->name); + snprintf(buf, sizeof(buf), "[--%s] <string>", opt->name); fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); } -- 1.7.0.1

2 4

[libvirt] [PATCH] Avoid invoking the qemu monitor destroy callback if the constructor fails
by Daniel P. Berrange 30 Jun '10

30 Jun '10

Some, but not all, codepaths in the qemuMonitorOpen() method would trigger the destroy callback. The caller does not expect this to be invoked if construction fails, only during normal release of the monitor. This resulted in a possible double-unref of the virDomainObjPtr, because the caller explicitly unrefs the virDomainObjPtr if qemuMonitorOpen() fails * src/qemu/qemu_monitor.c: Don't invoke destroy callback from qemuMonitorOpen() failure paths --- src/qemu/qemu_monitor.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f428665..ff613a0 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -671,6 +671,12 @@ qemuMonitorOpen(virDomainObjPtr vm, return mon; cleanup: + /* We don't want the 'destroy' callback invoked during + * cleanup from construction failure, because that can + * give a double-unref on virDomainObjPtr in the caller, + * so kill the callbacks now. + */ + mon->cb = NULL; qemuMonitorUnlock(mon); qemuMonitorClose(mon); return NULL; -- 1.6.6.1

3 3

[libvirt] [PATCH] cgroup: Add missing errno == ENOENT check in virCgroupRemoveRecursively
by Ryota Ozaki 30 Jun '10

30 Jun '10

ENOENT happens normally when a subsystem is enabled with any other subsystems and the directory of the target group has already removed in a prior loop. In that case, the function should just return without leaving an error message. NB this is the same behavior as before introducing virCgroupRemoveRecursively. --- src/util/cgroup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 62b1446..9fa64dc 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -616,6 +616,8 @@ static int virCgroupRemoveRecursively(char *grppath) grpdir = opendir(grppath); if (grpdir == NULL) { + if (errno == ENOENT) + return 0; VIR_ERROR(_("Unable to open %s (%d)"), grppath, errno); rc = -errno; return rc; -- 1.6.5.2

2 4

[libvirt] [PATCH] vbox: Let configure detect/set the XPCOMC directory
by Matthias Bolte 29 Jun '10

29 Jun '10

This allows the user to give an explicit path to configure ./configure --with-vbox=/path/to/virtualbox instead of having the VirtualBox driver probe a set of possible paths at runtime. If no explicit path is specified then configure probes the set of "known" paths. https://bugzilla.redhat.com/show_bug.cgi?id=609185 --- configure.ac | 73 +++++++++++++++++++++++++++++++++++++++++++- src/Makefile.am | 1 + src/vbox/vbox_XPCOMCGlue.c | 22 ++----------- 3 files changed, 76 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 691ef69..a1ba2f3 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ AC_ARG_WITH([phyp], AC_ARG_WITH([xenapi], AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=check@:>@]),[],[with_xenapi=check]) AC_ARG_WITH([vbox], - AC_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) + AC_HELP_STRING([--with-vbox=@<:@PFX@:>@], [VirtualBox XPCOMC location @<:@default=check@:>@]),[],[with_vbox=check]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], @@ -315,6 +315,77 @@ if test "$with_openvz" = "yes"; then fi AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) + +dnl +dnl check for VirtualBox XPCOMC location +dnl + +vbox_xpcomc_dir= + +if test "x$with_vbox" = "xyes" || test "x$with_vbox" = "xcheck"; then + AC_MSG_CHECKING([for VirtualBox XPCOMC location]) + + if test -f /usr/lib/virtualbox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/usr/lib/virtualbox + else + if test -f /usr/lib/VirtualBox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/usr/lib/VirtualBox + else + if test -f /opt/virtualbox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/opt/virtualbox + else + if test -f /opt/virtualbox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/opt/virtualbox + else + if test -f /opt/VirtualBox/i386/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/opt/VirtualBox/i386 + else + if test -f /opt/VirtualBox/amd64/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/opt/VirtualBox/amd64 + else + if test -f /usr/local/lib/virtualbox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/usr/local/lib/virtualbox + else + if test -f /usr/lib/local/VirtualBox/VBoxXPCOMC.so; then + vbox_xpcomc_dir=/usr/lib/local/VirtualBox + else + if test -f /Application/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib; then + vbox_xpcomc_dir=/Application/VirtualBox.app/Contents/MacOS + fi + fi + fi + fi + fi + fi + fi + fi + fi + + if test -n "$vbox_xpcomc_dir"; then + AC_MSG_RESULT([$vbox_xpcomc_dir]) + with_vbox=yes + else + if test "x$with_vbox" = "xcheck"; then + AC_MSG_RESULT([not found, disabling VirtualBox driver]) + with_vbox=no + else + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([VirtualBox XPCOMC is required for the VirtualBox driver]) + fi + fi +else + if test "x$with_vbox" != "xno"; then + if test -f ${with_vbox}/VBoxXPCOMC.so || test -f ${with_vbox}/VBoxXPCOMC.dylib; then + vbox_xpcomc_dir=$with_vbox + with_vbox=yes + else + AC_MSG_ERROR([$with_vbox does not contain VirtualBox XPCOMC]) + fi + fi +fi + +AC_SUBST([vbox_xpcomc_dir]) + if test "x$with_vbox" = "xyes"; then AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([Unable to find dlopen()])]) case $ac_cv_search_dlopen in diff --git a/src/Makefile.am b/src/Makefile.am index ece18a6..d3c7087 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ INCLUDES = \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DLOCAL_STATE_DIR=\""$(localstatedir)"\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ + -DVBOX_XPCOMC_DIR=\"$(vbox_xpcomc_dir)\" \ $(WARN_CFLAGS) \ $(LOCK_CHECKING_CFLAGS) \ -DIN_LIBVIRT \ diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 0987c1b..fcae0cb 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -192,28 +192,12 @@ int VBoxCGlueInit(void) return tryLoadOne(pszHome, 0); /* - * Try the known standard locations. + * Try the configured location. */ g_szVBoxErrMsg[0] = '\0'; -#if defined(__gnu__linux__) || defined(__linux__) - if (tryLoadOne("/opt/VirtualBox", 1) == 0) - return 0; - if (tryLoadOne("/usr/lib/virtualbox", 1) == 0) - return 0; -#elif defined(__sun__) - if (tryLoadOne("/opt/VirtualBox/amd64", 1) == 0) - return 0; - if (tryLoadOne("/opt/VirtualBox/i386", 1) == 0) - return 0; -#elif defined(__APPLE__) - if (tryLoadOne("/Application/VirtualBox.app/Contents/MacOS", 1) == 0) - return 0; -#elif defined(__FreeBSD__) - if (tryLoadOne("/usr/local/lib/virtualbox", 1) == 0) + + if (tryLoadOne(VBOX_XPCOMC_DIR, 1) == 0) return 0; -#else -# error "port me" -#endif /* * Finally try the dynamic linker search path. -- 1.7.0.4

2 1

[libvirt] [PATCH 0/2]: Small fixes for PCI device assignment
by Chris Lalancette 29 Jun '10

29 Jun '10

This series fixes a couple of bugs found while testing libvirt PCI device assignment.

3 8

[libvirt] [PATCH] virFileResolveLink: guarantee an absolute path
by Eric Blake 29 Jun '10

29 Jun '10

https://bugzilla.redhat.com/show_bug.cgi?id=608092 * src/util/util.c (virFileResolveLink): Use canonicalize_file_name, rather than areadlink. --- For this patch, I chose to avoid any symlink resolution if an lstat shows the last element doesn't need any; but if we know we need symlink resolution, it is much easier to use existing interfaces to correctly resolve relative paths, even if it ends up doing more resolution work than what we strictly need. src/util/util.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 445fd4e..d058113 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -63,7 +63,7 @@ # include <mntent.h> #endif -#include "areadlink.h" +#include "dirname.h" #include "virterror_internal.h" #include "logging.h" #include "event.h" @@ -1178,8 +1178,9 @@ int virFileLinkPointsTo(const char *checkLink, /* - * Attempt to resolve a symbolic link, returning the - * real path + * Attempt to resolve a symbolic link, returning an + * absolute path where only the last component is guaranteed + * not to be a symlink. * * Return 0 if path was not a symbolic, or the link was * resolved. Return -1 with errno set upon error @@ -1191,16 +1192,21 @@ int virFileResolveLink(const char *linkpath, *resultpath = NULL; - if (lstat(linkpath, &st) < 0) - return -1; - - if (!S_ISLNK(st.st_mode)) { - if (!(*resultpath = strdup(linkpath))) + /* We don't need the full canonicalization of intermediate + * directories, if linkpath is absolute and the basename is + * already a non-symlink. */ + if (IS_ABSOLUTE_FILE_NAME(linkpath)) { + if (lstat(linkpath, &st) < 0) return -1; - return 0; + + if (!S_ISLNK(st.st_mode)) { + if (!(*resultpath = strdup(linkpath))) + return -1; + return 0; + } } - *resultpath = areadlink (linkpath); + *resultpath = canonicalize_file_name(linkpath); return *resultpath == NULL ? -1 : 0; } -- 1.7.0.1

2 2

[libvirt] Storage segfaults after phyp patches
by Cole Robinson 29 Jun '10

29 Jun '10

Basically: > $ gdb virsh ... > (gdb) run --connect qemu:///session pool-list --all > Starting program: /usr/bin/virsh --connect qemu:///session pool-list --all > [Thread debugging using libthread_db enabled] > Detaching after fork from child process 29579. > > Program received signal SIGSEGV, Segmentation fault. ... > (gdb) bt > #0 _libssh2_channel_open (session=0x0, channel_type=0x7ffff7b82737 "session", > channel_type_len=7, window_size=65536, packet_size=32768, message=0x0, > message_len=0) at channel.c:139 > #1 0x00000030cb008a7c in libssh2_channel_open_ex (session=0x0, > type=0x7ffff7b82737 "session", type_len=7, window_size=65536, > packet_size=32768, msg=<value optimized out>, msg_len=0) at channel.c:338 > #2 0x00007ffff7ac9edb in phypExec (session=0x0, > cmd=0x63ba50 "viosvrcmd -m (null) --id 0 -c 'lsvg'|grep -c '^.*$'", > exit_status=0x7fffffffdbcc, conn=<value optimized out>) > at phyp/phyp_driver.c:124 > #3 0x00007ffff7acae1c in phypNumOfStoragePools (conn=0x6341b0) > at phyp/phyp_driver.c:3032 > #4 0x00007ffff7a771be in virConnectNumOfStoragePools (conn=0x6341b0) > at libvirt.c:7223 > #5 0x0000000000415f9e in cmdPoolList (ctl=0x7fffffffdf80, cmd=0x1) > at virsh.c:4911 > #6 0x0000000000409dcc in vshCommandRun (ctl=0x7fffffffdf80, cmd=0x62d500) > at virsh.c:9647 > #7 0x00000000004186ed in main (argc=5, argv=<value optimized out>) > at virsh.c:10656 Looks like the phyp storage driver is being used instead of the libvirtd storage driver (and then segfaulting). Looked briefly for a fix, but it wasn't obvious to me. Thanks, Cole

5 8

[libvirt] [PATCH] Avoid calling virStorageFileIsSharedFS with NULL
by Laine Stump 29 Jun '10

29 Jun '10

From: Laine Stump <laine(a)redhat.com> This code was just recently added (by me) and didn't account for the fact that stdin_path is sometimes NULL. If it's NULL, and SetSecurityAllLabel fails, a segfault would result. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2a277a5..e8c5c35 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3429,7 +3429,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (driver->securityDriver && driver->securityDriver->domainSetSecurityAllLabel && driver->securityDriver->domainSetSecurityAllLabel(vm, stdin_path) < 0) { - if (virStorageFileIsSharedFS(stdin_path) != 1) + if (stdin_path && virStorageFileIsSharedFS(stdin_path) != 1) goto cleanup; } -- 1.7.1

3 3

[libvirt] [PATCHv3 0/4] phyp: add storage management
by Eric Blake 28 Jun '10

28 Jun '10

Here's my promised refactoring of the patches. Eduardo Otubo (2): phyp: add rudimentary storage driver phyp: add storage management driver Eric Blake (2): phyp: reduce scope of driver functions phyp: optimize use of sed src/phyp/phyp_driver.c | 3542 +++++++++++++++++++++++++++++++++++------------- src/phyp/phyp_driver.h | 76 +- 2 files changed, 2621 insertions(+), 997 deletions(-)

3 13

[libvirt] [PATCH] lxc: Fix virsh console doesn't work after restarting libvirtd
by Ryota Ozaki 28 Jun '10

28 Jun '10

Because tty path is unexpectedly not saved in the live configuration file of a domain, libvirtd cannot get the console of the domain back after restarting. The reason why the tty path isn't saved is that, to save the tty path, the save function, virDomainSaveConfig, requires that the target domain is running (pid != -1), however, lxc driver calls the function before starting the domain to pass the configuration to controller. To ensure to save the tty path, the patch lets lxc driver call the save function again after starting the domain. --- src/lxc/lxc_driver.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 19d4dcb..462bc9c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1284,7 +1284,7 @@ static int lxcVmStart(virConnectPtr conn, if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths) != 0) goto cleanup; - /* Persist the live configuration now we have veth & tty info */ + /* Save the configuration for the controller */ if (virDomainSaveConfig(driver->stateDir, vm->def) < 0) goto cleanup; @@ -1328,6 +1328,13 @@ static int lxcVmStart(virConnectPtr conn, goto cleanup; } + /* + * Again, need to save the live configuration, because the function + * requires vm->def->id != -1 to save tty info surely. + */ + if (virDomainSaveConfig(driver->stateDir, vm->def) < 0) + goto cleanup; + rc = 0; cleanup: -- 1.6.5.2

3 2

[libvirt] [PATCHv2 0/4] Fix domain restore problems when selinux is enforcing
by Laine Stump 28 Jun '10

28 Jun '10

Changes from V1: 1) Don't set context label of kernel *or* image file, set the context label of both. 2) Add a patch to enhance virStorageFileIsSharedFS to behave similarly to the ill-fated virFileIsOnNetworkShare. 3) Use virStorageFileIsSharedFS instead of virStorageFileIsSharedFS. Prior to this patch series, restoring a domain with selinux set to enforcing would fail, because the function that sets the label on the file to allow qemu to read it did not have the name of the file (see the comments in the individual patches). A patch from Jamie Stranboge (2b57478ef0a0a983cc6a47b98300c8359f9708d0) added the filename to the args passed down into the security driver; the first patch of this series takes advantage of that to properly set the label. Patches 2 - 4 solve a problem with restoring a domain from an NFS share - in this case the selinux functions will fail (as will functions trying to set the uid of the file, if it is a root-squashed share). The solution to this is just ignore the failure. If the security driver fails to set the label, and virStorageFileIsSharedFS() tells us that the file is on a network-shared FS, we ignore the failure, otherwise we behave as before. qemudDomainSaveFlag previously had a bit of code that detected if a particular path was on an NFS share; this code was replaced with a call to virStorageFileIsSharedFS, which is now functionally equivalent (better, even, since it detects a few other types of network filesystems).

3 10

[libvirt] [PATCH] Fix a reference leak for node devices.
by Chris Lalancette 28 Jun '10

28 Jun '10

There was one major, and a few minor bugs having to do with the reference counting of node devices in daemon/remote.c The major bug was that remoteDispatchNodeDeviceListCaps() was completely failing to unreference node devices; this would lead to many open file descriptors, which would eventually fail. The minor bugs were along the same lines, but were in rarely used error paths. Still, they should be corrected. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/remote.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 91faa9a..ec5f85b 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -5012,11 +5012,13 @@ remoteDispatchNodeDeviceGetParent (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ char **parent_p; if (VIR_ALLOC(parent_p) < 0) { + virNodeDeviceFree(dev); remoteDispatchOOMError(rerr); return -1; } *parent_p = strdup(parent); if (*parent_p == NULL) { + virNodeDeviceFree(dev); remoteDispatchOOMError(rerr); return -1; } @@ -5048,6 +5050,7 @@ remoteDispatchNodeDeviceNumOfCaps (struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virNodeDeviceNumOfCaps(dev); if (ret->num < 0) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); return -1; } @@ -5076,6 +5079,7 @@ remoteDispatchNodeDeviceListCaps (struct qemud_server *server ATTRIBUTE_UNUSED, } if (args->maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX) { + virNodeDeviceFree(dev); remoteDispatchFormatError(rerr, "%s", _("maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX")); return -1; @@ -5083,6 +5087,7 @@ remoteDispatchNodeDeviceListCaps (struct qemud_server *server ATTRIBUTE_UNUSED, /* Allocate return buffer. */ if (VIR_ALLOC_N(ret->names.names_val, args->maxnames) < 0) { + virNodeDeviceFree(dev); remoteDispatchOOMError(rerr); return -1; } @@ -5091,11 +5096,13 @@ remoteDispatchNodeDeviceListCaps (struct qemud_server *server ATTRIBUTE_UNUSED, virNodeDeviceListCaps (dev, ret->names.names_val, args->maxnames); if (ret->names.names_len == -1) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); VIR_FREE(ret->names.names_val); return -1; } + virNodeDeviceFree(dev); return 0; } -- 1.6.6.1

5 6

[libvirt] [PATCH] lxc: Fix error handlings in lxcContainerRenameAndEnableInterfaces
by Ryota Ozaki 28 Jun '10

28 Jun '10

The function is expected to return negative value on failure, however, it returns positive value when either setInterfaceName or vethInterfaceUpOrDown fails. Because the function returns the return value of either as is, however, the two functions may return positive value on failure. The patch fixes the defects and add error messages. --- src/lxc/lxc_container.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 018f4d5..4371dba 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -255,13 +255,20 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, DEBUG("Renaming %s to %s", veths[i], newname); rc = setInterfaceName(veths[i], newname); - if (0 != rc) + if (0 != rc) { + VIR_ERROR(_("Failed to rename %s to %s (%d)"), + veths[i], newname, rc); + rc = -1; goto error_out; + } DEBUG("Enabling %s", newname); - rc = vethInterfaceUpOrDown(newname, 1); - if (0 != rc) + rc = vethInterfaceUpOrDown(newname, 1); + if (0 != rc) { + VIR_ERROR(_("Failed to enable %s (%d)"), newname, rc); + rc = -1; goto error_out; + } VIR_FREE(newname); } -- 1.6.5.2

2 1

[libvirt] [PATCH] lxc: Change VIR_ERROR to VIR_DEBUG for just a debugging message
by Ryota Ozaki 28 Jun '10

28 Jun '10

The message is actually not of error but of debugging. 02:22:56.091: error : lxcControllerMain:316 : monitor=3 client=4 appPty=19 contPty=7 --- src/lxc/lxc_controller.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index cffef52..44bcc82 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -313,7 +313,10 @@ static int lxcControllerMain(int monitor, fdArray[0].active = 0; fdArray[1].fd = contPty; fdArray[1].active = 0; - VIR_ERROR(_("monitor=%d client=%d appPty=%d contPty=%d"), monitor,client, appPty, contPty); + + VIR_DEBUG("monitor=%d client=%d appPty=%d contPty=%d", + monitor, client, appPty, contPty); + /* create the epoll fild descriptor */ epollFd = epoll_create(2); if (0 > epollFd) { -- 1.6.5.2

2 1

[libvirt] Live Migration with non-shared storage for kvm
by Kenneth Nagin 27 Jun '10

27 Jun '10

On Wed Apr 07 I sent an email with a patch titled Live Migration with non-shared storage for kvm. What is the status on the patch? Kenneth Nagin Ph: +972-4-8296227 Cell: 054-6976227 Fx: +972-4- 8296113 "Do not look back in anger, or forward in fear, but around in awareness." --James Thurber

6 24

[libvirt] [PATCH] build: fix regression with libvirt-api.xml generation
by Eric Blake 26 Jun '10

26 Jun '10

(EXTRA_DIST): Remove redundant listing of xml files. (html/%-%.html, html/%-virterror.html, %-api.xml, %-refs.xml): Rewrite with... (python_generated_files): ...new macro, since make didn't see through the dependency chain correctly otherwise. --- Since I'm not going to get the xsltproc stuff fixed today, but the broken python bindings are still annoying, I'm splitting this into a smaller patch. This does not fix VPATH builds (but that is no change in the status quo), but DOES fix libvirt-api.xml dependency detection, so that touching include/libvirt/libvirt.h.in will once again reflect all the way to python bindings during 'make all'. docs/Makefile.am | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 41068c6..c01e085 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -70,8 +70,8 @@ fig = \ libvirt-object-model.fig EXTRA_DIST= \ - libvirt-api.xml libvirt-refs.xml apibuild.py \ - site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ + apibuild.py \ + site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(fig) $(png) \ @@ -129,19 +129,23 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in $(XMLLINT) --nonet --valid --noout html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi -$(devhelphtml): libvirt-api.xml $(devhelpxsl) +$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files -@if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi -html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py - -srcdir=$(srcdir) $(srcdir)/apibuild.py +python_generated_files = \ + $(srcdir)/html/libvirt-libvirt.html \ + $(srcdir)/html/libvirt-virterror.html \ + $(srcdir)/libvirt-api.xml \ + $(srcdir)/libvirt-refs.xml -html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: \ - $(srcdir)/../include/%/*.h \ - $(srcdir)/../src/%.c \ +$(python_generated_files): $(srcdir)/apibuild.py \ + $(srcdir)/../include/libvirt/*.h \ + $(srcdir)/../src/libvirt.c \ $(srcdir)/../src/util/virterror.c + -srcdir=$(srcdir) $(srcdir)/apibuild.py check-local: all -- 1.7.0.1

2 2

[libvirt] [PATCH] Fix more reference leaks for node devices
by Matthias Bolte 26 Jun '10

26 Jun '10

Reported by Chris Lalancette, I just found more instances of the same pattern. --- daemon/remote.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index ec5f85b..cb9e83d 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -5126,10 +5126,12 @@ remoteDispatchNodeDeviceDettach (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceDettach(dev) == -1) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); return -1; } + virNodeDeviceFree(dev); return 0; } @@ -5153,10 +5155,12 @@ remoteDispatchNodeDeviceReAttach (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceReAttach(dev) == -1) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); return -1; } + virNodeDeviceFree(dev); return 0; } @@ -5180,10 +5184,12 @@ remoteDispatchNodeDeviceReset (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceReset(dev) == -1) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); return -1; } + virNodeDeviceFree(dev); return 0; } @@ -5230,10 +5236,12 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceDestroy(dev) == -1) { + virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); return -1; } + virNodeDeviceFree(dev); return 0; } -- 1.7.0.4

3 3

[libvirt] [RESEND PATCHv3 0/3] fix build dependencies
by Eric Blake 25 Jun '10

25 Jun '10

https://bugzilla.redhat.com/show_bug.cgi?id=589465 was marked incomplete, because VIR_DOMAIN_START_PAUSED did not make it into the python bindings of 0.8.1-10.el6. Matthias Bolte was kind enough to help me figure out why (see patch 2/3 for details - but the short story was a Makefile dependency problem that failed to rebuild the API documentation after an addition to libvirt.h.in). I was a bit surprised when I could not repeat the test on the tip of my development tree, which means I already have pending patches previously posted to the list but not yet reviewed that are already sufficient to resolve the problem. Hence this resend. Eric Blake (3): build: restore operation of bit-rotted 'make cov' build: fix VPATH build of docs autobuild.sh: use VPATH build .gitignore | 4 ++ Makefile.am | 9 +++- autobuild.sh | 10 ++-- configure.ac | 1 + daemon/.gitignore | 2 - docs/Makefile.am | 48 ++++++++++++--------- docs/apibuild.py | 18 ++++++-- m4/compiler-flags.m4 | 1 - src/.gitignore | 3 - src/Makefile.am | 112 +++++++++++++++++++++++++++----------------------- tests/.gitignore | 2 - 11 files changed, 117 insertions(+), 93 deletions(-)

2 8

[libvirt] [PATCH] maint: add gnulib gettimeofday module
by Eric Blake 25 Jun '10

25 Jun '10

* bootstrap.conf (gnulib_modules): Add gettimeofday. --- We're using gettimeofday throughout libvirt sources, but mingw lacks it. While conditional compilation has made it so that we have not yet tripped up mingw compilation, it doesn't hurt to pull this LGPLv2+ module in now. bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 44d6d0e..5af77a7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -32,6 +32,7 @@ getaddrinfo gethostname getpass gettext-h +gettimeofday gitlog-to-changelog gnumakefile ignore-value -- 1.7.0.1

2 2

[libvirt] [PATCH 0/2] Fix security drivers for character devices
by Daniel P. Berrange 25 Jun '10

25 Jun '10

The security drivers were currently ignoring labelling for serial, parallel, console and channel devices. This has predictably bad results if you want to use file based backends with those devices.

2 5

[libvirt] [PATCH 0/3] Fix domain restore problems when selinux is enforcing
by Laine Stump 25 Jun '10

25 Jun '10

Prior to this patch series, restoring a domain with selinux set to enforcing would fail, because the function that sets the label on the file to allow qemu to read it did not have the name of the file (see the comments in the individual patches). A patch from Jamie Stranboge (2b57478ef0a0a983cc6a47b98300c8359f9708d0) added the filename to the args passed down into the security driver; the first patch of this series takes advantage of that to properly set the label. Patches 2 and 3 solve a problem with restoring a domain from an NFS share - in this case the selinux functions will fail (as will functions trying to set the uid of the file, if it is a root-squashed share). The solution to this is just ignore the failure. qemudDomainSaveFlag previously had a bit of code that detected if a particular path was on an NFS share; this code was moved into a utility function so it could be re-used during domain restore - if the security driver fails to set the label, and the file is on an NFS share, we ignore the failure, otherwise we behave as before.

2 9

[libvirt] [PATCH] Don't squash file permissions when migration fails
by Daniel P. Berrange 25 Jun '10

25 Jun '10

If an active migration operation fails, or is cancelled by the admin, the QEMU on the destination is shutdown and the one on the source continues running. It is important in shutting down the QEMU on the destination, the security drivers don't reset the file labelling/permissions. * src/qemu/qemu_driver.c: Don't reset labelling/permissions on migration abort --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c0cd35a..3289822 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11229,7 +11229,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, goto endjob; } } else { - qemudShutdownVMDaemon(driver, vm, 0); + qemudShutdownVMDaemon(driver, vm, 1); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FAILED); -- 1.6.6.1

2 1

[libvirt] [PATCH] Check for presence of qemu -nodefconfig option before using it
by Laine Stump 25 Jun '10

25 Jun '10

We previously assumed that if the -device option existed in qemu, that -nodefconfig would also exist. It turns out that isn't the case, as demonstrated by qemu-kvm-0.12.3 in Fedora 13. */src/qemu/qemu_conf.[hc] - add a new QEMUD_CMD_FLAG, set it via the help output, and check it before adding -nodefconfig to the qemu commandline. --- src/qemu/qemu_conf.c | 5 ++++- src/qemu/qemu_conf.h | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 9cece8b..b45b592 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1176,6 +1176,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_BALLOON; if (strstr(help, "-device")) flags |= QEMUD_CMD_FLAG_DEVICE; + if (strstr(help, "-nodefconfig")) + flags |= QEMUD_CMD_FLAG_NODEFCONFIG; /* The trailing ' ' is important to avoid a bogus match */ if (strstr(help, "-rtc ")) flags |= QEMUD_CMD_FLAG_RTC; @@ -3780,7 +3782,8 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-nographic"); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { - ADD_ARG_LIT("-nodefconfig"); /* Disabling global config files */ + if (qemuCmdFlags & QEMUD_CMD_FLAG_NODEFCONFIG) + ADD_ARG_LIT("-nodefconfig"); /* Disabling global config files */ ADD_ARG_LIT("-nodefaults"); /* Disabling default guest devices */ } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 0f8a1b3..ab5f158 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -90,6 +90,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_NO_KVM_PIT = (1LL << 34), /* -no-kvm-pit-reinjection supported */ QEMUD_CMD_FLAG_TDF = (1LL << 35), /* -tdf flag (user-mode pit catchup) */ QEMUD_CMD_FLAG_PCI_CONFIGFD = (1LL << 36), /* pci-assign.configfd */ + QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ }; /* Main driver state */ -- 1.7.1

2 4