- Devel - libvirt List Archives

[libvirt] [PATCH] Fix performance & reliabilty of QMP probing
by Daniel P. Berrange 25 Jan '13

25 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This previous commit commit 1a50ba2cb07d8bb2aa724062889deb9efd7ad9e9 Author: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Date: Mon Nov 26 15:17:13 2012 +0100 qemu: Fix QMP Capabability Probing Failure which attempted to make sure the QEMU process used for probing ran as the right user id, caused serious performance regression and unreliability in probing. The -daemonize switch in QEMU guarantees that the monitor socket is present before the parent process exits. This means libvirtd is guaranteed to be able to connect immediately. By switching from -daemonize to the virCommandDaemonize API libvirtd was no longer synchronized with QEMU's startup process. The result was that the QEMU monitor failed to open and went into its 200ms sleep loop. This happened for all 25 binaries resulting in 5 seconds worth of sleeping at libvirtd startup. In addition sometimes when libvirt connected, QEMU would be partially initialized and crash causing total failure to probe that binary. This commit reverts the previous change, ensuring we do use the -daemonize flag to QEMU. Startup delay is cut from 7 seconds to 2 seconds on my machine, which is on a par with what it was prior to the capabilities rewrite. To deal with the fact that QEMU needs to be able to create the pidfile, we switch pidfile location fron runDir to libDir, which QEMU is guaranteed to be able to write to. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 50 ++++++++++++++++++++++++++++++-------------- src/qemu/qemu_capabilities.h | 3 +-- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 95fa3da..703179d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -38,6 +38,7 @@ #include "virbitmap.h" #include "virnodesuspend.h" #include "qemu_monitor.h" +#include "virtime.h" #include <sys/stat.h> #include <unistd.h> @@ -916,11 +917,19 @@ virCapsPtr qemuCapsInit(qemuCapsCachePtr cache) * so just probe for them all - we gracefully fail * if a qemu-system-$ARCH binary can't be found */ - for (i = 0 ; i < VIR_ARCH_LAST ; i++) + unsigned long long a, b; + for (i = 0 ; i < VIR_ARCH_LAST ; i++) { + unsigned long long start, end; + if (virTimeMillisNow(&start) < 0) + goto error; if (qemuCapsInitGuest(caps, cache, virArchFromHost(), i) < 0) goto error; + if (virTimeMillisNow(&end) < 0) + goto error; + VIR_DEBUG("Probed %s in %llums", virArchToString(i), end-start); + } /* QEMU Requires an emulator in the XML */ virCapabilitiesSetEmulatorRequired(caps); @@ -2291,7 +2300,6 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) static int qemuCapsInitQMP(qemuCapsPtr caps, const char *libDir, - const char *runDir, uid_t runUid, gid_t runGid) { @@ -2324,8 +2332,11 @@ qemuCapsInitQMP(qemuCapsPtr caps, /* ".pidfile" suffix is used rather than ".pid" to avoid a possible clash * with a qemu domain called "capabilities" + * Normally we'd use runDir for pid files, but because we're using + * -daemonize we need QEMU to be allowed to create them, rather + * than libvirtd. So we're using libDir which QEMU can write to */ - if (virAsprintf(&pidfile, "%s/%s", runDir, "capabilities.pidfile") < 0) { + if (virAsprintf(&pidfile, "%s/%s", libDir, "capabilities.pidfile") < 0) { virReportOOMError(); goto cleanup; } @@ -2337,6 +2348,13 @@ qemuCapsInitQMP(qemuCapsPtr caps, VIR_DEBUG("Try to get caps via QMP caps=%p", caps); + /* + * We explicitly need to use -daemonize here, rather than + * virCommandDaemonize, because we need to synchronize + * with QEMU creating its monitor socket API. Using + * daemonize guarnatees control won't return to libvirt + * until the socket is present. + */ cmd = virCommandNewArgList(caps->binary, "-S", "-no-user-config", @@ -2344,14 +2362,14 @@ qemuCapsInitQMP(qemuCapsPtr caps, "-nographic", "-M", "none", "-qmp", monarg, + "-pidfile", pidfile, + "-daemonize", NULL); virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); hookData.runUid = runUid; hookData.runGid = runGid; virCommandSetPreExecHook(cmd, qemuCapsHook, &hookData); - virCommandSetPidFile(cmd, pidfile); - virCommandDaemonize(cmd); if (virCommandRun(cmd, &status) < 0) goto cleanup; @@ -2472,7 +2490,6 @@ cleanup: qemuCapsPtr qemuCapsNewForBinary(const char *binary, const char *libDir, - const char *runDir, uid_t runUid, gid_t runGid) { @@ -2502,12 +2519,14 @@ qemuCapsPtr qemuCapsNewForBinary(const char *binary, goto error; } - if ((rv = qemuCapsInitQMP(caps, libDir, runDir, runUid, runGid)) < 0) + if ((rv = qemuCapsInitQMP(caps, libDir, runUid, runGid)) < 0) goto error; - if (!caps->usedQMP && - qemuCapsInitHelp(caps, runUid, runGid) < 0) - goto error; + if (!caps->usedQMP) { + VIR_ERROR("Falling back to help"); + if (qemuCapsInitHelp(caps, runUid, runGid) < 0) + goto error; + } return caps; @@ -2542,8 +2561,9 @@ qemuCapsHashDataFree(void *payload, const void *key ATTRIBUTE_UNUSED) qemuCapsCachePtr -qemuCapsCacheNew(const char *libDir, const char *runDir, - uid_t runUid, gid_t runGid) +qemuCapsCacheNew(const char *libDir, + uid_t runUid, + gid_t runGid) { qemuCapsCachePtr cache; @@ -2561,8 +2581,7 @@ qemuCapsCacheNew(const char *libDir, const char *runDir, if (!(cache->binaries = virHashCreate(10, qemuCapsHashDataFree))) goto error; - if (!(cache->libDir = strdup(libDir)) || - !(cache->runDir = strdup(runDir))) { + if (!(cache->libDir = strdup(libDir))) { virReportOOMError(); goto error; } @@ -2594,7 +2613,7 @@ qemuCapsCacheLookup(qemuCapsCachePtr cache, const char *binary) if (!ret) { VIR_DEBUG("Creating capabilities for %s", binary); - ret = qemuCapsNewForBinary(binary, cache->libDir, cache->runDir, + ret = qemuCapsNewForBinary(binary, cache->libDir, cache->runUid, cache->runGid); if (ret) { VIR_DEBUG("Caching capabilities %p for %s", @@ -2634,7 +2653,6 @@ qemuCapsCacheFree(qemuCapsCachePtr cache) return; VIR_FREE(cache->libDir); - VIR_FREE(cache->runDir); virHashFree(cache->binaries); virMutexDestroy(&cache->lock); VIR_FREE(cache); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 089fa30..5279d07 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -179,7 +179,6 @@ qemuCapsPtr qemuCapsNew(void); qemuCapsPtr qemuCapsNewCopy(qemuCapsPtr caps); qemuCapsPtr qemuCapsNewForBinary(const char *binary, const char *libDir, - const char *runDir, uid_t runUid, gid_t runGid); @@ -219,7 +218,7 @@ int qemuCapsGetMachineTypesCaps(qemuCapsPtr caps, bool qemuCapsIsValid(qemuCapsPtr caps); -qemuCapsCachePtr qemuCapsCacheNew(const char *libDir, const char *runDir, +qemuCapsCachePtr qemuCapsCacheNew(const char *libDir, uid_t uid, gid_t gid); qemuCapsPtr qemuCapsCacheLookup(qemuCapsCachePtr cache, const char *binary); qemuCapsPtr qemuCapsCacheLookupCopy(qemuCapsCachePtr cache, const char *binary); -- 1.8.0.2

4 6

[libvirt] [Openstack][Sheepdog][Libvirt][Qemu]Add a new block storage driver by Libvirt/Qemu way for Openstack
by harryxiyou 25 Jan '13

25 Jan '13

Hi all, I wanna add a new block storage driver by Libvirt/Qemu way for Openstack, which is as same as Sheepdog driver for Openstack. So i think the theories are like this. 1, In the Openstack Nova branch, Openstck driver call libvirt client and send parameters to libvirt client.(From this point, i should modify Openstack Nova source codes. They are a, nova/nova/virt/libvirt/driver.py add new driver way b, /OpenStack/nova/nova/tests/test_libvirt.py add new driver test) 2, According to own protocol, libvirt client in Openstack Nova branch send parameters to Libvirt server.(From this point, i should modify libvirt library to let libvirt library support this new driver like Sheepdog). 3, Libvirt server call Qemu interfaces to send parameters to Qemu.(From this point, i should modify Qemu source codes to let Qemu support this new driver like Sheepdog). 4, In Openstack Cinder branch, Openstack driver use Qemu commands to create this new volumes to Qemu.(From this point, i should modify Openstack Cinder branch source codes like this. a, Add new driver file /OpenStack/cinder/cinder/volume/drivers/new_driver.py like Sheepdog.py b, Change file /OpenStack/cinder/cinder/tests/test_drivers_compatibility.py to test new driver). 5, At last, i should also modify /OpenStack/manuals/doc/src/docbkx/openstack-compute-admin/tables/hypervisors-nova-conf.xml to configure this new driver. Are my theories right? Should i do any other stuffs? Could anyone give me any other suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 5

[libvirt] [PATCH] virsh: Forbid usage of --memspec and --disk-only together
by Peter Krempa 25 Jan '13

25 Jan '13

virsh snapshot-create-as with --memspec and --disk only fails at the qemu driver. Forbid the creation at virsh too and document it. --- tools/virsh-snapshot.c | 6 ++++++ tools/virsh.pod | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e4745d6..86fd1fd 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -457,6 +457,12 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (memspec && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY)) { + vshError(ctl, "%s", + _("Can't combine disk only snapshots with --memspec")); + goto cleanup; + } + if (memspec && vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index e2a2aec..c5cf16c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2746,7 +2746,8 @@ The I<--memspec> option can be used to control whether a checkpoint is internal or external. The I<--memspec> flag is mandatory, followed by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where type can be B<none>, B<internal>, or B<external>. To include a literal -comma in B<file=name>, escape it with a second comma. +comma in B<file=name>, escape it with a second comma. I<--memspec> cannot +be used together with I<--disk-only>. The I<--diskspec> option can be used to control how I<--disk-only> and external checkpoints create external files. This option can occur -- 1.8.1.1

2 1

[libvirt] [PATCH] Fix bogus reporting of KVM support for non-native emulators
by Daniel P. Berrange 25 Jan '13

25 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A logic bug meant we reported KVM was possible for every architecture, merely based on whether the query-kvm command exists. We should instead have been doing it based on whether the query-kvm command returns 'present: 1' Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f86c28f..29693c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2117,11 +2117,16 @@ qemuCapsProbeQMPKVMState(qemuCapsPtr caps, return -1; /* The QEMU_CAPS_KVM flag was initially set according to the QEMU - * reporting the recognition of 'query-kvm' QMP command, but the - * flag means whether the KVM is enabled by default and should be - * disabled in case we want SW emulated machine, so let's fix that - * if it's true. */ - if (!enabled) { + * reporting the recognition of 'query-kvm' QMP command. That merely + * indicates existance of the command though, not whether KVM support + * is actually available, nor whether it is enabled by default. + * + * If it is not present we need to clear the flag, and if it is + * not enabled by default we need to change the flag. + */ + if (!present) { + qemuCapsClear(caps, QEMU_CAPS_KVM); + } else if (!enabled) { qemuCapsClear(caps, QEMU_CAPS_KVM); qemuCapsSet(caps, QEMU_CAPS_ENABLE_KVM); } -- 1.8.0.2

2 1

[libvirt] [PATCH] qemu: don't share kerberos caches between domains
by Eric Blake 25 Jan '13

25 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=718377 complains that there were some SELinux AVCs when using vnc console over Kerberos. The root problem was that Kerberos tries to set up a cache file, and if we don't tell it where, then all domains use the same cache file, which violates sVirt protections. Setting the environment variable unconditionally should be safe, even for setups where Kerboros won't actually create a cache file. * src/qemu/qemu_process.c (qemuProcessStart): Set KRB5CACHEDIR for each domain. --- src/qemu/qemu_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 55d00e3..986e8ee 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1,7 +1,7 @@ /* * qemu_process.h: QEMU process management * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3857,6 +3857,8 @@ int qemuProcessStart(virConnectPtr conn, virCommandSetPidFile(cmd, priv->pidfile); virCommandDaemonize(cmd); virCommandRequireHandshake(cmd); + virCommandAddEnvFormat(cmd, "KRB5CACHEDIR=%s/%s.krb", + driver->cacheDir, vm->def->name); ret = virCommandRun(cmd, NULL); -- 1.8.1

4 6

[libvirt] [PATCH] qemuDomainSendKey: Relax the qemu driver locking
by Michal Privoznik 25 Jan '13

25 Jan '13

Currently, there is no reason to hold qemu driver locked throughout whole API execution. Moreover, we can use the new qemuDomObjFromDomain() internal API to lookup domain then. --- src/qemu/qemu_driver.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d4c1e9..100f10b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2407,19 +2407,12 @@ static int qemuDomainSendKey(virDomainPtr domain, } } - qemuDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, domain->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; - } priv = vm->privateData; - if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -2428,9 +2421,9 @@ static int qemuDomainSendKey(virDomainPtr domain, goto endjob; } - qemuDomainObjEnterMonitorWithDriver(driver, vm); + qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); - qemuDomainObjExitMonitorWithDriver(driver, vm); + qemuDomainObjExitMonitor(driver, vm); endjob: if (qemuDomainObjEndJob(driver, vm) == 0) @@ -2439,7 +2432,6 @@ endjob: cleanup: if (vm) virObjectUnlock(vm); - qemuDriverUnlock(driver); return ret; } -- 1.8.0.2

5 7

[libvirt] [PATCH] node_memory: Add '\n' to help message
by Satoru Moriya 25 Jan '13

25 Jan '13

Linefeed is missed in the help of node-memory-tune. This patch just adds '\n' to get a correct help message. Signed-off-by: Satoru Moriya <satoru.moriya(a)hds.com> --- tools/virsh-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index d05e435..b83c893 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -764,7 +764,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_node_memory_tune[] = { {"help", N_("Get or set node memory parameters")}, - {"desc", N_("Get or set node memory parameters" + {"desc", N_("Get or set node memory parameters\n" " To get the memory parameters, use following command: \n\n" " virsh # node-memory-tune")}, {NULL, NULL} -- 1.7.11.7

2 1

[libvirt] [PATCH] qemu: escape ipv6 for rbd network disk hosts
by Josh Durgin 25 Jan '13

25 Jan '13

Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, so they are often referenced by IP rather than hostname for convenience, or to avoid relying on DNS. Using IPv4 addresses as the host name works already, but IPv6 addresses require rbd-specific escaping because the colon is used as an option separator in the string passed to qemu. Escape these colons, and enclose the IPv6 address in square brackets if a port is specified. Signed-off-by: Josh Durgin <josh.durgin(a)inktank.com> --- docs/schemas/domaincommon.rng | 5 ++- src/qemu/qemu_command.c | 34 +++++++++++++++---- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 9 +++++ .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 36 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 6 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7f3320e..273e54c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1099,7 +1099,10 @@ </attribute> </optional> <attribute name="name"> - <ref name="dnsName"/> + <choice> + <ref name="dnsName"/> + <ref name="ipAddr"/> + </choice> </attribute> <attribute name="port"> <ref name="unsignedInt"/> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 02fe015..dfc042b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -34,6 +34,7 @@ #include "virerror.h" #include "virutil.h" #include "virfile.h" +#include "virstring.h" #include "viruuid.h" #include "c-ctype.h" #include "domain_nwfilter.h" @@ -1937,13 +1938,16 @@ qemuBuildRBDString(virConnectPtr conn, if (i) { virBufferAddLit(opt, "\\;"); } - if (disk->hosts[i].port) { - virBufferAsprintf(opt, "%s\\:%s", - disk->hosts[i].name, - disk->hosts[i].port); + + /* assume host containing : is ipv6 */ + if (strchr(disk->hosts[i].name, ':')) { + virBufferEscape(opt, '\\', ":", "[%s]", disk->hosts[i].name); } else { virBufferAsprintf(opt, "%s", disk->hosts[i].name); } + if (disk->hosts[i].port) { + virBufferAsprintf(opt, "\\:%s", disk->hosts[i].port); + } } } @@ -1961,15 +1965,26 @@ error: static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport) { char *port; + size_t skip; + char **parts; disk->nhosts++; if (VIR_REALLOC_N(disk->hosts, disk->nhosts) < 0) goto no_memory; - port = strstr(hostport, "\\:"); + if (strchr(hostport, ']')) { + /* ipv6, strip brackets */ + hostport += 1; + port = strstr(hostport, "]\\:"); + skip = 3; + } else { + port = strstr(hostport, "\\:"); + skip = 2; + } + if (port) { *port = '\0'; - port += 2; + port += skip; disk->hosts[disk->nhosts-1].port = strdup(port); if (!disk->hosts[disk->nhosts-1].port) goto no_memory; @@ -1978,7 +1993,12 @@ static int qemuAddRBDHost(virDomainDiskDefPtr disk, char *hostport) if (!disk->hosts[disk->nhosts-1].port) goto no_memory; } - disk->hosts[disk->nhosts-1].name = strdup(hostport); + + parts = virStringSplit(hostport, "\\:", 0); + if (!parts) + goto no_memory; + disk->hosts[disk->nhosts-1].name = virStringJoin((const char **)parts, ":"); + virStringFreeList(parts); if (!disk->hosts[disk->nhosts-1].name) goto no_memory; diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 2923324..e465f3d 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -185,6 +185,7 @@ mymain(void) DO_TEST("disk-drive-network-nbd"); DO_TEST("disk-drive-network-gluster"); DO_TEST("disk-drive-network-rbd"); + DO_TEST("disk-drive-network-rbd-ipv6"); /* older format using CEPH_ARGS env var */ DO_TEST("disk-drive-network-rbd-ceph-env"); DO_TEST("disk-drive-network-sheepdog"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args new file mode 100644 index 0000000..0c67229 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ +file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ +'file=rbd:pool/image:auth_supported=none:\ +mon_host=[\:\:1]\:6321\;example.org\:6789\;\ +[ffff\:1234\:567\:abc\:\:0f]\:6322\;\ +[2001\:db8\:\:ff00\:42\:8329]\:6322,\ +if=virtio,format=raw' -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml new file mode 100644 index 0000000..a2ca2d2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='pool/image'> + <host name='::1' port='6321'/> + <host name='example.org' port='6789'/> + <host name='ffff:1234:567:abc::0f' port='6322'/> + <host name='2001:db8::ff00:42:8329' port='6322'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 31ed116..88e1c36 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -478,6 +478,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-rbd-auth", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST("disk-drive-network-rbd-ipv6", + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-no-boot", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX); DO_TEST("disk-usb", NONE); -- 1.7.2.5

2 4

[libvirt] [PATCH] snapshot: fix state after external snapshot of S3 domain
by Eric Blake 25 Jan '13

25 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=876829 complains that if a guest is put into S3 state (such as via virsh dompmsuspend) and then an external snapshot is taken, qemu forcefully transitions the domain to paused, but libvirt doesn't reflect that change internally. Thus, a user has to use 'virsh suspend' to get libvirt back in sync with qemu state, and if the user doesn't know this trick, then the guest appears hung. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateActiveExternal): Track fact that qemu wakes up a suspended domain on migration. --- src/qemu/qemu_driver.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d4c1e9..da30dcb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1,7 +1,7 @@ /* * qemu_driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -11124,6 +11124,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); bool transaction = qemuCapsGet(priv->caps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ + bool pmsuspended = false; if (qemuDomainObjBeginAsyncJobWithDriver(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT) < 0) @@ -11144,7 +11145,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, } /* we need to resume the guest only if it was previously running */ - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PMSUSPENDED) { + pmsuspended = true; + } else if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { resume = true; /* For external checkpoints (those with memory), the guest @@ -11226,6 +11229,18 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, vm = NULL; if (event) qemuDomainEventQueue(driver, event); + } else if (memory && pmsuspended) { + /* qemu 1.3 is unable to save a domain in pm-suspended (S3) + * state; so we must emit an event stating that it was + * converted to paused. */ + virDomainEventPtr event; + + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); + event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); + if (event) + qemuDomainEventQueue(driver, event); } ret = 0; -- 1.8.1

2 2

[libvirt] [PATCH 00/10] Patches for various coverity issues
by John Ferlan 25 Jan '13

25 Jan '13

locking: Fixes Coverity OVERRUN warning due to the size of the source string being 19 bytes and the memcpy size of 48 bytes security: Fixes Coverity warning STRING_OVERFLOW about due to the copy being from a variable sized string to a fixed length string. Even though on read other checks ensure the source buffer is no longer than the number of bytes in the destination, Coverity doesn't know that. rpc: Fixes Coverity warning DEADCODE due to removal of code as specified in the commit message parallels: Fixes Coverity warning NULL_RETURNS from not checking result of virJSONValueObjectGetString() call as part of commit id: 8ce9e2ab util: Fixes Coverity warning NULL_RETURNS due to not checking the return value 'child' from a virJSONValueNewObject() call. qemu: Fixes Coverity warning NULL_RETURNS from not checking the return value 'activeDev' from a pciDeviceListFind() call. selinux: Fixes Coverity warning RESOURCE_LEAK as a result of code specified in the commit message esx: Fixes Coverity warning REVERSE_INULL as a result of needlessly checking if objectSpec != NULL. At the point in the code, objectSpec must be valid. virobject: Fixes Coverity warning CONSTANT_EXPRESSION_RESULT and DEADCODE as a result of commit id b545f65 using "if (!virObjectInitialize() < 0)" network: Fixes Coverity warning UNUSED_VALUE as specific in the commit message John Ferlan (10): locking: use virStrcpy instead of memcpy security: Use virStrcpy to move the label rpc: Remove call to virKeepAliveStop at init parallels: Need to handle virJSONValueObjectGetString error util: Need to check child JSON allocation before use qemu: Check valid activeDev before calling pciDeviceSetUsedBy selinux: Resolve resource leak using the default disk label esx: No need to check for objectSpec virobject: Remove the bogus ! from call to virObjectInitialize() network: Remove dead code getting, but not using ipdef src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/esx/esx_vi.c | 7 +++---- src/locking/lock_driver_sanlock.c | 9 ++++++++- src/network/bridge_driver.c | 3 --- src/parallels/parallels_driver.c | 5 ++++- src/qemu/qemu_hostdev.c | 3 ++- src/rpc/virnetserverclient.c | 2 -- src/security/security_dac.c | 8 +++++++- src/security/security_selinux.c | 6 +++--- src/util/virlockspace.c | 3 +++ src/util/virobject.c | 4 ++-- 12 files changed, 64 insertions(+), 18 deletions(-) -- 1.7.11.7

4 37