- Devel - libvirt List Archives

[libvirt] [PATCH v5 00/11] Add support for guests with TPM passthrough device
by Stefan Berger 12 Apr '13

12 Apr '13

Hello! The following set of patches adds support to libvirt for adding a TPM passthrough device to a QEMU guest. Support for this was recently accepted into QEMU. This set of patches borrows a lot from the recently added support for rng's. Regards, Stefan --- v4->v5: - followed tree to b83b31d8 - addressed D. Berrange's comments on patches 4, 7, 10, 11 & nit on 6 - droped code to parse QEMU cmd line with TPM since this requires editing of the resulting XML v3->v4: - followed tree to ce65b435 - followed comments on v3 v2->v3: - followed tree to 03122d7b - some nits I found fixed v1->v2: - Followed Daniel Berrange's comments (except for the one on de-consolidating the JSON monitor code)

2 16

[libvirt] [PATCH] conf: Allow for non-contiguous device boot orders
by Peter Krempa 12 Apr '13

12 Apr '13

This patch adds the ability to configure non-contiguous boot orders on boot devices. This allows unplugging devices that have boot order specified without breaking migration. The new code now uses a slightly less memory efficient approach to store the boot order fields in a hashtable instead of a bitmap. --- src/conf/domain_conf.c | 66 ++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc26f21..80a90e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2876,7 +2876,7 @@ cleanup: static int virDomainDeviceBootParseXML(xmlNodePtr node, int *bootIndex, - virBitmapPtr bootMap) + virHashTablePtr bootHash) { char *order; int boot; @@ -2895,18 +2895,19 @@ virDomainDeviceBootParseXML(xmlNodePtr node, goto cleanup; } - if (bootMap) { - bool set; - if (virBitmapGetBit(bootMap, boot - 1, &set) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("boot orders have to be contiguous and starting from 1")); + if (bootHash) { + if (virHashLookup(bootHash, order)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("boot order '%s' used for more than one device"), + order); goto cleanup; - } else if (set) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("boot order %d used for more than one device"), boot); + } + + if (virHashAddEntry(bootHash, order, (void *) 1) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add element to boot order hash")); goto cleanup; } - ignore_value(virBitmapSetBit(bootMap, boot - 1)); } *bootIndex = boot; @@ -2922,7 +2923,7 @@ cleanup: */ static int virDomainDeviceInfoParseXML(xmlNodePtr node, - virBitmapPtr bootMap, + virHashTablePtr bootHash, virDomainDeviceInfoPtr info, unsigned int flags) { @@ -2973,7 +2974,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, } if (boot) { - if (virDomainDeviceBootParseXML(boot, &info->bootIndex, bootMap)) + if (virDomainDeviceBootParseXML(boot, &info->bootIndex, bootHash)) goto cleanup; } @@ -3945,7 +3946,7 @@ static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, virSecurityLabelDefPtr* vmSeclabels, int nvmSeclabels, unsigned int flags) @@ -4660,7 +4661,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) < 0) goto error; } @@ -5318,7 +5319,7 @@ static virDomainNetDefPtr virDomainNetDefParseXML(virCapsPtr caps, xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { virDomainNetDefPtr def; @@ -5513,7 +5514,7 @@ virDomainNetDefParseXML(virCapsPtr caps, } def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT | VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM) < 0) goto error; @@ -7988,7 +7989,7 @@ error: static virDomainHostdevDefPtr virDomainHostdevDefParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { virDomainHostdevDefPtr def; @@ -8029,7 +8030,7 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, } if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (virDomainDeviceInfoParseXML(node, bootMap, def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT | VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM) < 0) goto error; @@ -8063,7 +8064,7 @@ error: static virDomainRedirdevDefPtr virDomainRedirdevDefParseXML(const xmlNodePtr node, - virBitmapPtr bootMap, + virHashTablePtr bootHash, unsigned int flags) { xmlNodePtr cur; @@ -8113,7 +8114,7 @@ virDomainRedirdevDefParseXML(const xmlNodePtr node, def->source.chr.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; } - if (virDomainDeviceInfoParseXML(node, bootMap, &def->info, + if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) < 0) goto error; @@ -9098,8 +9099,7 @@ static char *virDomainDefDefaultEmulator(virDomainDefPtr def, static int virDomainDefParseBootXML(xmlXPathContextPtr ctxt, - virDomainDefPtr def, - unsigned long *bootCount) + virDomainDefPtr def) { xmlNodePtr *nodes = NULL; int i, n; @@ -9196,7 +9196,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, def->os.bios.rt_set = true; } - *bootCount = deviceBoot; ret = 0; cleanup: @@ -9394,8 +9393,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainDefPtr def; unsigned long count; bool uuid_generated = false; - virBitmapPtr bootMap = NULL; - unsigned long bootMapSize = 0; + virHashTablePtr bootHash = NULL; xmlNodePtr cur; bool usb_none = false; bool usb_other = false; @@ -10289,10 +10287,10 @@ virDomainDefParseXML(virCapsPtr caps, } if (STREQ(def->os.type, "hvm")) { - if (virDomainDefParseBootXML(ctxt, def, &bootMapSize) < 0) + if (virDomainDefParseBootXML(ctxt, def) < 0) + goto error; + if (!(bootHash = virHashCreate(5, NULL))) goto error; - if (bootMapSize && !(bootMap = virBitmapNew(bootMapSize))) - goto no_memory; } def->emulator = virXPathString("string(./devices/emulator[1])", ctxt); @@ -10313,7 +10311,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], ctxt, - bootMap, + bootHash, def->seclabels, def->nseclabels, flags); @@ -10413,7 +10411,7 @@ virDomainDefParseXML(virCapsPtr caps, virDomainNetDefPtr net = virDomainNetDefParseXML(caps, nodes[i], ctxt, - bootMap, + bootHash, flags); if (!net) goto error; @@ -10796,7 +10794,7 @@ virDomainDefParseXML(virCapsPtr caps, for (i = 0 ; i < n ; i++) { virDomainHostdevDefPtr hostdev; - hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootMap, flags); + hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootHash, flags); if (!hostdev) goto error; @@ -10912,7 +10910,7 @@ virDomainDefParseXML(virCapsPtr caps, goto no_memory; for (i = 0 ; i < n ; i++) { virDomainRedirdevDefPtr redirdev = virDomainRedirdevDefParseXML(nodes[i], - bootMap, + bootHash, flags); if (!redirdev) goto error; @@ -11029,7 +11027,7 @@ virDomainDefParseXML(virCapsPtr caps, if (virDomainDefAddImplicitControllers(def) < 0) goto error; - virBitmapFree(bootMap); + virHashFree(bootHash); return def; @@ -11038,7 +11036,7 @@ no_memory: error: VIR_FREE(tmp); VIR_FREE(nodes); - virBitmapFree(bootMap); + virHashFree(bootHash); virDomainDefFree(def); return NULL; } -- 1.8.1.5

2 3

[libvirt] libvirt libxl driver leaking libxl_event's?
by Ian Campbell 12 Apr '13

12 Apr '13

Hi Jim, I don't see any calls to libxl_event_dispose in libvirt.git, libxl_event.h says in relation to the event_occurs callback: * event becomes owned by the application and must be freed, either * by event_occurs or later. so does this mean the memory referenced by event is leaked by libxlEventHandler? libxl_event only contains dynamic allocations for LIBXL_EVENT_TYPE_DISK_EJECT which you don't seem to register for so the issue is probably benign but worth noting I think. Ian.

2 3

[libvirt] [libvirt-designer] Fix 'be find' typo in error message
by Christophe Fergeau 12 Apr '13

12 Apr '13

--- Pushed under the trivial rule. Christophe examples/virtxml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/virtxml.c b/examples/virtxml.c index 49a7b4e..20aa621 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -547,7 +547,7 @@ main(int argc, char *argv[]) } if (!os) { - print_error("Operating system could not be find or guessed"); + print_error("Operating system could not be found or guessed"); goto cleanup; } -- 1.8.1.4

1 0

[libvirt] [RFC] Usage about 'virsh vol-wipe vol_name'
by harryxiyou 12 Apr '13

12 Apr '13

Hi all, I am not very clear about the usage of ‘virsh vol-wipe vol_name’. I think if 'virsh vol-wipe vol_name' can just wipe all the datas in this volume and it is similar as we format a volume which the datas would be wiped, right? After this wipe, we can use this volume like a new one. However, if users just want to wipe portions data of this volume, which command(interface) of libvirt could finish? -- Thanks Harry Wei

2 7

Re: [libvirt] fail to convert qemu xml to args with libvirt-1.0.4: An error occurred, but the cause is unknown
by Yin Olivia-R63875 12 Apr '13

12 Apr '13

Hi Daniel, I also tried libvirt-1.0.4 on my X86 machine. user@x86:~ $ uname -a Linux 2.6.32-33-server #70-Ubuntu SMP Thu Jul 7 22:28:30 UTC 2011 x86_64 GNU/Linux user@x86:~ $ which virsh /usr/local/bin/virsh user@x86:~ $ /usr/local/bin/virsh --version 1.0.4 user@x86:~ $ cd libvirt-1.0.4/tests/qemuxml2argvdata user@x86:~/libvirt-1.0.4/tests/qemuxml2argvdata $ virsh domxml-to-native qemu-argv qemuxml2argv-disk-virtio.xml >1.dom error：An error occurred, but the cause is unknown Best Regards, Olivia > -----Original Message----- > From: Yin Olivia-R63875 > Sent: Thursday, April 11, 2013 10:18 AM > To: 'Daniel P. Berrange' > Cc: 'libvirt-users(a)redhat.com'; 'libvir-list(a)redhat.com' > Subject: RE: fail to convert qemu xml to args with libvirt-1.0.4: An error > occurred, but the cause is unknown > > Hi Daniel, > > Just Ping. > Did you ever successfully convert QEMU xml file to argv on other platforms? > > Best Regards, > Olivia > > > -----Original Message----- > > From: Yin Olivia-R63875 > > Sent: Tuesday, April 09, 2013 1:22 PM > > To: 'libvir-list(a)redhat.com' > > Cc: 'libvirt-users(a)redhat.com' > > Subject: fail to convert qemu xml to args with libvirt-1.0.4: An error > > occurred, but the cause is unknown > > > > Hi, > > > > I used to convert qemu XML to args with libvirt-1.0.3. > > But it failed to convert with libvirt-1.0.4. > > > > # virsh domxml-to-native qemu-argv test.xml >test.sh > > error: An error occurred, but the cause is unknown > > > > > > Comparing the debug file as below: > > 1) lbvirt-1.0.3 > > <cut> > > 2013-04-09 03:23:47.296+0000: 2669: debug : > > virEventPollInterruptLocked:716 : Interrupting > > 2013-04-09 03:23:47.296+0000: 2669: debug : virNetClientIO:1807 : All > > done with our call head=(nil) call=0x100871c0 rv=0 > > 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollRunOnce:640 : > > Poll got 1 event(s) > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchTimeouts:425 : Dispatch 0 > > 2013-04-09 03:23:47.297+0000: 2669: debug : virNetMessageFree:73 : > > msg=0x10087500 nfds=0 cb=(nil) > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchHandles:470 : Dispatch 1 > > 2013-04-09 03:23:47.297+0000: 2670: debug : > > virEventPollDispatchHandles:484 : i=0 w=1 > > 2013-04-09 03:23:47.297+0000: 2669: debug : virConnectClose:1483 : > > conn=0x100878b8 <cut> > > > > 2) libvirt-1.0.4 > > <cut> > > 2013-04-09 03:07:58.012+0000: 2834: debug : > > virEventPollInterruptLocked:716 : Interrupting > > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetClientIO:1810 : All > > done with our call head=(nil) call=0x10089db8 rv=0 > > 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollRunOnce:640 : > > Poll got 1 event(s) > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchTimeouts:425 : Dispatch 0 > > 2013-04-09 03:07:58.012+0000: 2834: error : > > virNetClientProgramDispatchError:175 : An error occurred, but the > > cause is unknown > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:470 : Dispatch 1 > > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetMessageFree:73 : > > msg=0x1008a0f8 nfds=0 cb=(nil) > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:484 : i=0 w=1 > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 > > events=1 > > 2013-04-09 03:07:58.012+0000: 2835: debug : > > virEventPollCleanupTimeouts:516 : Cleanup 0 > > 2013-04-09 03:07:58.013+0000: 2835: debug : > > virEventPollCleanupTimeouts:552 : Found 0 out of 0 timeout slots used, > > releasing 0 > > 2013-04-09 03:07:58.013+0000: 2835: debug : > virEventPollCleanupHandles:564 : > > Cleanup 2 > > 2013-04-09 03:07:58.013+0000: 2834: debug : virConnectClose:1483 : > > conn=0x1008a4b0 <cut> > > > > > > How can I debug this cause unknown error? > > > > Best Regards, > > Olivia

1 0

[libvirt] [RFC] virCommandRun return error number
by harryxiyou 12 Apr '13

12 Apr '13

Hi all, I copy portions of libvirt/src/storage/storage_backend_sheepdog.c [...] 125 ret = virCommandRun(cmd, NULL); 126 if (ret == 0) 127 ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); [...] I found virCommandRun may return '-1', which hinds something error happens. However, Sheepdog hasn't check here. Maybe i have come up with this bug. I cannot remember clearly. Could anyone please give me some suggestions? If ture, i will give a patch for this bug ;-). -- Thanks Harry Wei

4 9

[libvirt] [PATCH v2 0/2] Add error handling to optional arguments in cmdCPUStats
by John Ferlan 12 Apr '13

12 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=907732 Also added informational message when count value is larger than number of CPUs present. Original code commit '31047e2b' quietly changes it and continues on. Prior to patch 2/2, no errors were seen for following sequences virsh cpu-stats guest xyz virsh cpu-stats guest --start xyz virsh cpu-stats guest --count xyz virsh cpu-stats guest --count 99999999999 With patch 2/2, the following errors are displayed for the above sequence error: Unable to parse integer parameter for start error: Unable to parse integer parameter for start error: Unable to parse integer parameter for CPUs to show error: Unable to parse integer parameter for CPUs to show Additionally, the following will be displayed on negative value input: virsh cpu-stats guest --start -1 error: Invalid value for start CPU virsh cpu-stats guest --count -1 error: Invalid value for number of CPUs to show Using a --count parameter value larger than the number of vCPUs on the system will display the following: virsh cpu-stats guest --count 8 Only 4 CPUs available to show CPU0: cpu_time 10.770466061 seconds vcpu_time 8.327848192 seconds ... Diff to v1 - Split into 2 patches (one for struct defs, one for argument processing) - Adjust argument processessing to delineate between bad argument and invalid value (eg, negative CPU start number or count) - Only display the > # cpus message when too large a value is supplied John Ferlan (2): Remove extraneous comma in info_cpu_stats and opts_cpu_stats Add error handling to optional arguments in cmdCPUStats tools/virsh-domain.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) -- 1.8.1.4

3 6

[libvirt] [PATCH] qemu: Do not report unsafe migration for local files
by Jiri Denemark 11 Apr '13

11 Apr '13

When migrating a domain with disk images stored locally (and using storage migration), we should not complain about unsafe migration no matter what cache policy is used for that disk. --- src/qemu/qemu_migration.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a263668..a31bd02 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1477,13 +1477,17 @@ qemuMigrationIsSafe(virDomainDefPtr def) !disk->shared && !disk->readonly && disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) { - int cfs; + int rc; if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { - if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1) + if ((rc = virStorageFileIsSharedFS(disk->src)) < 0) + return false; + else if (rc == 0) continue; - else if (cfs < 0) + if ((rc = virStorageFileIsClusterFS(disk->src)) < 0) return false; + else if (rc == 1) + continue; } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { continue; -- 1.8.1.5

2 2

[libvirt] [PATCH] virsh: Document that using incomplete XML files may have unexpected results
by Peter Krempa 11 Apr '13

11 Apr '13

Explicitly state that using incomplete XML definition snippets for hot-management commands may have unexpected results due to autogenerating values for some of the fields if they aren't specified explicitly. --- tools/virsh.pod | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1510d0d..11984bc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1824,6 +1824,10 @@ within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<attach-disk> I<domain> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] @@ -1893,6 +1897,10 @@ as command B<attach-device>. For passthrough host devices, see also B<nodedev-reattach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. @@ -1969,6 +1977,10 @@ an offline domain, and like I<--live> I<--config> for a running domain. Note that older versions of virsh used I<--config> as an alias for I<--persistent>. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<change-media> I<domain> I<path> [I<--eject>] [I<--insert>] [I<--update>] [I<source>] [I<--force>] [[I<--live>] [I<--config>] | [I<--current>]] -- 1.8.1.5

2 2