- Devel - libvirt List Archives

[libvirt] [PATCH] snapshot: fix snapshot-delete option check error
by Guannan Ren 21 Jun '13

21 Jun '13

For descendant of a snapshot, we need to check if they are external for both flag VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN and VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY For the snapshot itself, only check it if VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN is given. --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c886378..3a64c43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12873,10 +12873,11 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, goto cleanup; if (!metadata_only) { - if (!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) && + if ((flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) && virDomainSnapshotIsExternal(snap)) external++; - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) + if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | + VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) virDomainSnapshotForEachDescendant(snap, qemuDomainSnapshotCountExternal, &external); -- 1.8.1.4

2 2

[libvirt] [PATCH v4] qemu: add hv_vapic and hv_spinlocks support
by Ján Tomko 21 Jun '13

21 Jun '13

Add new CPU flags for HyperV: hv_vapic for virtual APIC support hv_spinlocks for spinlock support XML: <features> <hyperv> <vapic state='on'/> <spinlocks state='on'>0xFFFF</spinlocks> </hyperv> </features> results in the following QEMU command line: qemu -cpu <cpu_model>,hv_vapic,hv_spinlocks=0xffff https://bugzilla.redhat.com/show_bug.cgi?id=784836 --- v1: https://www.redhat.com/archives/libvir-list/2013-May/msg00173.html v2: https://www.redhat.com/archives/libvir-list/2013-May/msg00184.html uses virStringSplit instead of strsep added a missing break to virDomainDefParseXML v3: https://www.redhat.com/archives/libvir-list/2013-June/msg00228.html rebased to use VIR_STRDUP fixed a crash on parsing '-cpu qemu32,hv_' v4: Added state attribute to spinlocks. CPU command line parsing refactoring is already pushed. Changed version in docs from 1.0.6 to 1.0.7. Use 'value' instead of 'hv_tokens[1]' for readability. docs/formatdomain.html.in | 17 ++++++- docs/schemas/domaincommon.rng | 13 ++++++ src/conf/domain_conf.c | 62 ++++++++++++++++++++++++- src/conf/domain_conf.h | 3 ++ src/qemu/qemu_command.c | 48 ++++++++++++++++++- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 142 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 755d084..525e4cd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1147,6 +1147,8 @@ <privnet/> <hyperv> <relaxed state='on'/> + <vapic state='on'/> + <spinlocks state='on'>0xFFFF</spinlocks> </hyperv> </features> @@ -1197,14 +1199,27 @@ <th>Feature</th> <th>Description</th> <th>Value</th> + <th>Since</th> </tr> <tr> <td>relaxed</td> <td>Relax contstraints on timers</td> <td> on, off</td> + <td>1.0.0 (QEMU only)</td> + </tr> + <tr> + <td>vapic</td> + <td>Enable virtual APIC</td> + <td>on, off</td> + <td>1.0.7 (QEMU only)</td> + </tr> + <tr> + <td>spinlocks</td> + <td>Enable spinlock support</td> + <td>hexadecimal number of retries, at least 0xFFF</td> + <td>1.0.7 (QEMU only)</td> </tr> </table> - Since 1.0.0 (QEMU only) </dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1eb2f68..a5e69e2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4015,6 +4015,19 @@ <ref name="hypervtristate"/> </element> </optional> + <optional> + <element name="vapic"> + <ref name="hypervtristate"/> + </element> + </optional> + <optional> + <element name="spinlocks"> + <ref name="hypervtristate"/> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{0,8}</param> + </data> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2373397..5618c4c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -149,7 +149,9 @@ VIR_ENUM_IMPL(virDomainFeatureState, VIR_DOMAIN_FEATURE_STATE_LAST, "off") VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, - "relaxed") + "relaxed", + "vapic", + "spinlocks") VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", @@ -11076,6 +11078,7 @@ virDomainDefParseXML(xmlDocPtr xml, switch ((enum virDomainHyperv) feature) { case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: if (!(tmp = virXPathString("string(./@state)", ctxt))) { virReportError(VIR_ERR_XML_ERROR, _("missing 'state' attribute for " @@ -11096,6 +11099,48 @@ virDomainDefParseXML(xmlDocPtr xml, def->hyperv_features[feature] = value; break; + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (!(tmp = virXPathString("string(./@state)", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value = virDomainFeatureStateTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid value of state argument " + "for HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + if (!(tmp = virXPathString("string(.)", ctxt))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing HyperV spinlock retry count")); + goto error; + } + + if (virStrToLong_ui(tmp, NULL, 0, + &def->hyperv_spinlocks) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Cannot parse HyperV spinlock retry " + "count")); + goto error; + } + + if (def->hyperv_spinlocks < 0xFFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV spinlock retry count must be " + "at least 0xFFF")); + goto error; + } + VIR_FREE(tmp); + def->hyperv_features[VIR_DOMAIN_HYPERV_SPINLOCKS] = value; + break; + case VIR_DOMAIN_HYPERV_LAST: break; } @@ -16216,10 +16261,23 @@ virDomainDefFormatInternal(virDomainDefPtr def, for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { switch ((enum virDomainHyperv) i) { case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: if (def->hyperv_features[i]) virBufferAsprintf(buf, " <%s state='%s'/>\n", virDomainHypervTypeToString(i), - virDomainFeatureStateTypeToString(def->hyperv_features[i])); + virDomainFeatureStateTypeToString( + def->hyperv_features[i])); + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (def->hyperv_features[i] == VIR_DOMAIN_FEATURE_STATE_ON) + virBufferAsprintf(buf, " <spinlocks state='on'>" + "0x%x</spinlocks>\n", + def->hyperv_spinlocks); + else if (def->hyperv_features[i]) + virBufferAsprintf(buf, " <spinlocks state='%s'/>", + virDomainFeatureStateTypeToString( + def->hyperv_features[i])); break; case VIR_DOMAIN_HYPERV_LAST: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5b159ac..3817e37 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1584,6 +1584,8 @@ enum virDomainFeatureState { enum virDomainHyperv { VIR_DOMAIN_HYPERV_RELAXED = 0, + VIR_DOMAIN_HYPERV_VAPIC, + VIR_DOMAIN_HYPERV_SPINLOCKS, VIR_DOMAIN_HYPERV_LAST }; @@ -1926,6 +1928,7 @@ struct _virDomainDef { int apic_eoi; /* These options are of type virDomainFeatureState */ int hyperv_features[VIR_DOMAIN_HYPERV_LAST]; + unsigned int hyperv_spinlocks; virDomainClockDef clock; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 486682e..c6cb833 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5786,11 +5786,18 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver, for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { switch ((enum virDomainHyperv) i) { case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: if (def->hyperv_features[i] == VIR_DOMAIN_FEATURE_STATE_ON) virBufferAsprintf(&buf, ",hv_%s", virDomainHypervTypeToString(i)); break; + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (def->hyperv_features[i] == VIR_DOMAIN_FEATURE_STATE_ON) + virBufferAsprintf(&buf,",hv_spinlocks=0x%x", + def->hyperv_spinlocks); + break; + case VIR_DOMAIN_HYPERV_LAST: break; } @@ -9627,6 +9634,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, { virCPUDefPtr cpu = NULL; char **tokens; + char **hv_tokens = NULL; char *model = NULL; int ret = -1; int i; @@ -9706,9 +9714,19 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, goto cleanup; } } else if (STRPREFIX(tokens[i], "hv_")) { - const char *feature = tokens[i] + 3; /* "hv_" */ + const char *token = tokens[i] + 3; /* "hv_" */ + const char *feature, *value; int f; + if (*token == '\0') + goto syntax; + + if (!(hv_tokens = virStringSplit(token, "=", 2))) + goto cleanup; + + feature = hv_tokens[0]; + value = hv_tokens[1]; + if (*feature == '\0') goto syntax; @@ -9723,12 +9741,39 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, switch ((enum virDomainHyperv) f) { case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + if (value) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("HyperV feature '%s' should not " + "have a value"), feature); + goto cleanup; + } dom->hyperv_features[f] = VIR_DOMAIN_FEATURE_STATE_ON; break; + case VIR_DOMAIN_HYPERV_SPINLOCKS: + dom->hyperv_features[f] = VIR_DOMAIN_FEATURE_STATE_ON; + if (!value) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("missing HyperV spinlock retry count")); + goto cleanup; + } + + if (virStrToLong_ui(value, NULL, 0, &dom->hyperv_spinlocks) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cannot parse HyperV spinlock retry count")); + goto cleanup; + } + + if (dom->hyperv_spinlocks < 0xFFF) + dom->hyperv_spinlocks = 0xFFF; + break; + case VIR_DOMAIN_HYPERV_LAST: break; } + virStringFreeList(hv_tokens); + hv_tokens = NULL; } } @@ -9756,6 +9801,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, cleanup: VIR_FREE(model); virStringFreeList(tokens); + virStringFreeList(hv_tokens); return ret; syntax: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args index fac4d5f..df6b207 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ --cpu qemu32,hv_relaxed -m 214 -smp 6 -nographic -monitor \ +-cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff -m 214 -smp 6 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml index 0d5d0c7..13eec63 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml @@ -12,6 +12,8 @@ <acpi/> <hyperv> <relaxed state='on'/> + <vapic state='on'/> + <spinlocks state='on'>0x2fff</spinlocks> </hyperv> </features> <clock offset='utc'/> -- 1.8.1.5

2 1

[libvirt] [PATCH] conf: Requires either uuid or usage of secret
by Osier Yang 21 Jun '13

21 Jun '13

As the RNG schema for disk auth secret implies, it requires either "uuid" or "secret": <define name='diskAuthSecret'> <element name='secret'> <attribute name='type'> <choice> <value>ceph</value> <value>iscsi</value> </choice> </attribute> <choice> <attribute name='uuid'> <ref name="UUID"/> </attribute> <attribute name='usage'> <ref name='genericName'/> </attribute> </choice> </element> </define> --- src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2373397..9297937 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4972,6 +4972,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, _("only one of uuid and usage can be specified")); goto error; } + + if (!authUUID && !authUsage) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("either uuid or usage should be " + "specified for a secret")); + goto error; + } + if (authUUID != NULL) { def->auth.secretType = VIR_DOMAIN_DISK_SECRET_TYPE_UUID; if (virUUIDParse(authUUID, -- 1.8.1.4

2 2

[libvirt] [PATCH] qemu: Make probing for commands declarative
by Jiri Denemark 21 Jun '13

21 Jun '13

--- src/qemu/qemu_capabilities.c | 53 ++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7cac6e4..c4e076a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1316,6 +1316,22 @@ struct virQEMUCapsStringFlags { }; +struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { + { "system_wakeup", QEMU_CAPS_WAKEUP }, + { "transaction", QEMU_CAPS_TRANSACTION }, + { "block_job_cancel", QEMU_CAPS_BLOCKJOB_SYNC }, + { "block-job-cancel", QEMU_CAPS_BLOCKJOB_ASYNC }, + { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, + { "query-spice", QEMU_CAPS_SPICE }, + { "query-kvm", QEMU_CAPS_KVM }, + { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, + { "query-vnc", QEMU_CAPS_VNC }, + { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, + { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, + { "add-fd", QEMU_CAPS_ADD_FD }, + { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, +}; + struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { { "BALLOON_CHANGE", QEMU_CAPS_BALLOON_EVENT }, { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, @@ -1956,42 +1972,15 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, { char **commands = NULL; int ncommands; - size_t i; if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) return -1; - for (i = 0; i < ncommands; i++) { - char *name = commands[i]; - if (STREQ(name, "system_wakeup")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); - else if (STREQ(name, "transaction")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_TRANSACTION); - else if (STREQ(name, "block_job_cancel")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC); - else if (STREQ(name, "block-job-cancel")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); - else if (STREQ(name, "dump-guest-memory")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_MEMORY); - else if (STREQ(name, "query-spice")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPICE); - else if (STREQ(name, "query-kvm")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); - else if (STREQ(name, "block-commit")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT); - else if (STREQ(name, "query-vnc")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); - else if (STREQ(name, "drive-mirror")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_MIRROR); - else if (STREQ(name, "blockdev-snapshot-sync")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT); - else if (STREQ(name, "add-fd")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); - else if (STREQ(name, "nbd-server-start")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); - VIR_FREE(name); - } - VIR_FREE(commands); + virQEMUCapsProcessStringFlags(qemuCaps, + ARRAY_CARDINALITY(virQEMUCapsCommands), + virQEMUCapsCommands, + ncommands, commands); + virQEMUCapsFreeStringList(ncommands, commands); /* QMP add-fd was introduced in 1.2, but did not support * management control of set numbering, and did not have a -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Make probing for events declarative
by Jiri Denemark 21 Jun '13

21 Jun '13

--- src/qemu/qemu_capabilities.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 406dca9..7cac6e4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1316,6 +1316,11 @@ struct virQEMUCapsStringFlags { }; +struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { + { "BALLOON_CHANGE", QEMU_CAPS_BALLOON_EVENT }, + { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, +}; + struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -2014,21 +2019,15 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, { char **events = NULL; int nevents; - size_t i; if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; - for (i = 0; i < nevents; i++) { - char *name = events[i]; - - if (STREQ(name, "BALLOON_CHANGE")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON_EVENT); - if (STREQ(name, "SPICE_MIGRATE_COMPLETED")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION); - VIR_FREE(name); - } - VIR_FREE(events); + virQEMUCapsProcessStringFlags(qemuCaps, + ARRAY_CARDINALITY(virQEMUCapsEvents), + virQEMUCapsEvents, + nevents, events); + virQEMUCapsFreeStringList(nevents, events); return 0; } -- 1.8.2.1

2 2

[libvirt] [PATCH] build: Fix build with -Werror
by Jim Fehlig 21 Jun '13

21 Jun '13

Commit 752596b5 broke the build with -Werror qemu/qemu_hotplug.c: In function 'qemuDomainChangeGraphics': qemu/qemu_hotplug.c:1980:39: error: declaration of 'listen' shadows a global declaration [-Werror=shadow] Fix with s/listen/newlisten/ --- Pushing under the build-breaker rule. src/qemu/qemu_hotplug.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 637dbc5..18f5fa5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1977,18 +1977,18 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, } for (i = 0; i < dev->nListens; i++) { - virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr newlisten = &dev->listens[i]; virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; - if (listen->type != oldlisten->type) { + if (newlisten->type != oldlisten->type) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("cannot change the type of listen address")); goto cleanup; } - switch ((enum virDomainGraphicsListenType) listen->type) { + switch ((enum virDomainGraphicsListenType) newlisten->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + if (STRNEQ_NULLABLE(newlisten->address, oldlisten->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen address setting on vnc graphics") : @@ -1998,7 +1998,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + if (STRNEQ_NULLABLE(newlisten->network, oldlisten->network)) { virReportError(VIR_ERR_INVALID_ARG, "%s", dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen network setting on vnc graphics") : -- 1.7.7

1 0

[libvirt] [PATCH] network: increase max number of routes
by Laine Stump 21 Jun '13

21 Jun '13

This fixes the problem reported in: https://bugzilla.redhat.com/show_bug.cgi?id=972690 When checking for a collision of a new libvirt network's subnet with any existing routes, we read all of /proc/net/route into memory, then parse all the entries. The function that we use to read this file requires a "maximum length" parameter, which had previously been set to 64*1024. As each line in /proc/net/route is 128 bytes, this would allow for a maximum of 512 entries in the routing table. This patch increases that number to 128 * 100000, which allows for 100,000 routing table entries. This means that it's possible that 12MB would be allocated, but that would only happen if there really were 100,000 route table entries on the system, it's only held for a very short time. Since there is no method of specifying and unlimited max (and that would create a potential denial of service anyway) hopefully this limit is large enough to accomodate everyone. --- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d5886fe..f7c2470 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2305,7 +2305,8 @@ networkCheckRouteCollision(virNetworkObjPtr network) { int ret = 0, len; char *cur, *buf = NULL; - enum {MAX_ROUTE_SIZE = 1024*64}; + /* allow for up to 100000 routes (each line is 128 bytes) */ + enum {MAX_ROUTE_SIZE = 128*100000}; /* Read whole routing table into memory */ if ((len = virFileReadAll(PROC_NET_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0) -- 1.7.11.7

2 2

[libvirt] [PATCH v2] qemuDomainChangeGraphics: Check listen address change by listen type
by Michal Privoznik 21 Jun '13

21 Jun '13

Currently, we have a bug when updating a graphics device. A graphics device can have a listen address set. This address is either defined by user (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) or it can be inherited from a network (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK). However, in both cases we have a listen address to process (e.g. during migration, as I've tried to fix in 7f15ebc7). Later, when a user tries to update the graphics device (e.g. set a password), we check if listen addresses match the original as qemu doesn't know how to change listen address yet. Hence, users are required to not change the listen address. The implementation then just dumps listen addresses and compare them. Previously, while dumping the listen addresses, NULL was returned for NETWORK. After my patch, this is no longer true, and we get a listen address for olddev even if it is a type of NETWORK. So we have a real string on one side, the NULL from user's XML on the other side and hence we think user wants to change the listen address and we refuse it. Therefore, we must take the type of listen address into account as well. --- src/qemu/qemu_hotplug.c | 70 +++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6c07af5..637dbc5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1960,10 +1960,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); - const char *oldListenAddr, *newListenAddr; - const char *oldListenNetwork, *newListenNetwork; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + size_t i; if (!olddev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1971,10 +1970,49 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, goto cleanup; } - oldListenAddr = virDomainGraphicsListenGetAddress(olddev, 0); - newListenAddr = virDomainGraphicsListenGetAddress(dev, 0); - oldListenNetwork = virDomainGraphicsListenGetNetwork(olddev, 0); - newListenNetwork = virDomainGraphicsListenGetNetwork(dev, 0); + if (dev->nListens != olddev->nListens) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the number of listen addresses")); + goto cleanup; + } + + for (i = 0; i < dev->nListens; i++) { + virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; + + if (listen->type != oldlisten->type) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the type of listen address")); + goto cleanup; + } + + switch ((enum virDomainGraphicsListenType) listen->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen address setting on vnc graphics") : + _("cannot change listen address setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen network setting on vnc graphics") : + _("cannot change listen network setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + /* nada */ + break; + } + } switch (dev->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -1985,16 +2023,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on vnc graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr,newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on vnc graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on vnc graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change keymap setting on vnc graphics")); @@ -2040,16 +2068,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on spice graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr, newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on spice graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork, newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on spice graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.1.5

2 1

[libvirt] [PATCH] qemuDomainChangeGraphics: Check listen address change by listen type
by Michal Privoznik 21 Jun '13

21 Jun '13

Currently, we have a bug when updating a graphics device. A graphics device can have a listen address set. This address is either defined by user (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) or it can be inherited from a network (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK). However, in both cases we have a listen address to process (e.g. during migration, as I've tried to fix in 7f15ebc7). Later, when an user tries to update the graphics device (e.g. set a password), we check if listen addresses match the original as qemu doesn't know how to change listen address yet. Hence, users are required to not change the listen address. The implementation then just dumps listen addresses and compare them. Previously, while dumping the listen addresses, NULL was returned for NETWORK. After my patch, this is no longer true, and we get a listen address for olddev even if it is a type of NETWORK. So we have a real string on one side, the NULL from user's XML on the other side and hence we think user wants to change the listen address and we refuse it. Therefore, we must take the type of listen address into account as well. --- src/qemu/qemu_hotplug.c | 71 +++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6c07af5..8563457 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1960,10 +1960,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); - const char *oldListenAddr, *newListenAddr; - const char *oldListenNetwork, *newListenNetwork; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + size_t i; if (!olddev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1971,10 +1970,50 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, goto cleanup; } - oldListenAddr = virDomainGraphicsListenGetAddress(olddev, 0); - newListenAddr = virDomainGraphicsListenGetAddress(dev, 0); - oldListenNetwork = virDomainGraphicsListenGetNetwork(olddev, 0); - newListenNetwork = virDomainGraphicsListenGetNetwork(dev, 0); + if (dev->nListens != olddev->nListens) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the number of listen addresses")); + goto cleanup; + } + + for (i = 0; i < dev->nListens; i++) { + virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; + + if (listen->type != oldlisten->type) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the type of listen address")); + goto cleanup; + } + + switch (listen->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen address setting on vnc graphics") : + _("cannot change listen address setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen network setting on vnc graphics") : + _("cannot change listen network setting on spice graphics")); + goto cleanup; + } + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("listen of type %d not handled yet"), + listen->type); + goto cleanup; + } + } switch (dev->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -1985,16 +2024,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on vnc graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr,newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on vnc graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on vnc graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change keymap setting on vnc graphics")); @@ -2040,16 +2069,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on spice graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr, newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on spice graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork, newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on spice graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.1.5

2 1

[libvirt] [PATCH for v1.0.5-maint 0/2] Resolve issues seen with schedinfo
by John Ferlan 20 Jun '13

20 Jun '13

This is a backport of: https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html submitted upstread as commit id 'b2375453' and '38ada092' John Ferlan (2): qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 1.8.1.4

2 4

[libvirt] [PATCH for v1.0.6-maint 0/2] Resolve issues seen with schedinfo
by John Ferlan 20 Jun '13

20 Jun '13

This is a backport of: https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html submitted upstread as commit id 'b2375453' and '38ada092' John Ferlan (2): qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 1.8.1.4

2 4

[libvirt] [PATCH] spec: Enable KVM support on ARM
by Cole Robinson 20 Jun '13

20 Jun '13

F20/rawhide has will support this. From: Peter Robinson <pbrobinson(a)gmail.com> --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d43e6d..e357a3d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -54,7 +54,11 @@ %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts %if 0%{?fedora} >= 18 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %if 0%{?fedora} >= 20 + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} + %else + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %endif %else %define qemu_kvm_arches %{ix86} x86_64 %endif -- 1.8.2.1

3 4

[libvirt] [PATCH 00/11] Support CHAP authentication for iscsi pool
by Osier Yang 20 Jun '13

20 Jun '13

The XMLs like (<auth type='chap' login='foo' passwd='kudo'/>) was introduced long ago, but it's never used for any pool backend. This implements the support first (See 6/11 for details), and based on it, using "secret" object for the authentication is added too. E.g. <auth type='chap' username='foo'> <secret uuid='48dcd4a4-b25f-4fc6-8874-84797c6e3678'/> </auth> Osier Yang (11): storage: Refactor the rng schema for storage pool auth storage: Support "username" for "chap" type "auth" storage: Add a struct for auth secret storage: Introduce XMLs to use secret object for pool auth storage: Output auth type before username storage: Support "chap" authentication for iscsi pool storage: Support to use secret object for iscsi chap "auth" storage: Update docs/formatsecret.html storage: Use the internal API to get the secret value instead storage: Improve the pool auth type parsing and formating Storage: Fix the indention of rbd test file docs/formatsecret.html.in | 10 +- docs/schemas/storagepool.rng | 51 +++--- src/conf/storage_conf.c | 179 ++++++++++++++------- src/conf/storage_conf.h | 28 +++- src/storage/storage_backend_iscsi.c | 114 ++++++++++++- src/storage/storage_backend_rbd.c | 13 +- .../storagepoolxml2xmlin/pool-iscsi-auth-login.xml | 17 ++ .../pool-iscsi-auth-secret.xml | 19 +++ .../pool-iscsi-auth-username.xml | 17 ++ tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 17 -- tests/storagepoolxml2xmlin/pool-rbd.xml | 2 +- .../pool-iscsi-auth-login.xml | 20 +++ .../pool-iscsi-auth-secret.xml | 22 +++ .../pool-iscsi-auth-username.xml | 20 +++ tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 20 --- .../pool-iscsi-vendor-product.xml | 2 +- tests/storagepoolxml2xmlout/pool-rbd.xml | 2 +- tests/storagepoolxml2xmltest.c | 3 +- 18 files changed, 424 insertions(+), 132 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-login.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-secret.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-username.xml delete mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-login.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-secret.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-username.xml delete mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth.xml -- 1.8.1.4

2 30

[libvirt] [PATCH] Add optional serial id for USB devices in hostdev
by david.waring＠rd.bbc.co.uk 20 Jun '13

20 Jun '13

From: David Waring <david.waring(a)rd.bbc.co.uk> This patch adds the ability to include a serial element in a hostdev/source to select a device with a particular serial number. Patch for bugzilla #914883. This allows specific USB devices to attached to guests when there may be more than one of the same USB device attached to a host. The serial number is optional so that without it existing behaviour is maintained. David Waring (1): Add ability to attach USB devices to guests using vendor, product and serial id. docs/formatdomain.html.in | 21 +++++++++++--------- src/conf/domain_conf.c | 18 +++++++++++++++-- src/conf/domain_conf.h | 1 + src/conf/node_device_conf.c | 5 +++++ src/conf/node_device_conf.h | 1 + src/lxc/lxc_hostdev.c | 5 +++-- src/qemu/qemu_hostdev.c | 5 +++-- src/util/virusb.c | 47 +++++++++++++++++++++++++++++++++++++++++---- src/util/virusb.h | 2 ++ 9 files changed, 86 insertions(+), 19 deletions(-) -- 1.8.1.4

2 2

[libvirt] [PATCH 00/19] Support for access control
by Daniel P. Berrange 20 Jun '13

20 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series (which depends on the Xen refactoring patches) adds support for access control checks on all APIs that run inside libvirtd. The first patch defines the basic objects which can be checked and the permissions associated with each object. In addition it provides the basic internal (pluggable) API for access control checks Later there are policykit and selinux drivers for the access control framework. Neither of these is currently optimal but they have basic functionality working To ensure that we don't forget access control checks when adding new APIs, we maintain metadata in the remote_protocol.x file against each method declaring what access control check must be done. There are actually two checks possible. The first check is against the object being used. The optional second check is against the objects being returned (if any). The latter is used to filter what can be seen when asking for a list of objects (eg 'virsh list' gets filtered) Again to ensure accurate checks, we automate the generation of methods for applying access control checks to each API. These helper methods are named to match the public API names. The last patch ensures that every method listed in the virXXXXDriverPtr tables has a call to an access control helper with the same name as the public API. And of course there are the patches which actually add the access control checks. Still todo - Not all Xen methods have access control checks yet. This causes the test case in the last patch to report failures - Have not wired up the checks for filtering the returned objects in any driver yet - The polkit driver is inefficient since it spawns pkcheck for each check. We need to talk to DBus directly since ACL checks will be very frequent and need to be lightweight - The SELinux driver is validating against the label of libvirtd. We need to validate against the label of the virDomainDefPtr security model or some equivalent for other objects. - Need to write a generic RBAC access control impl. It was hoped that new polkit would make this obsolete. Polkit is still unable to do access control checks for non-local users though eg it can't validate against SASL usernames or x509 certs. Daniel P. Berrange (19): Define basic internal API for access control Set conn->driver before running driver connectOpen method Setup default access control manager in libvirtd Add a policy kit access control driver Add an SELinux access control driver Add ACL annotations to all RPC messages Auto-generate helpers for checking access control rules Add ACL checks into the QEMU driver Add ACL checks into the LXC driver Add ACL checks into the UML driver Add ACL checks into the Xen driver Add ACL checks into the libxl driver Add ACL checks into the storage driver Add ACL checks into the network driver Add ACL checks into the interface driver Add ACL checks into the node device driver Add ACL checks into the nwfilter driver Add ACL checks into the secrets driver Add validation that all APIs contain ACL checks .gitignore | 10 + daemon/Makefile.am | 1 + daemon/libvirtd-config.c | 4 + daemon/libvirtd-config.h | 2 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 27 ++ daemon/libvirtd.conf | 9 + daemon/test_libvirtd.aug.in | 4 + include/libvirt/virterror.h | 4 + m4/virt-compile-warnings.m4 | 1 + m4/virt-selinux.m4 | 2 + po/POTFILES.in | 3 + src/Makefile.am | 128 +++++- src/access/genpolkit.pl | 119 ++++++ src/access/viraccessdriver.h | 89 ++++ src/access/viraccessdrivernop.c | 118 ++++++ src/access/viraccessdrivernop.h | 28 ++ src/access/viraccessdriverpolkit.c | 399 ++++++++++++++++++ src/access/viraccessdriverpolkit.h | 28 ++ src/access/viraccessdriverselinux.c | 565 +++++++++++++++++++++++++ src/access/viraccessdriverselinux.h | 28 ++ src/access/viraccessdriverstack.c | 285 +++++++++++++ src/access/viraccessdriverstack.h | 32 ++ src/access/viraccessmanager.c | 352 ++++++++++++++++ src/access/viraccessmanager.h | 91 ++++ src/access/viraccessperm.c | 84 ++++ src/access/viraccessperm.h | 647 +++++++++++++++++++++++++++++ src/check-aclrules.pl | 144 +++++++ src/interface/interface_backend_netcf.c | 114 +++++ src/interface/interface_backend_udev.c | 85 +++- src/internal.h | 4 + src/libvirt.c | 11 +- src/libvirt_private.syms | 37 ++ src/libxl/libxl_driver.c | 187 ++++++++- src/locking/lock_protocol.x | 8 + src/lxc/lxc_driver.c | 219 +++++++++- src/network/bridge_driver.c | 61 +++ src/node_device/node_device_driver.c | 36 ++ src/nwfilter/nwfilter_driver.c | 26 ++ src/qemu/qemu_driver.c | 716 ++++++++++++++++++++++++++++---- src/remote/lxc_protocol.x | 1 + src/remote/qemu_protocol.x | 4 + src/remote/remote_protocol.x | 406 ++++++++++++++++++ src/rpc/gendispatch.pl | 212 +++++++++- src/secret/secret_driver.c | 31 ++ src/storage/storage_driver.c | 155 ++++++- src/uml/uml_driver.c | 174 +++++++- src/util/virerror.c | 8 + src/util/virlog.c | 3 +- src/util/virlog.h | 1 + src/xen/xen_driver.c | 217 +++++++++- 51 files changed, 5785 insertions(+), 136 deletions(-) create mode 100755 src/access/genpolkit.pl create mode 100644 src/access/viraccessdriver.h create mode 100644 src/access/viraccessdrivernop.c create mode 100644 src/access/viraccessdrivernop.h create mode 100644 src/access/viraccessdriverpolkit.c create mode 100644 src/access/viraccessdriverpolkit.h create mode 100644 src/access/viraccessdriverselinux.c create mode 100644 src/access/viraccessdriverselinux.h create mode 100644 src/access/viraccessdriverstack.c create mode 100644 src/access/viraccessdriverstack.h create mode 100644 src/access/viraccessmanager.c create mode 100644 src/access/viraccessmanager.h create mode 100644 src/access/viraccessperm.c create mode 100644 src/access/viraccessperm.h create mode 100644 src/check-aclrules.pl -- 1.8.1.4

3 21

[libvirt] [PATCH 00/11] storage_scsi: Stable SCSI host addressing support
by Osier Yang 20 Jun '13

20 Jun '13

The SCSI host number is not stable on Linux platform, the number can be changed after a system rebooting or scsi kernel modules reloaded. To have a stable address for the scsi_host adapter of scsi pool, this introduces new XMLs like: <adapter type='scsi_host' parent='pci_0000_00_1f_2' unique_id='5'/> Where "parent" is the parent device of the scsi host, it should be consistent with the name style what node device driver uses (Either udev backend style or HAL backend style), or the PCI address in format "domain:bus:slot:function" format. "unique_id" is the number exposed by sysfs. E.g: % cat /sys/bus/pci/devices/0000:00:1f.2/ata5/host4/scsi_host/host4/unique_id 5 The attribute "parent" is required, attribute "unique_id" is optional, if it's omitted, the scsi host which has smallest unique_id under the "parent" device will be used. "parent" and the old "name" attribute are exclusive, since they are both to indicate scsi host number. Osier Yang (11): storage: Add a struct for scsi_host type adapter storage: Introduce new XMLs for stable SCSI host addressing util: Add a util to traverse directory tree util: Add util to find PCI device address by its vendor and product IDs util: Add util to parse the stable scsi host address storage_scsi: Don't ignore the return value of VIR_STRDUP storage_scsi: Translate the stable address into scsi host number util: Add util to pad string storage_scsi: Allow the direct PCI address for 'parent' util: Add a util to guess the scsi host name with specified "parent" storage_scsi: Allow the omitted 'unique_id' docs/schemas/basictypes.rng | 20 +- src/conf/storage_conf.c | 66 ++- src/conf/storage_conf.h | 7 +- src/libvirt_private.syms | 5 + src/phyp/phyp_driver.c | 8 +- src/storage/storage_backend_scsi.c | 152 +++++- src/util/virstring.c | 38 ++ src/util/virstring.h | 6 + src/util/virutil.c | 549 +++++++++++++++++++++ src/util/virutil.h | 67 +++ .../pool-scsi-type-scsi-host-stable.xml | 15 + .../pool-scsi-type-scsi-host-stable.xml | 18 + tests/storagepoolxml2xmltest.c | 1 + .../ata1/host0/scsi_host/host0/unique_id | 1 + .../ata2/host1/scsi_host/host1/unique_id | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.1/device | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.1/vendor | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.2/device | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.2/vendor | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.4/device | 1 + tests/sysfs/devices/pci0000:00/0000:00:1f.4/vendor | 1 + tests/utiltest.c | 137 +++++ 22 files changed, 1076 insertions(+), 21 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-scsi-type-scsi-host-stable.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi-type-scsi-host-stable.xml create mode 100644 tests/sysfs/bus/pci/devices/0000:00:1f.2/ata1/host0/scsi_host/host0/unique_id create mode 100644 tests/sysfs/bus/pci/devices/0000:00:1f.2/ata2/host1/scsi_host/host1/unique_id create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.1/device create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.1/vendor create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.2/device create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.2/vendor create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.4/device create mode 100644 tests/sysfs/devices/pci0000:00/0000:00:1f.4/vendor -- 1.8.1.4

3 34

[libvirt] [PATCH 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 20 Jun '13

20 Jun '13

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only for Virtualbox 4.2 Regards, Manuel VIVES Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots src/conf/domain_conf.c | 20 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 129 ++++ src/util/virstring.h | 6 + src/util/viruuid.c | 79 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1831 +++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 1943 insertions(+), 125 deletions(-) -- 1.7.10.4

1 5

[libvirt] Schedule for next release 1.0.7 ?
by Daniel Veillard 20 Jun '13

20 Jun '13

If we want to release at the end of the month as usual, we should probably enter freeze next Monday or Tuesday. There is however some patch set needing review, e.g. the 'Guest Panicked' one or the big fine grained ACL feature. Dan do you think this can reasonably be merged in by next Monday ? If we get fine grained ACLs in then I would suggest to bump the release number to 1.1.0 as this is a major improvement whose possible impact at the application level is worth inticating as part of the release medium number. If not I guess we're in for 1.0.7, Opinions ? Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] ANNOUNCE: virt-manager 0.10.0 released
by Cole Robinson 20 Jun '13

20 Jun '13

I'm happy to announce the release of virt-manager 0.10.0! virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. The release can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.10.0.t… This release includes: - Merged code with python-virtinst. virtinst is no longer public - Port from GTK2 to GTK3 (Daniel Berrange, Cole Robinson) - Port from gconf to gsettings - Port from autotools to python distutils - Remove virt-manager-tui - Remove HAL support - IPv6 and static route virtual network support (Gene Czarcinski) - virt-install: Add --cpu host-passthrough (Ken ICHIKAWA, Hu Tao) To elaborate a bit on the first two: * python-virtinst has been merged with virt-manager, and the virtinst library is no longer public. This shouldn't be a surprise to anyone following development over the last year. virt-manager now distributes the virtinst tools virt-install, virt-clone, virt-image, and virt-convert. * virt-manager has been ported to GTK3 and several other modern gnome libraries. The newest version that have been tested are what is shipped with Fedora 18, so nothing less than a year old. This version may not work correctly on an older distro. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH for v1.0.4-maint 0/2] Resolve issues seen with schedinfo
by John Ferlan 20 Jun '13

20 Jun '13

This is a backport of: https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html submitted upstread as commit id 'b2375453' and '38ada092' John Ferlan (2): qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 19 ++++++++++++++++++- src/qemu/qemu_driver.c | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) -- 1.8.1.4

1 2

[libvirt] [PATCH v2 0/2] Resolve issues seen with schedinfo
by John Ferlan 20 Jun '13

20 Jun '13

These patches resolve an issue seen using 'virsh schedinfo <domain>' on a non running domain that have been present since 1.0.4 as a result of the cgroup infrastructure changes: https://www.redhat.com/archives/libvir-list/2013-April/msg00783.html The exact commit id that caused the issue is listed in each of the commit messages. I used git bisect to determine, although it was tricky because the TPM changes were made around the same time and required commit '8b934a5c' to be applied in order to actually see domains on my host. Prior to the changes the "CFS Bandwidth" data was obtained since the driver cgroup was mounted as opposed to the changes from the above set which mount cgroups when the domain is running. The result for 'virsh schedinfo <domain>' for a non running guest is to return the configuration data for default, --config, and --current options. The --live option reports a failure. For a running guest, default, --live, and --current report values from cgroup, while --config reports only the configuration values. This issue also affects the libvirt-cim code in how it defines QEMU domains. Fortunately it only looks for the "cpu_shares" value. Difference to v1: - In the [qemu|lxc]DomainGetSchedulerType() API's, rather than check for priv->cgroup, check if the domain is running and return defaults if not - In the [qemu|lxc]DomainGetSchedulerParametersFlags() API's, if we're only returning configuration data, then don't gate the result returned on the CFS bandwidth data cgroup availability. qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 1.8.1.4

3 6

[libvirt] [PATCH v4 0/7] Add qcow2 extensions support
by Ján Tomko 19 Jun '13

19 Jun '13

Since QEMU 1.1 qcow2 supports a features bitfield, allowing to implement additional features without breaking compatibility with older QEMU versions. The version header on-disk is bumped to 3, however the format name is still 'qcow2', not 'qcow3' (which is what I used in v2). v4: rebased v3: https://www.redhat.com/archives/libvir-list/2013-May/msg01179.html v2: https://www.redhat.com/archives/libvir-list/2013-February/msg00212.html qcow2 vs. qcow3 discussion: https://www.redhat.com/archives/libvir-list/2013-March/msg00094.html Ján Tomko (7): storage: rework qemu-img command line generation util: add support for qcow2v3 image detection conf: add features to volume target XML storage: add support for creating qcow2 images with extensions conf: split out snapshot disk XML formatting Add qcow2 features support to snapshots qemu: add qcow2 extension support to inactive external snapshots docs/formatsnapshot.html.in | 5 + docs/formatstorage.html.in | 19 +++ docs/schemas/Makefile.am | 1 + docs/schemas/domainsnapshot.rng | 7 + docs/schemas/storagefilefeatures.rng | 24 ++++ docs/schemas/storagevol.rng | 7 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/snapshot_conf.c | 127 ++++++++++++++---- src/conf/snapshot_conf.h | 2 + src/conf/storage_conf.c | 74 ++++++++++ src/conf/storage_conf.h | 7 +- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 72 +++++++--- src/storage/storage_backend.c | 143 +++++++++++++------- src/storage/storage_backend_fs.c | 10 ++ src/util/virstoragefile.c | 164 ++++++++++++++++++----- src/util/virstoragefile.h | 12 ++ tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 5 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 4 + tests/storagevolxml2argvdata/qcow2-1.1.argv | 1 + tests/storagevolxml2argvdata/qcow2-lazy.argv | 1 + tests/storagevolxml2argvdata/vol-qcow2-1.1.xml | 32 +++++ tests/storagevolxml2argvdata/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2argvtest.c | 2 + tests/storagevolxml2xmlin/vol-qcow2-1.1.xml | 32 +++++ tests/storagevolxml2xmlin/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 33 +++++ tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2xmltest.c | 2 + 30 files changed, 766 insertions(+), 130 deletions(-) create mode 100644 docs/schemas/storagefilefeatures.rng create mode 100644 tests/storagevolxml2argvdata/qcow2-1.1.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-lazy.argv create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-lazy.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-lazy.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-lazy.xml -- 1.8.1.5

2 14

[libvirt] [PATCH] util: switch virBufferTrim to void
by Ján Tomko 19 Jun '13

19 Jun '13

We don't care whether the trim was succesful or not anywhere except the tests. Switch it to void and set the buffer error on wrong usage. --- Patch that tried to shut Coverity up by checking the return values anyway: https://www.redhat.com/archives/libvir-list/2013-June/msg00650.html src/util/virbuffer.c | 19 ++++++++++--------- src/util/virbuffer.h | 2 +- tests/virbuftest.c | 43 ++++++++++++++++--------------------------- tools/virsh.c | 9 +++------ 4 files changed, 30 insertions(+), 43 deletions(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 693e4b2..4969497 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -660,27 +660,28 @@ virBufferStrcat(virBufferPtr buf, ...) * further limits how much of the tail is trimmed. If @str is NULL, then * @len must be non-negative. * - * Returns -1 if @buf has previously encountered an error or if @len is - * invalid, 0 if there was nothing to trim (@buf was too short or @str - * didn't match), and 1 if the trim was successful. + * Sets error to -1 (usage) if str is NULL and len is less than zero. */ -int +void virBufferTrim(virBufferPtr buf, const char *str, int len) { size_t len2 = 0; - if (!buf || buf->error || (!str && len < 0)) - return -1; + if (!buf || buf->error) + return; + if (!str && len < 0) { + virBufferSetError(buf, -1); + return; + } if (len > 0 && len > buf->use) - return 0; + return; if (str) { len2 = strlen(str); if (len2 > buf->use || memcmp(&buf->content[buf->use - len2], str, len2) != 0) - return 0; + return; } buf->use -= len < 0 ? len2 : len; buf->content[buf->use] = '\0'; - return 1; } diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index 7b69c0e..e0b77ab 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -77,6 +77,6 @@ void virBufferURIEncodeString(virBufferPtr buf, const char *str); void virBufferAdjustIndent(virBufferPtr buf, int indent); int virBufferGetIndent(const virBufferPtr buf, bool dynamic); -int virBufferTrim(virBufferPtr buf, const char *trim, int len); +void virBufferTrim(virBufferPtr buf, const char *trim, int len); #endif /* __VIR_BUFFER_H__ */ diff --git a/tests/virbuftest.c b/tests/virbuftest.c index c7a504b..3938f0d 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -148,38 +148,21 @@ static int testBufTrim(const void *data ATTRIBUTE_UNUSED) char *result = NULL; const char *expected = "a,b"; int ret = -1; - int i = 1; - -#define ACT(str, len, result) \ - do { \ - if (virBufferTrim(buf, str, len) != result) { \ - TEST_ERROR("trim %d failed", i); \ - goto cleanup; \ - } \ - i++; \ - } while (0); - - if (virBufferTrim(buf, "", 0) != -1) { - TEST_ERROR("Wrong failure detection 1"); - goto cleanup; - } + + virBufferTrim(buf, "", 0); buf = &bufinit; - if (virBufferTrim(buf, NULL, -1) != -1) { - TEST_ERROR("Wrong failure detection 2"); - goto cleanup; - } virBufferAddLit(buf, "a;"); - ACT("", 0, 1); - ACT("", -1, 1); - ACT(NULL, 1, 1); - ACT(NULL, 5, 0); - ACT("a", 2, 0); + virBufferTrim(buf, "", 0); + virBufferTrim(buf, "", -1); + virBufferTrim(buf, NULL, 1); + virBufferTrim(buf, NULL, 5); + virBufferTrim(buf, "a", 2); virBufferAddLit(buf, ",b,,"); - ACT("b", -1, 0); - ACT("b,,", 1, 1); - ACT(",", -1, 1); + virBufferTrim(buf, "b", -1); + virBufferTrim(buf, "b,,", 1); + virBufferTrim(buf, ",", -1); result = virBufferContentAndReset(buf); if (!result || STRNEQ(result, expected)) { @@ -187,6 +170,12 @@ static int testBufTrim(const void *data ATTRIBUTE_UNUSED) goto cleanup; } + virBufferTrim(buf, NULL, -1); + if (virBufferError(buf) != -1) { + TEST_ERROR("Usage error not flagged"); + goto cleanup; + } + ret = 0; cleanup: diff --git a/tools/virsh.c b/tools/virsh.c index 26d37c6..af2bb76 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -632,18 +632,15 @@ vshTreePrintInternal(vshControl *ctl, false, indent) < 0) goto cleanup; } - if (virBufferTrim(indent, " ", -1) < 0) - goto cleanup; + virBufferTrim(indent, " ", -1); /* If there was no child device, and we're the last in * a list of devices, then print another blank line */ if (nextlastdev == -1 && devid == lastdev) vshPrint(ctl, "%s\n", virBufferCurrentContent(indent)); - if (!root) { - if (virBufferTrim(indent, NULL, 2) < 0) - goto cleanup; - } + if (!root) + virBufferTrim(indent, NULL, 2); ret = 0; cleanup: return ret; -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: set QEMU_CAPS_DEVICE_VIDEO_PRIMARY cap flag in QMP detection
by Guannan Ren 19 Jun '13

19 Jun '13

When qemu >= 1.20, it is safe to use -device for primary video device as described in 4c993d8ab. So, we are missing the cap flag in QMP capabilities detection, this flag can be initialized safely in virQEMUCapsInitQMPBasic. --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1091a07..406dca9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2418,6 +2418,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); } /* Capabilities that are architecture depending -- 1.8.1.4

2 2

[libvirt] [PATCH] check return values of virBufferTrim
by Ján Tomko 19 Jun '13

19 Jun '13

Just to silence Coverity: Event check_return: Calling function "virBufferTrim(virBufferPtr, char const *, int)" without checking return value (as is done elsewhere 5 out of 6 times). --- src/node_device/node_device_udev.c | 5 ++--- src/rpc/virnetsshsession.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index bb58415..a37989a 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -370,9 +370,8 @@ udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, const char *format = NULL; virBufferAdd(&buf, fmt, -1); - virBufferTrim(&buf, "\n", -1); - - format = virBufferContentAndReset(&buf); + if (virBufferTrim(&buf, "\n", -1) >= 0) + format = virBufferContentAndReset(&buf); virLogVMessage(VIR_LOG_FROM_LIBRARY, virLogPriorityFromSyslog(priority), diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index b6aedc8..2299871 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -362,9 +362,8 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) * we have to use a *MAGIC* constant. */ for (i = 0; i < 16; i++) virBufferAsprintf(&buff, "%02hhX:", keyhash[i]); - virBufferTrim(&buff, ":", 1); - if (virBufferError(&buff) != 0) { + if (virBufferTrim(&buff, ":", 1) < 0) { virReportOOMError(); return -1; } -- 1.8.1.5

3 4

[libvirt] Not able to open Xen Connection using libvirt
by varun bhatnagar 19 Jun '13

19 Jun '13

Hi, I am trying to create virtual machine through libvirt using xen hypervisor. I was able to install xen successfully but when I tried connecting to the hypervisor it gave an error. And while installing libvirt (libvirt-1.0.1) I installed it with xen support. I am pasting the snapshot of the error below: [image: Inline image 1] Can anyone tell me why I am getting this error? // Varun

1 0

[libvirt] [PATCH 0/2] Don't always fail migrations on I/O errors
by Peter Krempa 18 Jun '13

18 Jun '13

Recently I've added code that aborts migration in case of I/O error. This may not be desirable as qemu does actually support such migration. This series adds a flag that enables this option that will be now disabled by default. Peter Krempa (2): migration: Make erroring out on I/O error controllable by flag migration: Don't propagate VIR_MIGRATE_ABORT_ON_ERROR include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 17 +++++++++++------ src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 39 ++++++++++++++++++++++++--------------- src/qemu/qemu_migration.h | 6 ++++-- tools/virsh-domain.c | 7 +++++++ tools/virsh.pod | 6 ++++-- 7 files changed, 53 insertions(+), 27 deletions(-) -- 1.8.2.1

3 4

[libvirt] [PATCH] qemu: Avoid leaking uri in qemuMigrationPrepareDirect
by Jiri Denemark 18 Jun '13

18 Jun '13

--- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 48e0d44..68c9cc5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2367,7 +2367,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *p; char *uri_str = NULL; int ret = -1; - virURIPtr uri; + virURIPtr uri = NULL; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2472,6 +2472,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cookieout, cookieoutlen, def, NULL, this_port, flags); cleanup: + virURIFree(uri); VIR_FREE(hostname); if (ret != 0) VIR_FREE(*uri_out); -- 1.8.2.1

2 2

[libvirt] [PATCH 1/2 v3] json: add stream parser
by Dmitry Guryanov 18 Jun '13

18 Jun '13

Add function virJSONValueFromStream, which reads data from a stream and passes it to json parser. When end of the object is reached, it returns this object. To avoid reading from the stream by single bytes it reads to a buffer (in a structure virJSONStreamParserState), which should be passed to a consequent call of this function. So if the end of one object and the beginning of the next object have been read by a single system call - virJSONValueFromStream handle it correctly. example of usage: virJSONValuePtr v; virJSONStreamParserState state; memset(&state, 0, sizeof(state)); while (1) { v = virJSONValueFromStream(mon->fd, &state); if (v == (void *)-1) /* error */ break; if (v == NULL) /* file descriptor has been closed */ break; /* handle object 'v' */ } I need such function for the parallels driver. It caches info about domains and needs some mechanism to update this cache. There is a "prlsrvctl monitor" command which waits for events forever and prints info about events to stdout in json format. So parallels driver could start separate thread which will read from prlsrvctl's stdout and update cache accordingly. There is the same task in qemu_monitor_json, but each json object is printed in a separate line there. It's not possible in my case, because some fields could have line endings. --- src/libvirt_private.syms | 1 + src/util/virjson.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virjson.h | 8 +++ 3 files changed, 119 insertions(+), 0 deletions(-) * This patch left unchanged since v2 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b449293..0db2a0d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1391,6 +1391,7 @@ virJSONValueArrayGet; virJSONValueArraySize; virJSONValueFree; virJSONValueFromString; +virJSONValueFromStream; virJSONValueGetBoolean; virJSONValueGetNumberDouble; virJSONValueGetNumberInt; diff --git a/src/util/virjson.c b/src/util/virjson.c index 3a6f520..9559a26 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1022,6 +1022,116 @@ cleanup: return ret; } +/* + * Read single JSON object from the stream. Store data, which + * have already been read from the stream, but belongs to the + * next object to the virJSONStreamParserState structure. So that + * consequent call to this function will parse it and return that + * object. + * + * @fd: file descriptor, opened for reading + * @state: pointer to the structure with buffer for data, read from fd. + * + * Return (void *)-1 in case of error, NULL when eof reached, + * pointer to the virJSONValuePtr in case of success. + */ + +virJSONValuePtr virJSONValueFromStream(int fd, virJSONStreamParserStatePtr state) +{ + yajl_handle hand; + virJSONParser parser = { NULL, NULL, 0 }; + virJSONValuePtr value = (void *)-1; +# ifndef WITH_YAJL2 + yajl_parser_config cfg = { 1, 1 }; +# endif + ssize_t len; + int ret = 0; + bool done = false; + +# ifdef WITH_YAJL2 + hand = yajl_alloc(&parserCallbacks, NULL, &parser); + if (hand) { + yajl_config(hand, yajl_allow_comments, 1); + yajl_config(hand, yajl_dont_validate_strings, 0); + yajl_config(hand, yajl_allow_trailing_garbage, 1); + } +# else + hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); +# endif + if (!hand) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to create JSON parser")); + goto cleanup; + } + + do { + if (strlen(&state->buf[state->pos]) == 0) { + state->pos = 0; + memset(state->buf, 0, sizeof(state->buf)); + len = read(fd, state->buf, sizeof(state->buf) - 1); + + if (len < 0) { + virReportSystemError(errno, _("cannot read from fd '%d'"), fd); + virJSONValueFree(parser.head); + goto cleanup; + } + + if (len == 0) { + value = parser.head; + goto cleanup; + } + } + + for (;state->pos < strlen(state->buf); state->pos++) { + unsigned char *buf = (unsigned char *)&state->buf[state->pos]; + /* + * New yaml library has useful function yajl_get_bytes_consumed + * which allows parsing by larger chunks. But rhel-6 has 1.0.7 + * version, which doesn't have it. + */ + ret = yajl_parse(hand, buf, 1); +# ifdef WITH_YAJL2 + if (ret == 0 && yajl_get_bytes_consumed(hand) == 0) { + done = true; + /* state->pos points to the first symbol after current + * object */ + break; + } else if (ret != 0) { +# else + if (ret == 0) { + done = true; + /* state->pos points to the last symbol of the + * current object */ + state->pos++; + break; + } else if (ret != yajl_status_insufficient_data) { +# endif + unsigned char *errstr = yajl_get_error(hand, 1, buf, 1); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse json: %s"), + (const char*) errstr); + VIR_FREE(errstr); + virJSONValueFree(parser.head); + goto cleanup; + } + } + } while (!done); + + value = parser.head; + +cleanup: + yajl_free(hand); + + if (parser.nstate) { + int i; + for (i = 0 ; i < parser.nstate ; i++) { + VIR_FREE(parser.state[i].key); + } + } + + VIR_DEBUG("result=%p", parser.head); + return value; +} static int virJSONValueToStringOne(virJSONValuePtr object, yajl_gen g) diff --git a/src/util/virjson.h b/src/util/virjson.h index db11396..1f5ce38 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -48,6 +48,8 @@ typedef virJSONObjectPair *virJSONObjectPairPtr; typedef struct _virJSONArray virJSONArray; typedef virJSONArray *virJSONArrayPtr; +typedef struct _virJSONStreamParserState virJSONStreamParserState; +typedef virJSONStreamParserState *virJSONStreamParserStatePtr; struct _virJSONObjectPair { char *key; @@ -77,6 +79,11 @@ struct _virJSONValue { } data; }; +struct _virJSONStreamParserState { + char buf[1024]; + size_t pos; +}; + void virJSONValueFree(virJSONValuePtr value); virJSONValuePtr virJSONValueNewString(const char *data); @@ -138,5 +145,6 @@ int virJSONValueObjectRemoveKey(virJSONValuePtr object, const char *key, virJSONValuePtr virJSONValueFromString(const char *jsonstring); char *virJSONValueToString(virJSONValuePtr object, bool pretty); +virJSONValuePtr virJSONValueFromStream(int fd, virJSONStreamParserStatePtr state); #endif /* __VIR_JSON_H_ */ -- 1.7.1

1 1

[libvirt] [PATCH] qemu_migration: Move waiting for SPICE migration
by Michal Privoznik 18 Jun '13

18 Jun '13

Currently, we wait for SPICE to migrate in the very same loop where we wait for qemu to migrate. This has a disadvantage of slowing seamless migration down. One one hand, we should not kill the domain until all SPICE data has been migrated. On the other hand, there is no need to wait in the very same loop and hence slowing down 'cont' on the destination. For instance, if users are watching a movie, they can experience the movie to be stopped for a couple of seconds, as processors are not running nor on src nor on dst as libvirt waits for SPICE to migrate. We should move the waiting phase to migration CONFIRM phase. --- src/qemu/qemu_migration.c | 57 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ca79bc2..1d65df5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1582,6 +1582,40 @@ cleanup: return ret; } +static int +qemuMigrationWaitForSpice(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + bool wait_for_spice = false; + bool spice_migrated = false; + + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) + wait_for_spice = true; + + if (!wait_for_spice) + return 0; + + while (!spice_migrated) { + /* Poll every 50ms for progress & to allow cancellation */ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorGetSpiceMigrationStatus(priv->mon, + &spice_migrated) < 0) { + qemuDomainObjExitMonitor(driver, vm); + return -1; + } + qemuDomainObjExitMonitor(driver, vm); + virObjectUnlock(vm); + nanosleep(&ts, NULL); + virObjectLock(vm); + } + + return 0; +} static int qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, @@ -1591,19 +1625,10 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; - bool wait_for_spice = false; - bool spice_migrated = false; qemuMonitorMigrationStatus status; memset(&status, 0, sizeof(status)); - /* If guest uses SPICE and supports seamles_migration we have to hold up - * migration finish until SPICE server transfers its data */ - if (vm->def->ngraphics == 1 && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) - wait_for_spice = true; - ret = qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob); if (ret < 0) { /* Guest already exited; nothing further to update. */ @@ -1611,13 +1636,6 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, } ret = qemuMonitorGetMigrationStatus(priv->mon, &status); - /* If qemu says migrated, check spice */ - if (wait_for_spice && - ret == 0 && - status.status == QEMU_MONITOR_MIGRATION_STATUS_COMPLETED) - ret = qemuMonitorGetSpiceMigrationStatus(priv->mon, - &spice_migrated); - qemuDomainObjExitMonitor(driver, vm); priv->job.status = status; @@ -1657,8 +1675,7 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, break; case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED: - if ((wait_for_spice && spice_migrated) || (!wait_for_spice)) - priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; + priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; ret = 0; break; @@ -4121,6 +4138,10 @@ int qemuMigrationConfirm(virQEMUDriverPtr driver, * domain object, but if no, resume CPUs */ if (retcode == 0) { + /* If guest uses SPICE and supports seamless migration we have to hold + * up domain shutdown until SPICE server transfers its data */ + qemuMigrationWaitForSpice(driver, vm); + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, VIR_QEMU_PROCESS_STOP_MIGRATED); virDomainAuditStop(vm, "migrated"); -- 1.8.1.5

2 2

[libvirt] [PATCH 0/6] Enumerate scsi generic device
by Osier Yang 18 Jun '13

18 Jun '13

The scsi generic device is listed as a child of the parent of the mapped disk device. E.g. +- pci_0000_00_1f_2 | | | +- scsi_host0 | | | | | +- scsi_target0_0_0 | | | | | +- scsi_0_0_0_0 | | | | | +- block_sda_TOSHIBA_MK5061GSY_9243PG8CT | | +- scsi_generic_sg0 This is consistent with the sysfs/udev. The XML produced by udev backend: <device> <name>scsi_generic_sg0</name> <path>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/scsi_generic/sg0</path> <parent>scsi_0_0_0_0</parent> <capability type='scsi_generic'> <char>/dev/sg0</char> </capability> </device> The XML produced by HAL backend: <device> <name>pci_8086_2922_scsi_host_scsi_device_lun0_scsi_generic</name> <path>/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/scsi_generic/sg0</path> <parent>pci_8086_2922_scsi_host_scsi_device_lun0</parent> <capability type='scsi_generic'> <char>/dev/sg0</char> </capability> </device> Osier Yang (6): nodedev: Expose sysfs path of device nodedev_udev: Refactor udevGetDeviceType nodedev_udev: Enumerate scsi generic device nodedev_hal: Enumerate scsi generic device nodedev: Support SCSI_GENERIC cap flag for listAllNodeDevices virsh: Support SCSI_GENERIC cap flag for nodedev-list include/libvirt/libvirt.h.in | 1 + src/conf/node_device_conf.c | 11 ++- src/conf/node_device_conf.h | 8 ++- src/node_device/node_device_hal.c | 9 +++ src/node_device/node_device_udev.c | 137 ++++++++++++++++++++----------------- tools/virsh-nodedev.c | 3 + tools/virsh.pod | 6 +- 7 files changed, 105 insertions(+), 70 deletions(-) -- 1.8.1.4

2 17

[libvirt] a problem about the progress's display of migration with non-shared storage
by Liuji (Jeremy) 18 Jun '13

18 Jun '13

Hi all, I found a problem about the progress's display of migration with non-shared storage. In the commit: 7b7600b3e6734117b3db39ba5c31ae33a40fb5bb (qemu_migration: Introduce qemuMigrationDriveMirror), it use drive mirror instead of block migration. And after the driver mirror, then process the VM migration(no block). But only in the VM migration stage, libvirt set the progress of migration(in qemuMigrationWaitForCompletion). In the drive mirror stage, libvirt is waiting the completion of drive mirror, and don't set the progress of migration. So, the libvirt can't display the progress of migration in the drive mirror stage. For users, they are not concerned about the implementation details of the two stages. They think the two stages are both migration. So, I think libvirt need consider the progress of drive mirror for migration. But I don't have a good solution. Any idea about this problem? Thanks for advance Regards

2 1

[libvirt] [PATCH 0/6] Support to use iscsi storage in domain conf
by Osier Yang 18 Jun '13

18 Jun '13

This supports to use libvirt iscsi storage volume for qemu with either the LUN's path on host (e.g. /dev/disk/by-path/*-lun-1), or the the libiscsi uri (e.g iscsi://demo.org:6000/$iqn/1)in domain conf. Osier Yang (6): storage_iscsi: Reflect the default target port conf: Introduce new XML tag "mode" for disk source qemu: Translate the iscsi pool/volume disk source security: Ignore to manage the volume type disk if its mode is uri conf: Ignore the volume type disk if its mode is "uri" qemu: Translate the volume type disk source before cgroup setting docs/formatdomain.html.in | 9 ++- docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 71 +++++++++++++++++++++- src/conf/domain_conf.h | 25 ++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 20 ++++-- src/qemu/qemu_conf.c | 117 +++++++++++++++++++++++++++++------- src/qemu/qemu_process.c | 13 ++-- src/security/security_apparmor.c | 10 ++- src/security/security_dac.c | 10 ++- src/security/security_selinux.c | 10 ++- src/storage/storage_backend_iscsi.c | 6 +- tests/qemuxml2xmltest.c | 1 + 13 files changed, 261 insertions(+), 40 deletions(-) -- 1.8.1.4

1 6

[libvirt] [PATCH] Move virGetUserEnt() to where its needed
by Doug Goldstein 17 Jun '13

17 Jun '13

In the first if case, virGetUserEnt() isn't necessary so don't bother calling it before determining we need it. --- Found this trying to get libvirtd running happily on my Mac OS X machine for qemu. Unfortunately it appears virGetUserEnt() is always failing on Mac OS X (getpwuid_r() returns 0 each time) because we are requesting info on a different high value UIDs each time (32xxx). That's another issue entirely but this fix allows me to ignore that and test other fixes on my Mac. --- src/util/virutil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index c5246bc..6fa0212e 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -759,12 +759,13 @@ static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir) { const char *path = getenv(xdgenvname); char *ret = NULL; - char *home = virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY); + char *home = NULL; if (path && path[0]) { if (virAsprintf(&ret, "%s/libvirt", path) < 0) goto no_memory; } else { + home = virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY); if (virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir) < 0) goto no_memory; } -- 1.8.1.5

2 1

[libvirt] Unable to setup qemu-guest-agent
by Nehal J. Wani 17 Jun '13

17 Jun '13

Could anyone please list out the steps required to run the command $virsh qemu-agent-command Steps that I followed: 1. Clone the latest source code of libvirt 2. Create a vm of f18 (source:liveCD) 3. Edit f18 domain xml and add this: <channel type='unix'> <source mode='bind' path='/var/lib/libvirt/qemu/f16x86_64.agent'/> <target type='virtio' name='org.qemu.guest_agent.0'/> </channel> 4. On host: #./tools/virsh start f18 5. On guest: #yum install qemu-guest-agent -y 6. On host: # ./tools/virsh qemu-agent-command f18 '{"execute":"guest-network-get-interfaces"}' Expected Response: {"return":[{"name":"lo","ip- addresses":[{"ip-address-type":"ipv4","ip-address":"127.0.0.1","prefix":8},{"ip-address-type":"ipv6","ip-address":"::1","prefix":128}],"hardware-address":"00:00:00:00:00:00"},{"name":"eth0","ip-addresses":[{"ip-address-type":"ipv4","ip-address":"192.168.122.62","prefix":24},{"ip-address-type":"ipv6","ip-address":"fe80::5054:ff:fe14:9998","prefix":64}],"hardware-address":"52:54:00:14:99:98"}]} Actual result: error: unknown procedure: 3 Where am I going wrong? -- Nehal J. Wani UG2, BTech CS+MS(CL) IIIT-Hyderabad http://commanlinewani.blogspot.com

3 4

[libvirt] [PATCH 0/2] Support setting the 'removable' flag for USB disks
by Fred A. Kemp 17 Jun '13

17 Jun '13

From: "Fred A. Kemp" <anonym(a)lavabit.com> For reference, my first attempt at a patch for this feature was: <1363682454-32012-1-git-send-email-anonym(a)lavabit.com> I believe this patch fixes all previous concerns raised that thread. However, note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 23 +++++++++++++-- tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

2 3

[libvirt] [RFC] conf: Order of AddImplicitControllers and DomainDefPostParse
by Viktor Mihajlovski 17 Jun '13

17 Jun '13

Implicit controllers may be dependent on device definitions altered in a post-parse callback. E.g., if a console device is defined without the target type, the type will be set in QEMU's callback. In the case of s390, this is virtio, which requires an implicit virtio-serial controller. By moving the implicit controller definition after the post-parse procssing this can be fixed. OTOH the implicit controllers might need post-parse actions as well, although I am currentyl not aware of one. What would speak against swapping the order as suggested in the patch below? Feedback welcome. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 8 ++++---- .../qemuxml2xmlout-balloon-device-auto.xml | 2 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 2 +- .../qemuxml2xmlout-console-virtio.xml | 2 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 29d6edc..ef1f876 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12062,14 +12062,14 @@ virDomainDefParseXML(xmlDocPtr xml, (def->ns.parse)(xml, root, ctxt, &def->namespaceData) < 0) goto error; - /* Auto-add any implied controllers which aren't present */ - if (virDomainDefAddImplicitControllers(def) < 0) - goto error; - /* callback to fill driver specific domain aspects */ if (virDomainDefPostParse(def, caps, xmlopt) < 0) goto error; + /* Auto-add any implied controllers which aren't present */ + if (virDomainDefAddImplicitControllers(def) < 0) + goto error; + virHashFree(bootHash); return def; diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml index 6aed326..380b70f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml @@ -20,8 +20,8 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'/> - <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index 0175272..fd6b852 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -25,8 +25,8 @@ <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> - <controller type='virtio-serial' index='2'/> <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='2'/> <channel type='pty'> <target type='virtio' name='org.linux-kvm.port.0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index 3c865c3..340430e 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -21,8 +21,8 @@ </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> - <controller type='virtio-serial' index='0'/> <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'/> <console type='pty'> <target type='virtio' port='0'/> </console> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml index 7d152bc..5ec1e94 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml @@ -26,8 +26,8 @@ </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> - <controller type='scsi' index='0'/> <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0'/> <memballoon model='virtio'/> </devices> </domain> -- 1.7.9.5

2 1

[libvirt] libvirtd 1.0.6 refuses to start
by Franky Van Liedekerke 17 Jun '13

17 Jun '13

I just downloaded and compiled libvirtd on the same server as I did 1.0.4. Upon updating, libvirtd refuses to start, with this in the logfile (obfuscated the hostname by xxx's): 2013-06-11 13:43:49.154+0000: 3336: info : libvirt version: 1.0.6, package: 1.el6 (Unknown, 2013-06-06-14:57:07, xxxxxxxx) 2013-06-11 13:43:49.154+0000: 3336: error : virFileReadAll:1195 : Failed to open file '/sys/class/fc_host//host0/max_npiv_vports': No such file or directory 2013-06-11 13:43:49.159+0000: 3336: error : detect_scsi_host_caps:87 : Failed to read max_npiv_vports for host1 2013-06-11 13:43:49.163+0000: 3336: error : virFileReadAll:1195 : Failed to open file '/sys/class/fc_host//host0/max_npiv_vports': No such file or directory 2013-06-11 13:43:49.163+0000: 3336: error : detect_scsi_host_caps:87 : Failed to read max_npiv_vports for host2 2013-06-11 13:43:49.386+0000: 3336: error : virLockManagerPluginNew:175 : Failed to load plugin /usr/lib64/libvirt/lock-driver/lockd.so: /usr/lib64/libvirt/lock-driver/lockd.so: undefined symbol: virProcessGetStartTime 2013-06-11 13:43:49.386+0000: 3336: error : virStateInitialize:831 : Initialization of QEMU state driver failed 2013-06-11 13:43:49.386+0000: 3336: error : daemonRunStateInit:887 : Driver state initialization failed So it seems two issues are present here: 1) it searches for /sys/class/fc_host//host0/max_npiv_vports for both host1 and host2. Imho this path needs to be /sys/class/fc_host//host1/max_npiv_vports and /sys/class/fc_host//host2/max_npiv_vports respectively. 2) the undefined symbol problem: seems a linking issue, no? The build worked just fine on rhel6 with all patches applied. For now I reverted back to 1.0.4. Hope this helps to debug :-) Also: I created a bug report for 1.0.4/1.0.6 concerning the init scripts: https://bugzilla.redhat.com/show_bug.cgi?id=971408 Part of it (the virtlock socket) seems to be in the latest code already, but I believe the other issues mentioned are valid as well. With friendly regards, Franky

4 4

[libvirt] [PATCH v2] udev: fix crash in libudev logging
by Ján Tomko 15 Jun '13

15 Jun '13

Call virLogVMessage instead of virLogMessage, since libudev called us with a va_list object, not a list of arguments. Honor message priority and strip the trailing newline. https://bugzilla.redhat.com/show_bug.cgi?id=969152 --- v1: https://www.redhat.com/archives/libvir-list/2013-June/msg00349.html v2: don't ignore priority and strip the trailing newline. src/libvirt_private.syms | 2 ++ src/node_device/node_device_udev.c | 42 ++++++++++++++++++++++++++++++-------- src/util/virlog.c | 25 +++++++++++++++++++++++ src/util/virlog.h | 1 + 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 042081f..ee517c1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1480,12 +1480,14 @@ virLogMessage; virLogParseDefaultPriority; virLogParseFilters; virLogParseOutputs; +virLogPriorityFromSyslog; virLogProbablyLogMessage; virLogReset; virLogSetBufferSize; virLogSetDefaultPriority; virLogSetFromEnv; virLogUnlock; +virLogVMessage; # util/virmacaddr.h diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 620cd58..b462549 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -348,15 +348,38 @@ static int udevGenerateDeviceName(struct udev_device *device, } -static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, - int priority ATTRIBUTE_UNUSED, - const char *file, - int line, - const char *fn, - const char *fmt, - va_list args) +typedef void (*udevLogFunctionPtr)(struct udev *udev, + int priority, + const char *file, + int line, + const char *fn, + const char *format, + va_list args); + +static void +ATTRIBUTE_FMT_PRINTF(6,0) +udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) { - VIR_ERROR_INT(VIR_LOG_FROM_LIBRARY, file, line, fn, fmt, args); + virBuffer buf = VIR_BUFFER_INITIALIZER; + const char *format = NULL; + + virBufferAdd(&buf, fmt, -1); + virBufferTrim(&buf, "\n", -1); + + format = virBufferContentAndReset(&buf); + + if (format) + virLogVMessage(VIR_LOG_FROM_LIBRARY, + virLogPriorityFromSyslog(priority), + file, line, fn, NULL, format, args); + + VIR_FREE(format); } @@ -1672,7 +1695,8 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, * its return value. */ udev = udev_new(); - udev_set_log_fn(udev, udevLogFunction); + /* cast to get rid of missing-format-attribute warning */ + udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction); priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (priv->udev_monitor == NULL) { diff --git a/src/util/virlog.c b/src/util/virlog.c index 739a274..064f8e8 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1264,6 +1264,31 @@ static int virLogAddOutputToJournald(int priority) return 0; } # endif /* USE_JOURNALD */ + +int virLogPriorityFromSyslog(int priority) +{ + switch (priority) { + case LOG_EMERG: + case LOG_ALERT: + case LOG_CRIT: + case LOG_ERR: + return VIR_LOG_ERROR; + case LOG_WARNING: + case LOG_NOTICE: + return VIR_LOG_WARN; + case LOG_INFO: + return VIR_LOG_INFO; + case LOG_DEBUG: + return VIR_LOG_DEBUG; + } + return VIR_LOG_ERROR; +} + +#else /* HAVE_SYSLOG_H */ +int virLogPriorityFromSyslog(int priority ATTRIBUTE_UNUSED) +{ + return VIR_LOG_ERROR; +} #endif /* HAVE_SYSLOG_H */ #define IS_SPACE(cur) \ diff --git a/src/util/virlog.h b/src/util/virlog.h index 6b83245..7db1657 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -171,6 +171,7 @@ extern int virLogReset(void); extern int virLogParseDefaultPriority(const char *priority); extern int virLogParseFilters(const char *filters); extern int virLogParseOutputs(const char *output); +extern int virLogPriorityFromSyslog(int priority); extern void virLogMessage(virLogSource src, virLogPriority priority, const char *filename, -- 1.8.1.5

4 4

[libvirt] [PATCH v4 0/3] BSD implementation of virNetDevTapCreate() and virNetDevTapDelete()
by Roman Bogorodskiy 14 Jun '13

14 Jun '13

Changes from v3: * Include linux/if.h header fix so it won't lost why Eric is on vacation * Fix struct virIfreq definition in case when HAVE_STRUCT_IFREQ is not defined (thanks to Laine Stump for noticing that) Roman Bogorodskiy (3): Make virNetDevSetupControl() public. BSD: implement virNetDevTapCreate() and virNetDevTapDelete() portability: use net/if.h instead of linux/if.h src/libvirt_private.syms | 1 + src/util/virnetdev.c | 15 ++++- src/util/virnetdev.h | 15 ++++- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevtap.c | 118 ++++++++++++++++++++++++++++++++++++++- src/util/virnetdevvportprofile.c | 2 +- 6 files changed, 146 insertions(+), 7 deletions(-) -- 1.7.11.5

2 5

[libvirt] [libvirt-php PATCH 0/2] Block job wrappers and possibility to start VM in paused state
by Tiziano Müller 14 Jun '13

14 Jun '13

Following are two patches extending the PHP wrapper a bit: * first patch adds wrappers for virDomainGetBlockJobInfo and virDomainBlockPull * second patch makes it possible to start a VM in paused state to start a Qemu-process for the virDomainBlockPull if no VM is running Best, Tiziano Tiziano Müller (2): Add wrappers for virDomainGetBlockJobInfo and virDomainBlockPull. Add optional flags parameter to domain_create src/libvirt-php.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/libvirt-php.h | 2 ++ 2 files changed, 89 insertions(+), 4 deletions(-) -- 1.8.2.1

1 2

[libvirt] KVM Forum 2013 Call for Participation
by KVM-Forum-2013-PC＠redhat.com 14 Jun '13

14 Jun '13

================================================================= KVM Forum 2013: Call For Participation October 21-23, 2013 - Edinburgh International Conference Centre - Edinburgh, UK (All submissions must be received before midnight July 21, 2013) ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. The oVirt Workshop will run in parallel with the KVM Forum again, bringing in a community focused on enterprise datacenter virtualization management built on KVM. For topics which overlap we will have shared sessions. So mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ Once again we are colocated with The Linux Foundation's LinuxCon Europe. KVM Forum attendees will be able to attend oVirt Workshop sessions and are eligible to attend LinuxCon Europe for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2013. http://events.linuxfoundation.org/cfp Suggested topics: KVM/Kernel - Scaling and performance - Nested virtualization - I/O improvements - VFIO, device assignment, SR-IOV - Driver domains - Time keeping - Resource management (cpu, memory, i/o) - Memory management (page sharing, swapping, huge pages, etc) - Network virtualization - Security - Architecture ports QEMU - Device model improvements - New devices and chipsets - Scaling and performance - Desktop virtualization - Spice - Increasing robustness and hardening - Security model - Management interfaces - QMP protocol and implementation - Image formats - Firmware (SeaBIOS, OVMF, UEFI, etc) - Live migration - Live snapshots and merging - Fault tolerance, high availability, continuous backup - Real-time guest support Virtio - Speeding up existing devices - Alternatives - Virtio on non-Linux or non-virtualized Management infrastructure - oVirt (shared track w/ oVirt Workshop) - Libvirt - KVM autotest - OpenStack - Network virtualization management - Enterprise storage management Cloud computing - Scalable storage - Virtual networking - Security - Provisioning SUBMISSION REQUIREMENTS Abstracts due: July 21, 2013 Notification: August 1, 2013 Please submit a short abstract (~150 words) describing your presentation proposal. In your submission please note how long your talk will take. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk - birds of a feather (BOF) session Submit your proposal here: http://events.linuxfoundation.org/cfp You will receive a notification whether or not your presentation proposal was accepted by Aug 1st. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user collaboration proposal. As an end user, this is a unique opportunity to get your input to developers. BOF SESSION We will reserve some slots in the evening after the main conference tracks, for birds of a feather (BOF) sessions. These sessions will be less formal than presentation tracks and targetted for people who would like to discuss specific issues with other developers and/or users. If you are interested in getting developers and/or uses together to discuss a specific problem, please submit a BOF proposal. HOTEL / TRAVEL The KVM Forum 2013 will be held in Edinburgh, UK at the Edinburgh International Conference Centre. http://events.linuxfoundation.org/events/kvm-forum/hotel Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2013 in October! Thanks, -your KVM Forum 2013 Program Committee Please contact us with any questions or comments. KVM-Forum-2013-PC(a)redhat.com

1 0

[libvirt] VM waiting to start long time
by Cuongds 14 Jun '13

14 Jun '13

Hi all, I'm have problem with my ovirt. Yesterday, my ovirt nodes (4 nodes) still working fine but today i cannot start vm on one of ovirt nodes (node 2), other node are fine. The status holding "waiting to start" when i try start vm (new or old vm has same result) Log vdsm as below: Many attempting connect to vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:57,563::guestIF::95::vm.Vm:: (_connect) vmId=`ffd60b1c-9a3c-4853-88aa-7973f9756c96`::Attempting connection to /var/lib/libvirt/qemu/channels/4000570- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:58,565::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 32. VM Channels Listener::DEBUG::2013-06-14 17:00:58,565::guestIF::95::vm.Vm:: (_connect) vmId=`187f61c9-d81f-491a-b5f0-4798ec6c8342`::Attempting connection to /var/lib/libvirt/qemu/channels/4000565- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:58,565::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 33. VM Channels Listener::DEBUG::2013-06-14 17:00:58,565::guestIF::95::vm.Vm:: (_connect) vmId=`6c3074ae-c752-4622-94e7-a4ca09b252f7`::Attempting connection to /var/lib/libvirt/qemu/channels/4000563- 02.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:58,565::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 35. VM Channels Listener::DEBUG::2013-06-14 17:00:58,566::guestIF::95::vm.Vm:: (_connect) vmId=`20f144cd-f027-4710-a433-dcdc62eec554`::Attempting connection to /var/lib/libvirt/qemu/channels/4000568- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:58,566::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 37. VM Channels Listener::DEBUG::2013-06-14 17:00:58,566::guestIF::95::vm.Vm:: (_connect) vmId=`ffd60b1c-9a3c-4853-88aa-7973f9756c96`::Attempting connection to /var/lib/libvirt/qemu/channels/4000570- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:59,567::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 32. VM Channels Listener::DEBUG::2013-06-14 17:00:59,567::guestIF::95::vm.Vm:: (_connect) vmId=`187f61c9-d81f-491a-b5f0-4798ec6c8342`::Attempting connection to /var/lib/libvirt/qemu/channels/4000565- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:59,567::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 33. VM Channels Listener::DEBUG::2013-06-14 17:00:59,568::guestIF::95::vm.Vm:: (_connect) vmId=`6c3074ae-c752-4622-94e7-a4ca09b252f7`::Attempting connection to /var/lib/libvirt/qemu/channels/4000563- 02.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:59,568::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 35. VM Channels Listener::DEBUG::2013-06-14 17:00:59,568::guestIF::95::vm.Vm:: (_connect) vmId=`20f144cd-f027-4710-a433-dcdc62eec554`::Attempting connection to /var/lib/libvirt/qemu/channels/4000568- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:00:59,568::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 37. VM Channels Listener::DEBUG::2013-06-14 17:00:59,569::guestIF::95::vm.Vm:: (_connect) vmId=`ffd60b1c-9a3c-4853-88aa-7973f9756c96`::Attempting connection to /var/lib/libvirt/qemu/channels/4000570- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:01:00,569::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 32. VM Channels Listener::DEBUG::2013-06-14 17:01:00,569::guestIF::95::vm.Vm:: (_connect) vmId=`187f61c9-d81f-491a-b5f0-4798ec6c8342`::Attempting connection to /var/lib/libvirt/qemu/channels/4000565- 01.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:01:00,570::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 33. VM Channels Listener::DEBUG::2013-06-14 17:01:00,570::guestIF::95::vm.Vm:: (_connect) vmId=`6c3074ae-c752-4622-94e7-a4ca09b252f7`::Attempting connection to /var/lib/libvirt/qemu/channels/4000563- 02.com.redhat.rhevm.vdsm VM Channels Listener::DEBUG::2013-06-14 17:01:00,570::vmChannels::104::vds:: (_handle_unconnected) Trying to connect fileno 35. VM Channels Listener::DEBUG::2013-06-14 17:01:00,570::guestIF::95::vm.Vm:: (_connect) vmId=`20f144cd-f027-4710-a433-dcdc62eec554`::Attempting connection to /var/lib/libvirt/qemu/channels/4000568- 01.com.redhat.rhevm.vdsm On ovirt portal, the status of node 2 not update, when i tried to start new vm the number vm increase but when i stop vm or even delete them, this number vm's still skip Please help me debug this, sorry about my bad E. Thanks,

1 0

[libvirt] [PATCH] LXC: s/chroot/chdir in lxcContainerPivotRoot()
by Richard Weinberger 14 Jun '13

14 Jun '13

...fixes a trivial copy&paste error. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7531fea..c4056c3 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -653,11 +653,11 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } } - /* Now we chroot into the tmpfs, then pivot into the + /* Now we chdir into the tmpfs, then pivot into the * root->src bind-mounted onto '/new' */ if (chdir(newroot) < 0) { virReportSystemError(errno, - _("Failed to chroot into %s"), newroot); + _("Failed to chdir into %s"), newroot); goto err; } -- 1.8.1.4

2 1

[libvirt] [PATCH] remote: Fix client crash when URI path is empty when using ssh
by Peter Krempa 14 Jun '13

14 Jun '13

The parsed path in the URI may be NULL resulting into: $ virsh -c qemu+ssh:// list Segmentation fault (core dumped) Introduced by 22d81ceb46ea4b83ad817c29b2b04df27a09c671 --- src/remote/remote_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bd5646a..87c61f4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -633,7 +633,7 @@ doRemoteOpen(virConnectPtr conn, case trans_libssh2: if (!sockname) { /* Right now we don't support default session connections */ - if (STREQ(conn->uri->path, "/session")) { + if (STREQ_NULLABLE(conn->uri->path, "/session")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Connecting to session instance without " "socket path is not supported by the libssh2 " @@ -710,7 +710,7 @@ doRemoteOpen(virConnectPtr conn, if (!sockname) { /* Right now we don't support default session connections */ - if (STREQ(conn->uri->path, "/session")) { + if (STREQ_NULLABLE(conn->uri->path, "/session")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Connecting to session instance without " "socket path is not supported by the ssh " -- 1.8.2.1

1 1

[libvirt] [PATCH] LXC: Check container init path after pivot_root()
by Richard Weinberger 14 Jun '13

14 Jun '13

Currently we check the path before changing the root directory. This cannot work. Do the check after pivot_root() such that we check for the patch within the correct root. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/lxc/lxc_container.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a003ec8..7531fea 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1948,13 +1948,6 @@ static int lxcContainerChild(void *data) if (lxcContainerResolveSymlinks(vmDef) < 0) goto cleanup; - if (!virFileExists(vmDef->os.init)) { - virReportSystemError(errno, - _("cannot find init path '%s' relative to container root"), - vmDef->os.init); - goto cleanup; - } - /* Wait for interface devices to show up */ if (lxcContainerWaitForContinue(argv->monitor) < 0) { virReportSystemError(errno, "%s", @@ -1996,6 +1989,13 @@ static int lxcContainerChild(void *data) argv->securityDriver) < 0) goto cleanup; + if (!virFileExists(vmDef->os.init)) { + virReportSystemError(errno, + _("cannot find init path '%s' relative to container root"), + vmDef->os.init); + goto cleanup; + } + /* rename and enable interfaces */ if (lxcContainerRenameAndEnableInterfaces(!!(vmDef->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET)), -- 1.8.1.4

2 2

[libvirt] [PATCH] LXC: Ensure the init task of container comes from container
by Gao feng 14 Jun '13

14 Jun '13

Richard found libvirt_lxc execs the lxc init programs within the wrong rootfs context, we should run this init task from the rootfs of container. So chroot to the root directory of container, Make sure libvirt_lxc execs the right lxc init program. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 181f6c8..4edff15 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -645,8 +645,9 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - /* CWD is undefined after pivot_root, so go to / */ - if (chdir("/") < 0) + /* CWD is undefined after pivot_root, so go to /, + * and chroot to the new root directroy */ + if (chdir("/") < 0 || chroot(".") < 0) goto err; ret = 0; -- 1.8.1.4

2 3

[libvirt] [PATCH] remote: Forbid default "/session" connections when using ssh transport
by Peter Krempa 14 Jun '13

14 Jun '13

Without the socket path explicitly specified, the remote driver tried to connect to the "/system" instance socket even if "/session" was specified in the uri. With this patch this configuration now produces an error. It is still possible to initiate a session connection with specifying the path to the socket manually and also manually starting the session daemon. This was also possible prior to this patch, This is a minimal fix. We may decide to support remote session connections using ssh but this will require changes to the remote driver code so this fix shouldn't cause regressions in the case we decide to do that. --- src/remote/remote_driver.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fcf45d3..bd5646a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -631,11 +631,21 @@ doRemoteOpen(virConnectPtr conn, break; case trans_libssh2: - if (!sockname && - VIR_STRDUP(sockname, - flags & VIR_DRV_OPEN_REMOTE_RO ? - LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) - goto failed; + if (!sockname) { + /* Right now we don't support default session connections */ + if (STREQ(conn->uri->path, "/session")) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Connecting to session instance without " + "socket path is not supported by the libssh2 " + "connection driver")); + goto failed; + } + + if (VIR_STRDUP(sockname, + flags & VIR_DRV_OPEN_REMOTE_RO ? + LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) + goto failed; + } VIR_DEBUG("Starting LibSSH2 session"); @@ -698,11 +708,21 @@ doRemoteOpen(virConnectPtr conn, if (!command && VIR_STRDUP(command, "ssh") < 0) goto failed; - if (!sockname && - VIR_STRDUP(sockname, - flags & VIR_DRV_OPEN_REMOTE_RO ? - LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) - goto failed; + if (!sockname) { + /* Right now we don't support default session connections */ + if (STREQ(conn->uri->path, "/session")) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Connecting to session instance without " + "socket path is not supported by the ssh " + "connection driver")); + goto failed; + } + + if (VIR_STRDUP(sockname, + flags & VIR_DRV_OPEN_REMOTE_RO ? + LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKET) < 0) + goto failed; + } if (!(priv->client = virNetClientNewSSH(priv->hostname, port, -- 1.8.2.1

2 4

[libvirt] [PATCH] Implement dispose method for libxlDomainObjPrivate
by Frediano Ziglio 14 Jun '13

14 Jun '13

When creating a timer/event handler reference counting is used. So it could be possible (in theory) that libxlDomainObjPrivateFree is called with reference counting >1. The problem is that libxlDomainObjPrivateFree leave the object in an invalid state with ctx freed (but still having dandling pointer). This can lead timer/event handler to core. This patch destroy the object before disposing it so at timer/event object is still valid. Signed-off-by: Frediano Ziglio <frediano.ziglio(a)citrix.com> --- src/libxl/libxl_driver.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 935919b..1c8cfd7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -110,6 +110,8 @@ static int libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, bool start_paused, int restore_fd); +static void libxlDomainObjPrivateDispose(void *obj); + /* Function definitions */ static int libxlDomainObjPrivateOnceInit(void) @@ -117,7 +119,7 @@ libxlDomainObjPrivateOnceInit(void) if (!(libxlDomainObjPrivateClass = virClassNew(virClassForObjectLockable(), "libxlDomainObjPrivate", sizeof(libxlDomainObjPrivate), - NULL))) + libxlDomainObjPrivateDispose))) return -1; return 0; @@ -418,14 +420,26 @@ libxlDomainObjPrivateAlloc(void) } static void -libxlDomainObjPrivateFree(void *data) +libxlDomainObjPrivateDispose(void *obj) { - libxlDomainObjPrivatePtr priv = data; + libxlDomainObjPrivatePtr priv = obj; if (priv->deathW) libxl_evdisable_domain_death(priv->ctx, priv->deathW); libxl_ctx_free(priv->ctx); +} + +static void +libxlDomainObjPrivateFree(void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + if (priv->deathW) { + libxl_evdisable_domain_death(priv->ctx, priv->deathW); + priv->deathW = NULL; + } + virObjectUnref(priv); } -- 1.7.10.4

2 1

[libvirt] fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk
by chandrashekar shastri 14 Jun '13

14 Jun '13

Hi, I have filed a bug "fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk" for the upstream kernel. Bug link: https://bugs.launchpad.net/qemu/+bug/1190525 RHEL guest shows the partittions even after the removal of scsi disk: fdisk still shows the "/dev/sdb" partitions even after the removal of scsi disk. Guest details: ------------------- Kernel : 2.6.32-358 Host Details : Upstream Kernel, Qemu, Libvirt and virt-manager --------------------------------------------------------------------- kernel version : 3.9.0+ qemu version : QEMU emulator version 1.5.0 libvirt version : 1.0.5 virt-install : 0.600.3 Steps to reproduce the issue: I. Add the SCSI disk through the virt-manager. 2. Create the partition using fdisk (eg: /dev/sbb) 3. Create a filesystem and format using mkfs.ext3 or mkfs.ext4 4. Remove the scsi disk through the virt-manager. 5. Again run the fdisk /dev/sdb, the guests still shows the partition even after the removal of the disk. This issue is not seen with virt-io disk. This issue is also reproducible without even creating the partitions. Expected Result: The output of fdisk /dev/sd* should not show the enties after the removal of scsi disks Thanks, Chandrashekar

2 2