- Devel - libvirt List Archives

[libvirt] [java PATCH] maint: correct name for license file
by Eric Blake 28 Sep '12

28 Sep '12

* LICENCE: Move to LICENSE. * libvirt-java.spec.in: Reflect the rename. --- Pushing under the trivial rule. LICENCE => LICENSE | 0 libvirt-java.spec.in | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename LICENCE => LICENSE (100%) diff --git a/LICENCE b/LICENSE similarity index 100% rename from LICENCE rename to LICENSE diff --git a/libvirt-java.spec.in b/libvirt-java.spec.in index 4fd74fc..13044c0 100644 --- a/libvirt-java.spec.in +++ b/libvirt-java.spec.in @@ -72,7 +72,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc AUTHORS LICENCE NEWS README INSTALL +%doc AUTHORS LICENSE NEWS README INSTALL %{_javadir}/*.jar %files devel -- 1.7.11.4

1 0

[libvirt] [PATCH] Fix compilation of legacy xen driver with Xen 4.2
by Jim Fehlig 28 Sep '12

28 Sep '12

In Xen 4.2, xs.h is deprecated in favor of xenstore.h. xs.h now contains #warning xs.h is deprecated use xenstore.h instead #include <xenstore.h> which fails compilation when warnings are treated as errors. Introduce a configure-time check for xenstore.h and if found, use it instead of xs.h. --- configure.ac | 2 ++ src/xen/block_stats.c | 6 +++++- src/xen/xs_internal.c | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 38d94d4..ae26de7 100644 --- a/configure.ac +++ b/configure.ac @@ -768,6 +768,8 @@ if test "$with_xen" != "no" ; then fi if test "$with_xen" != "no" ; then + dnl In Xen 4.2, xs.h is deprecated in favor of xenstore.h. + AC_CHECK_HEADERS([xenstore.h]) AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[ if test "$with_xen" = "yes"; then fail=1 diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index f3b756a..5ab1ce4 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -32,7 +32,11 @@ # include <unistd.h> # include <regex.h> -# include <xs.h> +# if HAVE_XENSTORE_H +# include <xenstore.h> +# else +# include <xs.h> +# endif # include "virterror_internal.h" # include "datatypes.h" diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 12efa0c..a91d409 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -35,7 +35,11 @@ #include <xen/dom0_ops.h> #include <xen/version.h> -#include <xs.h> +#if HAVE_XENSTORE_H +# include <xenstore.h> +#else +# include <xs.h> +#endif #include "virterror_internal.h" #include "datatypes.h" -- 1.7.10.4

2 2

[libvirt] [PATCH] Temporarily shutoff CPUSET cgroup in libvirt.
by Tang Chen 27 Sep '12

27 Sep '12

When a cpu or memory is offlined and onlined again, cgroup will not recover any corresponding values. This is a problem in kernel. Do not use CPUSET cgroup to limit threads using cpu and memory until the problem is fixed in kernel. Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/qemu/qemu.conf | 5 ++++- src/qemu/qemu_conf.c | 7 ++++++- src/util/cgroup.c | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 18105ca..6bf7290 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -211,7 +211,10 @@ # can be mounted in different locations. libvirt will detect # where they are located. # -#cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuset", "cpuacct" ] +# When a cpu or memory is offlined and onlined again, cgroup will not +# recover any corresponding values. This is a problem in kernel. +# So DO NOT use cpuset cgroup until this problem is fixed in kernel. +#cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuacct" ] # This is the basic set of devices allowed / required by # all virtual machines. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 91a56f1..80b0787 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -397,12 +397,17 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, driver->cgroupControllers |= (1 << ctl); } } else { + /* + * When a cpu or memory is offlined and onlined again, cgroup will not + * recover any corresponding values. This is a problem in kernel. + * Do not use CPUSET cgroup to limit threads using cpu and memory until + * the problem is fixed in kernel. + */ driver->cgroupControllers = (1 << VIR_CGROUP_CONTROLLER_CPU) | (1 << VIR_CGROUP_CONTROLLER_DEVICES) | (1 << VIR_CGROUP_CONTROLLER_MEMORY) | (1 << VIR_CGROUP_CONTROLLER_BLKIO) | - (1 << VIR_CGROUP_CONTROLLER_CPUSET) | (1 << VIR_CGROUP_CONTROLLER_CPUACCT); } for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 5dc0764..cd7d3fe 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -543,8 +543,7 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, /* We need to control cpu bandwidth for each vcpu now */ if ((flags & VIR_CGROUP_VCPU) && (i != VIR_CGROUP_CONTROLLER_CPU && - i != VIR_CGROUP_CONTROLLER_CPUACCT && - i != VIR_CGROUP_CONTROLLER_CPUSET)) { + i != VIR_CGROUP_CONTROLLER_CPUACCT)) { /* treat it as unmounted and we can use virCgroupAddTask */ VIR_FREE(group->controllers[i].mountPoint); continue; -- 1.7.10.1

3 4

[libvirt] [PATCH] Network: LXC generic ethernet interface
by Takayuki Usui 27 Sep '12

27 Sep '12

The patch adds generic ethernet type to LXC, that allows you to make an arbitrary virtual network interface and associate it to an LXC domain. That does not, however, provide a means to execute a script, that is still available only for QEMU. 1. Create a virtual ethernet device pair # ip link add type veth (e.g. veth0 and veth1 by default) 2. Define a LXC domain and associate it to one end of the pair [...] <interface type='ethernet'> <target dev='veth1'/> </interface> 3. Do whatever you like, for example, add another end of the pair to a bridge (e.g. br0) # brctr addif br0 veth0 # ip link set dev veth0 up 4. Start a LXC domain. The interface shows up as eth0 in the domain. Signed-off-by: Takayuki Usui <takayuki(a)midokura.jp> --- src/lxc/lxc_process.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 84128d1..0b86241 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -419,6 +419,46 @@ cleanup: } +static int lxcSetupInterfaceEthernet(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainNetDefPtr net, + unsigned int *nveths, + char ***veths) +{ + int ret = -1; + char *containerVeth = NULL; + + if (net->ifname == 0 || strlen(net->ifname) == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Ethernet target device is required")); + goto cleanup; + } + + if (VIR_ALLOC_N(containerVeth, strlen(net->ifname) + 1) < 0) { + virReportOOMError(); + goto cleanup; + } + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) { + virReportOOMError(); + VIR_FREE(containerVeth); + goto cleanup; + } + if (virStrcpy(containerVeth, net->ifname, + strlen(net->ifname) + 1) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Ethernet target device name is too long")); + VIR_FREE(containerVeth); + goto cleanup; + } + (*veths)[(*nveths)] = containerVeth; + (*nveths)++; + + ret = 0; + +cleanup: + return ret; +} + /** * virLXCProcessSetupInterfaces: * @conn: pointer to connection @@ -522,8 +562,16 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (lxcSetupInterfaceEthernet(conn, + def, + def->nets[i], + nveths, + veths) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix dnsmasq/radvd on bridges not being able to be bound to IPv6 address on "recent" kernels
by Benjamin Cama 27 Sep '12

27 Sep '12

Hi, I hit this problem recently when trying to create a bridge with an IPv6 address on a 3.2 kernel: dnsmasq (and, further, radvd) would not bind to the given address (resp. interface), waiting 20s and then giving up with -EADDRNOTAVAIL (resp. exiting immediately with "error parsing or activating the config file", without libvirt noticing it, BTW). This can be reproduced with (I think) any kernel >= 2.6.39 and the following XML (to be used with "virsh net-create"): <network> <name>test-bridge</name> <bridge name='testbr0' /> <ip family='ipv6' address='fd00::1' prefix='64'> </ip> </network> (it happens even when you have an IPv4, too) The problem is that since commit [1] (which, ironically, was made to “help IPv6 autoconfiguration”) the linux bridge code makes bridges behave like “real” devices regarding carrier detection. This makes the bridges created by libvirt, which are started without any up devices, stay with the NO-CARRIER flag set, and thus prevents DAD (Duplicate address detection) from happening, thus letting the IPv6 address flagged as “tentative”. Such addresses cannot be bound to (see RFC 2462), so dnsmasq fails binding to it (for radvd, it detects that "interface XXX is not RUNNING", thus that "interface XXX does not exist, ignoring the interface" (sic)). It seems that this behavior was enhanced somehow with commit [2] by avoiding setting NO-CARRIER on empty bridges, but I couldn't reproduce this behavior on my kernel. Anyway, with the “dummy tap to set MAC address” trick, this wouldn't work. To fix this, the idea is to get the bridge's attached device to be up so that DAD can happen (deactivating DAD altogether is not a good idea, I think). Currently, libvirt creates a dummy TAP device to set the MAC address of the bridge, keeping it down. But even if we set this device up, it is not RUNNING as soon as the tap file descriptor attached to it is closed, thus still preventing DAD. So, we must modify the API a bit, so that we can get the fd, keep the tap device persistent, run the daemons, and close it after DAD has taken place. After that, the bridge will be flagged NO-CARRIER again, but the daemons will be running, even if not happy about the device's state (but we don't really care about the bridge's daemons doing anything when no up interface is connected to it). Other solutions that I envisioned were: * Keeping the *-nic interface up: this would waste an fd for each bridge during all its life. May be acceptable, I don't really know. * Stop using the dummy tap trick, and set the MAC address directly on the bridge: it is possible since quite some time it seems, even if then there is the problem of the bridge not being RUNNING when empty, contrary to what [2] says, so this will need fixing (and this fix only happened in 3.1, so it wouldn't work for 2.6.39) * Using the --interface option of dnsmasq, but I saw somewhere that it's not used by libvirt for backward compatibility. I am not sure this would solve this problem, though, as I don't know how dnsmasq binds itself to it with this option. This is why this patch does what's described earlier. I see radvd yelling quite often in the logs when the interface is NO-CARRIER, but it's ok, it keeps running. Still, this patch is not exactly correct, as radvd get daemonized “too soon” most of the time (i.e. when not debugging libvirtd…) and probes the bridge once it has been set down (even if started before setting it down), thus failing as before (and libvirt lets it be like that: this would need some more checking, maybe). One /may/ introduce some delay between networkStartRadvd() and setting the dummy tap down to solve it, but it seemed too hackish to me. But I couldn't come with a better solution. I would welcome suggestions here. BTW, I removed the “up” argument from virNetDevTapCreateInBridgePort() and virNetDevTapCreate() as all TAP devices are created up now, and I fixed a function name in the docstring. [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=1fa… [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=b64… --- src/network/bridge_driver.c | 15 ++++++++++++++- src/qemu/qemu_command.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/virnetdevtap.c | 29 +++++++++++++++++------------ src/util/virnetdevtap.h | 7 ++++--- 5 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 63338a2..a13efe6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -62,6 +62,7 @@ #include "virnetdev.h" #include "virnetdevbridge.h" #include "virnetdevtap.h" +#include "virfile.h" #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -1693,6 +1694,7 @@ networkStartNetworkVirtual(struct network_driver *driver, virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; char *macTapIfName = NULL; + int tapfd = -1; /* Check to see if any network IP collides with an existing route */ if (networkCheckRouteCollision(network) < 0) @@ -1714,8 +1716,9 @@ networkStartNetworkVirtual(struct network_driver *driver, virReportOOMError(); goto err0; } + /* Keep tun fd open and interface up to allow for IPv6 DAD to happen */ if (virNetDevTapCreateInBridgePort(network->def->bridge, - &macTapIfName, network->def->mac, 0, false, NULL) < 0) { + &macTapIfName, network->def->mac, 0, &tapfd, true) < 0) { VIR_FREE(macTapIfName); goto err0; } @@ -1775,6 +1778,16 @@ networkStartNetworkVirtual(struct network_driver *driver, if (v6present && networkStartRadvd(network) < 0) goto err4; + /* DAD has happened (dnsmasq waits for it), dnsmasq is now bound to the + * bridge's IPv6 address, and radvd to the interface, so we can now set the + * dummy tun down. + */ + if (tapfd >= 0) { + if (virNetDevSetOnline(macTapIfName, false) < 0) + goto err4; + VIR_FORCE_CLOSE(tapfd); + } + if (virNetDevBandwidthSet(network->def->bridge, network->def->bandwidth) < 0) { networkReportError(VIR_ERR_INTERNAL_ERROR, _("cannot set bandwidth limits on %s"), diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 22dc871..08457e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -247,7 +247,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ err = virNetDevTapCreateInBridgePort(brname, &net->ifname, tapmac, - vnet_hdr, true, &tapfd); + vnet_hdr, &tapfd, false); virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); if (err < 0) { if (template_ifname) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index b878622..bd838a6 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -141,7 +141,7 @@ umlConnectTapDevice(virConnectPtr conn, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ if (virNetDevTapCreateInBridgePort(bridge, &net->ifname, tapmac, - 0, true, NULL) < 0) { + 0, NULL, true) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 2ed53c6..3e2c2cc 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -109,18 +109,21 @@ virNetDevProbeVnetHdr(int tapfd) * @ifname: the interface name * @vnet_hr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device + * @persist: if the device persists after the file descriptor is closed * * Creates a tap interface. * If the @tapfd parameter is supplied, the open tap device file - * descriptor will be returned, otherwise the TAP device will be made - * persistent and closed. The caller must use brDeleteTap to remove - * a persistent TAP devices when it is no longer needed. + * descriptor will be returned, otherwise the TAP device will be closed. The + * TAP device will persist after closing the file descriptor if @persist is + * true. The caller must use virNetDevTapDelete to remove a persistent TAP + * devices when it is no longer needed. * * Returns 0 in case of success or an errno code in case of failure. */ int virNetDevTapCreate(char **ifname, int vnet_hdr ATTRIBUTE_UNUSED, - int *tapfd) + int *tapfd, + bool persist) { int fd; struct ifreq ifr; @@ -156,7 +159,7 @@ int virNetDevTapCreate(char **ifname, goto cleanup; } - if (!tapfd && + if (persist && (errno = ioctl(fd, TUNSETPERSIST, 1))) { virReportSystemError(errno, _("Unable to set tap device %s to persistent"), @@ -249,14 +252,16 @@ int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED) * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device + * @persist: if the device persists after the file descriptor is closed * * This function creates a new tap device on a bridge. @ifname can be either * a fixed name or a name template with '%d' for dynamic name allocation. * in either case the final name for the bridge will be stored in @ifname. * If the @tapfd parameter is supplied, the open tap device file - * descriptor will be returned, otherwise the TAP device will be made - * persistent and closed. The caller must use brDeleteTap to remove - * a persistent TAP devices when it is no longer needed. + * descriptor will be returned, otherwise the TAP device will be closed. The + * TAP device will persist after closing the file descriptor if @persist is + * true. The caller must use virNetDevTapDelete to remove a persistent TAP + * devices when it is no longer needed. * * Returns 0 in case of success or -1 on failure */ @@ -264,10 +269,10 @@ int virNetDevTapCreateInBridgePort(const char *brname, char **ifname, const unsigned char *macaddr, int vnet_hdr, - bool up, - int *tapfd) + int *tapfd, + bool persist) { - if (virNetDevTapCreate(ifname, vnet_hdr, tapfd) < 0) + if (virNetDevTapCreate(ifname, vnet_hdr, tapfd, persist) < 0) return -1; /* We need to set the interface MAC before adding it @@ -289,7 +294,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virNetDevBridgeAddPort(brname, *ifname) < 0) goto error; - if (virNetDevSetOnline(*ifname, up) < 0) + if (virNetDevSetOnline(*ifname, true) < 0) goto error; return 0; diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index fb35ac5..6aff641 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -27,7 +27,8 @@ int virNetDevTapCreate(char **ifname, int vnet_hdr, - int *tapfd) + int *tapfd, + bool persist) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevTapDelete(const char *ifname) @@ -37,8 +38,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, char **ifname, const unsigned char *macaddr, int vnet_hdr, - bool up, - int *tapfd) + int *tapfd, + bool persist) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -- Benjamin Cama <benjamin.cama(a)telecom-bretagne.eu>

4 19

[libvirt] [PATCH 0/2] Fixed QEMU 1.0.1 support
by Dmitry Fleytman 27 Sep '12

27 Sep '12

This patch fixes incorrect help screen parsing for QEMU 1.0.1 package Version line changed from QEMU emulator version 1.0 (qemu-kvm-1.0), Copyright (c) 2003-2008 Fabrice Bellard To QEMU emulator version 1.0,1 (qemu-kvm-1.0.1), Copyright (c) 2003-2008 Fabrice Bellard Comma in version number hits parsing logic and leads to incorrect capabilities list. Particularity KVM support capability is not detected making problems in various scenarious. The patch treats the newly added 1 as a micro version number, not sure this is legitimate. Please, correct me if I'm wrong. Signed-off-by: Dmitry Fleytman dmitry(a)daynix.com Dmitry Fleytman (2): Incorrect help screen parsing for QEMU 1.0.1 package fixed Test for QEMU 1.0.1 help screen parsing added src/qemu/qemu_capabilities.c | 13 +- tests/qemuhelpdata/qemu-1.0.1 | 261 +++++++++++++++++++++++++++++++++++ tests/qemuhelpdata/qemu-1.0.1-device | 138 ++++++++++++++++++ tests/qemuhelptest.c | 73 ++++++++++ 4 files changed, 481 insertions(+), 4 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-1.0.1 create mode 100644 tests/qemuhelpdata/qemu-1.0.1-device -- 1.7.11.4

6 17

[libvirt] [PATCH] Support Xen sysctl version 9 in Xen 4.2
by Jim Fehlig 27 Sep '12

27 Sep '12

Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9. Support this sysctl version in the xen_hypervisor sub-driver. --- src/xen/xen_hypervisor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index fdc3071..3244bbd 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) goto done; } + /* Xen 4.2 + * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604 + * domctl version 8 -> unchanged from Xen 4.1 + */ + hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */ + if (virXen_getdomaininfo(fd, 0, &info) == 1) { + hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8"); + goto done; + } + } /* * we failed to make the getdomaininfolist hypercall -- 1.7.10.4

3 2

[libvirt] [PATCH] build: avoid older gcc warning
by Eric Blake 27 Sep '12

27 Sep '12

Jim Fehlig reported a compilation error with older gcc 4.3.4: libvirt.c: In function 'virDomainGetEmulatorPinInfo': libvirt.c:9111: error: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op] It looks like someone programmed via too much copy-and-paste. * src/libvirt.c (virDomainGetEmulatorPinInfo): Multiplying by 1 is a no-op, and thus will never overflow. --- Pushing under the build-breaker rule. src/libvirt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 43591c0..ada9a86 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9108,11 +9108,6 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - if (INT_MULTIPLY_OVERFLOW(1, maplen)) { - virLibDomainError(VIR_ERR_OVERFLOW, _("input too large: 1 * %d"), - maplen); - goto error; - } /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && -- 1.7.11.4

1 0

[libvirt] [PATCH] Don't skip over socket label cleanup
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If QEMU quits immediately after we opened the monitor it was possible we would skip the clearing of the SELinux process socket context Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 70b72af..ade64b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1242,12 +1242,11 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) virDomainObjLock(vm); priv->monStart = 0; - if (mon == NULL) + if (mon == NULL) { virObjectUnref(vm); - - if (!virDomainObjIsActive(vm)) { + } else if (!virDomainObjIsActive(vm)) { qemuMonitorClose(mon); - goto error; + mon = NULL; } priv->mon = mon; -- 1.7.11.2

2 1

[libvirt] [PATCH] Fix potential deadlock when agent is closed
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the qemuAgentClose method is called from a place which holds the domain lock, it is theoretically possible to get a deadlock in the agent destroy callback. This has not ben observed, but the equivalent code in the QEMU monitor destroy callback has seen a deadlock. Remove the redundant locking while unrefing the object and the bogus assignment Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c8c188a..42da617 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -129,7 +129,8 @@ qemuProcessHandleAgentEOF(qemuAgentPtr agent, virDomainObjLock(vm); priv = vm->privateData; - priv->agent = NULL; + if (priv->agent == agent) + priv->agent = NULL; virDomainObjUnlock(vm); qemuDriverUnlock(driver); @@ -167,16 +168,9 @@ qemuProcessHandleAgentError(qemuAgentPtr agent ATTRIBUTE_UNUSED, static void qemuProcessHandleAgentDestroy(qemuAgentPtr agent, virDomainObjPtr vm) { - qemuDomainObjPrivatePtr priv; - VIR_DEBUG("Received destroy agent=%p vm=%p", agent, vm); - virDomainObjLock(vm); - priv = vm->privateData; - if (priv->agent == agent) - priv->agent = NULL; - if (virObjectUnref(vm)) - virDomainObjUnlock(vm); + virObjectUnref(vm); } -- 1.7.11.2

2 1

[libvirt] [PATCH] Use size_t instead of int for virDomainDefPtr struct
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Many parts of virDomainDefPtr were using 'int' variables as array length counts. Replace all these with size_t and update various format strings & API signatures to adapt --- src/conf/domain_conf.c | 28 ++++++++++++++-------------- src/conf/domain_conf.h | 40 ++++++++++++++++++++-------------------- src/lxc/lxc_controller.c | 4 ++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/vbox/vbox_tmpl.c | 8 ++++---- src/vmx/vmx.c | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0514540..33e1e7f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10942,7 +10942,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->ndisks != dst->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain disk count %d does not match source %d"), + _("Target domain disk count %zu does not match source %zu"), dst->ndisks, src->ndisks); goto cleanup; } @@ -10953,7 +10953,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->ncontrollers != dst->ncontrollers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain disk controller count %d does not match source %d"), + _("Target domain disk controller count %zu does not match source %zu"), dst->ncontrollers, src->ncontrollers); goto cleanup; } @@ -10964,7 +10964,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nfss != dst->nfss) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain filesystem count %d does not match source %d"), + _("Target domain filesystem count %zu does not match source %zu"), dst->nfss, src->nfss); goto cleanup; } @@ -10975,7 +10975,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nnets != dst->nnets) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain net card count %d does not match source %d"), + _("Target domain net card count %zu does not match source %zu"), dst->nnets, src->nnets); goto cleanup; } @@ -10986,7 +10986,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->ninputs != dst->ninputs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain input device count %d does not match source %d"), + _("Target domain input device count %zu does not match source %zu"), dst->ninputs, src->ninputs); goto cleanup; } @@ -10997,7 +10997,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nsounds != dst->nsounds) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain sound card count %d does not match source %d"), + _("Target domain sound card count %zu does not match source %zu"), dst->nsounds, src->nsounds); goto cleanup; } @@ -11008,7 +11008,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nvideos != dst->nvideos) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain video card count %d does not match source %d"), + _("Target domain video card count %zu does not match source %zu"), dst->nvideos, src->nvideos); goto cleanup; } @@ -11019,7 +11019,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nhostdevs != dst->nhostdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain host device count %d does not match source %d"), + _("Target domain host device count %zu does not match source %zu"), dst->nhostdevs, src->nhostdevs); goto cleanup; } @@ -11030,7 +11030,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nsmartcards != dst->nsmartcards) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain smartcard count %d does not match source %d"), + _("Target domain smartcard count %zu does not match source %zu"), dst->nsmartcards, src->nsmartcards); goto cleanup; } @@ -11041,7 +11041,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nserials != dst->nserials) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain serial port count %d does not match source %d"), + _("Target domain serial port count %zu does not match source %zu"), dst->nserials, src->nserials); goto cleanup; } @@ -11052,7 +11052,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nparallels != dst->nparallels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain parallel port count %d does not match source %d"), + _("Target domain parallel port count %zu does not match source %zu"), dst->nparallels, src->nparallels); goto cleanup; } @@ -11063,7 +11063,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nchannels != dst->nchannels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain channel count %d does not match source %d"), + _("Target domain channel count %zu does not match source %zu"), dst->nchannels, src->nchannels); goto cleanup; } @@ -11074,7 +11074,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nconsoles != dst->nconsoles) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain console count %d does not match source %d"), + _("Target domain console count %zu does not match source %zu"), dst->nconsoles, src->nconsoles); goto cleanup; } @@ -11085,7 +11085,7 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, if (src->nhubs != dst->nhubs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain hub device count %d does not match source %d"), + _("Target domain hub device count %zu does not match source %zu"), dst->nhubs, src->nhubs); goto cleanup; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1a61318..14dead3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -552,7 +552,7 @@ struct _virDomainDiskDef { char *dst; int tray_status; int protocol; - int nhosts; + size_t nhosts; virDomainDiskHostDefPtr hosts; struct { char *username; @@ -1048,7 +1048,7 @@ struct _virDomainSoundDef { int model; virDomainDeviceInfo info; - int ncodecs; + size_t ncodecs; virDomainSoundCodecDefPtr *codecs; }; @@ -1443,7 +1443,7 @@ struct _virDomainOSDef { char *type; char *arch; char *machine; - int nBootDevs; + size_t nBootDevs; int bootDevs[VIR_DOMAIN_BOOT_LAST]; /* enum virDomainBootMenu */ int bootmenu; @@ -1575,7 +1575,7 @@ struct _virDomainClockDef { char *timezone; } data; - int ntimers; + size_t ntimers; virDomainTimerDefPtr *timers; }; @@ -1695,55 +1695,55 @@ struct _virDomainDef { virDomainClockDef clock; - int ngraphics; + size_t ngraphics; virDomainGraphicsDefPtr *graphics; - int ndisks; + size_t ndisks; virDomainDiskDefPtr *disks; - int ncontrollers; + size_t ncontrollers; virDomainControllerDefPtr *controllers; - int nfss; + size_t nfss; virDomainFSDefPtr *fss; - int nnets; + size_t nnets; virDomainNetDefPtr *nets; - int ninputs; + size_t ninputs; virDomainInputDefPtr *inputs; - int nsounds; + size_t nsounds; virDomainSoundDefPtr *sounds; - int nvideos; + size_t nvideos; virDomainVideoDefPtr *videos; - int nhostdevs; + size_t nhostdevs; virDomainHostdevDefPtr *hostdevs; - int nredirdevs; + size_t nredirdevs; virDomainRedirdevDefPtr *redirdevs; - int nsmartcards; + size_t nsmartcards; virDomainSmartcardDefPtr *smartcards; - int nserials; + size_t nserials; virDomainChrDefPtr *serials; - int nparallels; + size_t nparallels; virDomainChrDefPtr *parallels; - int nchannels; + size_t nchannels; virDomainChrDefPtr *channels; - int nconsoles; + size_t nconsoles; virDomainChrDefPtr *consoles; size_t nleases; virDomainLeaseDefPtr *leases; - int nhubs; + size_t nhubs; virDomainHubDefPtr *hubs; size_t nseclabels; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index d407e70..68f857a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -319,7 +319,7 @@ static int virLXCControllerValidateNICs(virLXCControllerPtr ctrl) { if (ctrl->def->nnets != ctrl->nveths) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("expecting %d veths, but got %zu"), + _("expecting %zu veths, but got %zu"), ctrl->def->nnets, ctrl->nveths); return -1; } @@ -332,7 +332,7 @@ static int virLXCControllerValidateConsoles(virLXCControllerPtr ctrl) { if (ctrl->def->nconsoles != ctrl->nconsoles) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("expecting %d consoles, but got %zu tty file handlers"), + _("expecting %zu consoles, but got %zu tty file handlers"), ctrl->def->nconsoles, ctrl->nconsoles); return -1; } diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 20ee361..a938199 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -222,7 +222,7 @@ parallelsGetSerialInfo(virDomainChrDefPtr chr, } static int -parallelsAddSerialInfo(virDomainChrDefPtr **serials, int *nserials, +parallelsAddSerialInfo(virDomainChrDefPtr **serials, size_t *nserials, const char *key, virJSONValuePtr value) { virDomainChrDefPtr chr = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bcf3081..a738b19 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2090,7 +2090,7 @@ int qemuDomainDetachThisHostDevice(struct qemud_driver *driver, } if (idx >= vm->def->nhostdevs) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("device not found in hostdevs list (%d entries)"), + _("device not found in hostdevs list (%zu entries)"), vm->def->nhostdevs); return ret; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 4f2d025..29b776d 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -3786,7 +3786,7 @@ vboxSetBootDeviceOrder(virDomainDefPtr def, vboxGlobalData *data, VIR_DEBUG("def->os.type %s", def->os.type); VIR_DEBUG("def->os.arch %s", def->os.arch); VIR_DEBUG("def->os.machine %s", def->os.machine); - VIR_DEBUG("def->os.nBootDevs %d", def->os.nBootDevs); + VIR_DEBUG("def->os.nBootDevs %zu", def->os.nBootDevs); VIR_DEBUG("def->os.bootDevs[0] %d", def->os.bootDevs[0]); VIR_DEBUG("def->os.bootDevs[1] %d", def->os.bootDevs[1]); VIR_DEBUG("def->os.bootDevs[2] %d", def->os.bootDevs[2]); @@ -4376,7 +4376,7 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - VIR_DEBUG("Number of Network Cards to be connected: %d", def->nnets); + VIR_DEBUG("Number of Network Cards to be connected: %zu", def->nnets); VIR_DEBUG("Number of Network Cards available: %d", networkAdapterCount); for (i = 0; (i < def->nnets) && (i < networkAdapterCount); i++) { @@ -4538,7 +4538,7 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - VIR_DEBUG("Number of Serial Ports to be connected: %d", def->nserials); + VIR_DEBUG("Number of Serial Ports to be connected: %zu", def->nserials); VIR_DEBUG("Number of Serial Ports available: %d", serialPortCount); for (i = 0; (i < def->nserials) && (i < serialPortCount); i++) { ISerialPort *serialPort = NULL; @@ -4617,7 +4617,7 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - VIR_DEBUG("Number of Parallel Ports to be connected: %d", def->nparallels); + VIR_DEBUG("Number of Parallel Ports to be connected: %zu", def->nparallels); VIR_DEBUG("Number of Parallel Ports available: %d", parallelPortCount); for (i = 0; (i < def->nparallels) && (i < parallelPortCount); i++) { IParallelPort *parallelPort = NULL; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 1ccd931..e051de5 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3299,7 +3299,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, /* def:fss */ if (def->nfss > 0) { virBufferAddLit(&buffer, "isolation.tools.hgfs.disable = \"false\"\n"); - virBufferAsprintf(&buffer, "sharedFolder.maxNum = \"%d\"\n", def->nfss); + virBufferAsprintf(&buffer, "sharedFolder.maxNum = \"%zu\"\n", def->nfss); } for (i = 0; i < def->nfss; ++i) { -- 1.7.11.2

2 1

[libvirt] [PATCH 1/4] parallels: remove unused member 'os' from parallelsDomObj
by Dmitry Guryanov 26 Sep '12

26 Sep '12

Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_utils.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 082ee75..6a27003 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -44,7 +44,6 @@ typedef struct _parallelsConn *parallelsConnPtr; struct parallelsDomObj { int id; char *uuid; - char *os; }; typedef struct parallelsDomObj *parallelsDomObjPtr; -- 1.7.1

3 12

[libvirt] [PATCH] Fix deadlock in handling EOF in LXC monitor
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Depending on the scenario in which LXC containers exit, it is possible for the EOF callback of the LXC monitor to deadlock the driver. When the driver calls virLXCMonitorClose, there is really no need for the EOF callback to be invoked in this case, since the caller can easily handle events itself. In changing this, the monitor needs to take a deep copy of the callback list, not merely a reference. Also adds debug statements in various places to aid troubleshooting Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_monitor.c | 32 ++++++++++++++++++++++---------- src/lxc/lxc_process.c | 6 +++++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 772c613..3e00751 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -40,7 +40,7 @@ struct _virLXCMonitor { virMutex lock; virDomainObjPtr vm; - virLXCMonitorCallbacksPtr cb; + virLXCMonitorCallbacks cb; virNetClientPtr client; virNetClientProgramPtr program; @@ -83,8 +83,8 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virLXCProtocolExitEventMsg *msg = evdata; VIR_DEBUG("Event exit %d", msg->status); - if (mon->cb->exitNotify) - mon->cb->exitNotify(mon, msg->status, mon->vm); + if (mon->cb.exitNotify) + mon->cb.exitNotify(mon, msg->status, mon->vm); } @@ -96,20 +96,25 @@ static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED, virLXCMonitorCallbackEOFNotify eofNotify; virDomainObjPtr vm; - VIR_DEBUG("EOF notify"); + VIR_DEBUG("EOF notify mon=%p", mon); virLXCMonitorLock(mon); - eofNotify = mon->cb->eofNotify; + eofNotify = mon->cb.eofNotify; vm = mon->vm; virLXCMonitorUnlock(mon); - eofNotify(mon, vm); + if (eofNotify) { + VIR_DEBUG("EOF callback mon=%p vm=%p", mon, vm); + eofNotify(mon, vm); + } else { + VIR_DEBUG("No EOF callback"); + } } static void virLXCMonitorCloseFreeCallback(void *opaque) { virLXCMonitorPtr mon = opaque; - virObjectUnref(mon);; + virObjectUnref(mon); } @@ -155,7 +160,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, goto error; mon->vm = vm; - mon->cb = cb; + memcpy(&mon->cb, cb, sizeof(mon->cb)); virObjectRef(mon); virNetClientSetCloseCallback(mon->client, virLXCMonitorEOFNotify, mon, @@ -179,8 +184,8 @@ static void virLXCMonitorDispose(void *opaque) virLXCMonitorPtr mon = opaque; VIR_DEBUG("mon=%p", mon); - if (mon->cb && mon->cb->destroy) - (mon->cb->destroy)(mon, mon->vm); + if (mon->cb.destroy) + (mon->cb.destroy)(mon, mon->vm); virMutexDestroy(&mon->lock); virObjectUnref(mon->program); } @@ -188,7 +193,14 @@ static void virLXCMonitorDispose(void *opaque) void virLXCMonitorClose(virLXCMonitorPtr mon) { + VIR_DEBUG("mon=%p", mon); if (mon->client) { + /* When manually closing the monitor, we don't + * want to have callbacks back into us, since + * the caller is not re-entrant safe + */ + VIR_DEBUG("Clear EOF callback mon=%p", mon); + mon->cb.eofNotify = NULL; virNetClientClose(mon->client); virObjectUnref(mon->client); mon->client = NULL; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index b9cff85..079bc3a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -169,6 +169,8 @@ virLXCProcessReboot(virLXCDriverPtr driver, int ret = -1; virDomainDefPtr savedDef; + VIR_DEBUG("Faking reboot"); + if (conn) { virConnectRef(conn); autodestroy = true; @@ -555,13 +557,15 @@ cleanup: extern virLXCDriverPtr lxc_driver; -static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, +static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon, virDomainObjPtr vm) { virLXCDriverPtr driver = lxc_driver; virDomainEventPtr event = NULL; virLXCDomainObjPrivatePtr priv; + VIR_DEBUG("mon=%p vm=%p", mon, vm); + lxcDriverLock(driver); virDomainObjLock(vm); lxcDriverUnlock(driver); -- 1.7.11.2

2 1

[libvirt] [libvirt-glib PATCHv2 1/3] Implement gvir_config_domain_graphics_vnc_set_socket
by Christophe Fergeau 26 Sep '12

26 Sep '12

--- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 10 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h | 3 +++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 15 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index f2fc9d5..c9fc408 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -76,6 +76,16 @@ gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, } +void gvir_config_domain_graphics_vnc_set_socket(GVirConfigDomainGraphicsVnc *graphics, + const char *socket) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_GRAPHICS_VNC(graphics)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(graphics), + "socket", socket, + NULL); +} + void gvir_config_domain_graphics_vnc_set_autoport(GVirConfigDomainGraphicsVnc *graphics, gboolean autoport) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h index e3183d7..0d3173c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h @@ -62,6 +62,9 @@ GVirConfigDomainGraphicsVnc *gvir_config_domain_graphics_vnc_new(void); GVirConfigDomainGraphicsVnc *gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, GError **error); +void gvir_config_domain_graphics_vnc_set_socket(GVirConfigDomainGraphicsVnc *graphics, + const char *socket); + void gvir_config_domain_graphics_vnc_set_autoport(GVirConfigDomainGraphicsVnc *graphics, gboolean autoport); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index f83eabb..c60cc4e 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -464,6 +464,8 @@ LIBVIRT_GCONFIG_0.1.3 { global: gvir_config_domain_get_current_memory; gvir_config_domain_set_current_memory; + + gvir_config_domain_graphics_vnc_set_socket; } LIBVIRT_GCONFIG_0.1.0; # .... define new API here using predicted next version number .... -- 1.7.11.4

2 5

[libvirt] [PATCH 00/13] parallels: implement operations with hard disks
by Dmitry Guryanov 26 Sep '12

26 Sep '12

This patch series adds ability to list existing disk images, create a new ones and add or remove hard disk devices to the VM. Dmitry Guryanov (13): parallels: add info about hard disk devices parallels: handle disk devices in parallelsDomainDefineXML parallels: split parallelsStorageOpen function parallels: remove unused code from storage driver parallels: create storage pools by VM list parallels: fix leaks in parallelsFindVolumes parallels: add info about volumes parallels: fill volumes capacity parameter parallels: split parallelsStorageVolumeDelete function parallels: add function parallelsGetDiskBusName parallels: add support of disks creation parallels: apply config after VM creation parallels: add support of removing disks src/parallels/parallels_driver.c | 346 +++++++++++++++++++++++++-- src/parallels/parallels_storage.c | 478 +++++++++++++++++++++++++++++++------ src/parallels/parallels_utils.h | 3 + 3 files changed, 731 insertions(+), 96 deletions(-)

1 13

[libvirt] [PATCH] Change qemuSetSchedularParameters to use AFFECT_CURRENT
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When adding variants of parameter setting APIs which accepted flags, the existing APIs were all adapted internally to pass VIR_DOMAIN_AFFECT_CURRENT to the new API. The QEMU impl qemuSetSchedularParameters was an exception, which instead used VIR_DOMAIN_AFFECT_LIVE. Change this to match other compatibility scenarios, so that calling virDomainSetSchedularParameters(dom, params, nparams); Has the same semantics as virDomainSetSchedularParametersFlags(dom, params, nparams, 0); And virDomainSetSchedularParametersFlags(dom, params, nparams, VIR_DOMAIN_AFFECT_CURRENT); Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7ac53ac..d6ecde8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8007,7 +8007,7 @@ qemuSetSchedulerParameters(virDomainPtr dom, return qemuSetSchedulerParametersFlags(dom, params, nparams, - VIR_DOMAIN_AFFECT_LIVE); + VIR_DOMAIN_AFFECT_CURRENT); } static int -- 1.7.11.2

2 1

[libvirt] [PATCH v4] qemu: wait for SPICE to migrate
by Michal Privoznik 26 Sep '12

26 Sep '12

Recently, there have been some improvements made to qemu so it supports seamless migration or something very close to it. However, it requires libvirt interaction. Once qemu is migrated, the SPICE server needs to send its internal state to the destination. Once it's done, it fires SPICE_MIGRATE_COMPLETED event and this fact is advertised in 'query-spice' output as well. We must not kill qemu until SPICE server finishes the transfer. --- diff to v3: -drop wait_for_spice argument in qemuMigrationUpdateJobStatus -refactor wait_for_spice computation -s/VIR_ERR_CONFIG_UNSUPPORTED/VIR_ERR_OPERATION_UNSUPPORTED src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++++ src/qemu/qemu_migration.c | 19 ++++++++++++++- src/qemu/qemu_monitor.c | 24 +++++++++++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ 8 files changed, 111 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3b08ef8..be86014 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -183,6 +183,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "reboot-timeout", /* 110 */ "dump-guest-core", + "seamless-migration", ); struct _qemuCaps { @@ -1149,6 +1150,8 @@ qemuCapsComputeCmdFlags(const char *help, } if (strstr(help, "-spice")) qemuCapsSet(caps, QEMU_CAPS_SPICE); + if (strstr(help, "seamless-migration=")) + qemuCapsSet(caps, QEMU_CAPS_SEAMLESS_MIGRATION); if (strstr(help, "boot=on")) qemuCapsSet(caps, QEMU_CAPS_DRIVE_BOOT); if (strstr(help, "serial=s")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 485c297..9e4543a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -147,6 +147,7 @@ enum qemuCapsFlags { QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ + QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e7bb88e..4e14ae3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6150,6 +6150,14 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->graphics[0]->data.spice.copypaste == VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_NO) virBufferAddLit(&opt, ",disable-copy-paste"); + if (qemuCapsGet(caps, QEMU_CAPS_SEAMLESS_MIGRATION)) { + /* If qemu supports seamless migration turn it + * unconditionally on. If migration destination + * doesn't support it, it fallbacks to previous + * migration algorithm silently. */ + virBufferAddLit(&opt, ",seamless-migration=on"); + } + virCommandAddArg(cmd, "-spice"); virCommandAddArgBuffer(cmd, &opt); if (def->graphics[0]->data.spice.keymap) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8e85875..db69a0a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -896,10 +896,19 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; int status; + bool wait_for_spice = false; + bool spice_migrated = false; unsigned long long memProcessed; unsigned long long memRemaining; unsigned long long memTotal; + /* 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 && + qemuCapsGet(priv->caps, QEMU_CAPS_SEAMLESS_MIGRATION)) + wait_for_spice = true; + ret = qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob); if (ret < 0) { /* Guest already exited; nothing further to update. */ @@ -910,6 +919,13 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, &memProcessed, &memRemaining, &memTotal); + + /* If qemu says migrated, check spice */ + if (wait_for_spice && (ret == 0) && + (status == QEMU_MONITOR_MIGRATION_STATUS_COMPLETED)) + ret = qemuMonitorGetSpiceMigrationStatus(priv->mon, + &spice_migrated); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0 || virTimeMillisNow(&priv->job.info.timeElapsed) < 0) { @@ -939,7 +955,8 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, break; case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED: - priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; + if ((wait_for_spice && spice_migrated) || (!wait_for_spice)) + priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; ret = 0; break; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fa3b7b2..201b1f4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1827,6 +1827,30 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, } +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (mon->json) { + ret = qemuMonitorJSONGetSpiceMigrationStatus(mon, spice_migrated); + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return ret; +} + + int qemuMonitorMigrateToFd(qemuMonitorPtr mon, unsigned int flags, int fd) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6b4eb6f..3455ab9 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -343,6 +343,8 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *transferred, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f372199..c55ee2b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2490,6 +2490,58 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, } +static int +qemuMonitorJSONSpiceGetMigrationStatusReply(virJSONValuePtr reply, + bool *spice_migrated) +{ + virJSONValuePtr ret; + const char *migrated_str; + + if (!(ret = virJSONValueObjectGet(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-spice reply was missing return data")); + return -1; + } + + if (!(migrated_str = virJSONValueObjectGetString(ret, "migrated"))) { + /* Deliberately don't report error here as we are + * probably dealing with older qemu which doesn't + * report this yet. Pretend spice is migrated. */ + *spice_migrated = true; + } else { + *spice_migrated = STREQ(migrated_str, "true"); + } + + return 0; +} + + +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-spice", + NULL); + virJSONValuePtr reply = NULL; + + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + if (ret == 0) + ret = qemuMonitorJSONSpiceGetMigrationStatusReply(reply, + spice_migrated); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index e531eb1..751b81f 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -134,6 +134,9 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri); +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon); -- 1.7.8.6

2 2

[libvirt] [PATCH] Simplify some redundant locking while unref'ing objects
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> There is no need to hold the mutex when unref'ing virObject instances Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 4 +--- src/qemu/qemu_driver.c | 4 ++-- src/rpc/virnetserver.c | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4aa08d0..0514540 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -741,9 +741,7 @@ static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) { virDomainObjPtr obj = payload; - virDomainObjLock(obj); - if (virObjectUnref(obj)) - virDomainObjUnlock(obj); + virObjectUnref(obj); } int virDomainObjListInit(virDomainObjListPtr doms) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6848924..e963ed3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3499,8 +3499,8 @@ endjob: ignore_value(qemuDomainObjEndAsyncJob(driver, wdEvent->vm)); unlock: - if (virObjectUnref(wdEvent->vm)) - virDomainObjUnlock(wdEvent->vm); + virDomainObjUnlock(wdEvent->vm); + virObjectUnref(wdEvent->vm); qemuDriverUnlock(driver); VIR_FREE(wdEvent); } diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 23493bd..ae4ed46 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -191,10 +191,7 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) if (virNetServerProcessMsg(srv, job->client, job->prog, job->msg) < 0) goto error; - virNetServerLock(srv); virObjectUnref(job->prog); - virNetServerUnlock(srv); - virObjectUnref(job->client); VIR_FREE(job); return; -- 1.7.11.2

2 2

[libvirt] [PATCH v3] qemu: wait for SPICE to migrate
by Michal Privoznik 26 Sep '12

26 Sep '12

Recently, there have been some improvements made to qemu so it supports seamless migration or something very close to it. However, it requires libvirt interaction. Once qemu is migrated, the SPICE server needs to send its internal state to the destination. Once it's done, it fires SPICE_MIGRATE_COMPLETED event and this fact is advertised in 'query-spice' output as well. We must not kill qemu until SPICE server finishes the transfer. --- src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++++ src/qemu/qemu_migration.c | 33 ++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 24 +++++++++++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ 8 files changed, 124 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 278b550..26364ec 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -180,6 +180,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ide-drive.wwn", "scsi-disk.wwn", "seccomp-sandbox", + + "seamless-migration", /* 110 */ ); struct _qemuCaps { @@ -1146,6 +1148,8 @@ qemuCapsComputeCmdFlags(const char *help, } if (strstr(help, "-spice")) qemuCapsSet(caps, QEMU_CAPS_SPICE); + if (strstr(help, "seamless-migration=")) + qemuCapsSet(caps, QEMU_CAPS_SEAMLESS_MIGRATION); if (strstr(help, "boot=on")) qemuCapsSet(caps, QEMU_CAPS_DRIVE_BOOT); if (strstr(help, "serial=s")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4da2a29..2567fd7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -145,6 +145,7 @@ enum qemuCapsFlags { QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ + QEMU_CAPS_SEAMLESS_MIGRATION = 110, /* seamless-migration for SPICE */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cbf4aee..33f7e55 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6081,6 +6081,14 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->graphics[0]->data.spice.copypaste == VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_NO) virBufferAddLit(&opt, ",disable-copy-paste"); + if (qemuCapsGet(caps, QEMU_CAPS_SEAMLESS_MIGRATION)) { + /* If qemu supports seamless migration turn it + * unconditionally on. If migration destination + * doesn't support it, it fallbacks to previous + * migration algorithm silently. */ + virBufferAddLit(&opt, ",seamless-migration=on"); + } + virCommandAddArg(cmd, "-spice"); virCommandAddArgBuffer(cmd, &opt); if (def->graphics[0]->data.spice.keymap) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 99fc8ce..114d04a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -891,11 +891,13 @@ static int qemuMigrationUpdateJobStatus(struct qemud_driver *driver, virDomainObjPtr vm, const char *job, - enum qemuDomainAsyncJob asyncJob) + enum qemuDomainAsyncJob asyncJob, + bool wait_for_spice) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; int status; + bool spice_migrated = true; unsigned long long memProcessed; unsigned long long memRemaining; unsigned long long memTotal; @@ -910,6 +912,13 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, &memProcessed, &memRemaining, &memTotal); + + /* If qemu says migrated, check spice */ + if (wait_for_spice && (ret == 0) && + (status == QEMU_MONITOR_MIGRATION_STATUS_COMPLETED)) + ret = qemuMonitorGetSpiceMigrationStatus(priv->mon, + &spice_migrated); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0 || virTimeMillisNow(&priv->job.info.timeElapsed) < 0) { @@ -940,6 +949,8 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED: priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; + if (spice_migrated) + priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; ret = 0; break; @@ -967,6 +978,13 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; const char *job; + bool wait_for_spice; + + /* If guest uses SPICE and supports seamles_migration we have to hold up + * migration finish until SPICE server transfers its data */ + wait_for_spice = (vm->def->ngraphics == 1) && + (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) && + qemuCapsGet(priv->caps, QEMU_CAPS_SEAMLESS_MIGRATION); switch (priv->job.asyncJob) { case QEMU_ASYNC_JOB_MIGRATION_OUT: @@ -988,7 +1006,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm, /* Poll every 50ms for progress & to allow cancellation */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; - if (qemuMigrationUpdateJobStatus(driver, vm, job, asyncJob) < 0) + if (qemuMigrationUpdateJobStatus(driver, vm, job, + asyncJob, wait_for_spice) < 0) goto cleanup; if (dconn && virConnectIsAlive(dconn) <= 0) { @@ -1840,6 +1859,7 @@ qemuMigrationRun(struct qemud_driver *driver, int fd = -1; unsigned long migrate_speed = resource ? resource : priv->migMaxBandwidth; virErrorPtr orig_err = NULL; + bool wait_for_spice; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " @@ -1848,6 +1868,12 @@ qemuMigrationRun(struct qemud_driver *driver, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType); + /* If guest uses SPICE and supports seamless migration we have to hold up + * migration finish until SPICE server transfers its data */ + wait_for_spice = (vm->def->ngraphics == 1) && + (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) && + qemuCapsGet(priv->caps, QEMU_CAPS_SEAMLESS_MIGRATION); + if (virLockManagerPluginUsesState(driver->lockManager) && !cookieout) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1946,7 +1972,8 @@ qemuMigrationRun(struct qemud_driver *driver, * connection from qemu which may never be initiated. */ if (qemuMigrationUpdateJobStatus(driver, vm, _("migration job"), - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + QEMU_ASYNC_JOB_MIGRATION_OUT, + wait_for_spice) < 0) goto cancel; while ((fd = accept(spec->dest.unix_socket.sock, NULL, NULL)) < 0) { diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f36c8a8..7695a81 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1827,6 +1827,30 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, } +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (mon->json) { + ret = qemuMonitorJSONGetSpiceMigrationStatus(mon, spice_migrated); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return ret; +} + + int qemuMonitorMigrateToFd(qemuMonitorPtr mon, unsigned int flags, int fd) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 3ebfa3b..bfbeee8 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -343,6 +343,8 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *transferred, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3a9943..2b77a00 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2490,6 +2490,58 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, } +static int +qemuMonitorJSONSpiceGetMigrationStatusReply(virJSONValuePtr reply, + bool *spice_migrated) +{ + virJSONValuePtr ret; + const char *migrated_str; + + if (!(ret = virJSONValueObjectGet(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-spice reply was missing return data")); + return -1; + } + + if (!(migrated_str = virJSONValueObjectGetString(ret, "migrated"))) { + /* Deliberately don't report error here as we are + * probably dealing with older qemu which doesn't + * report this yet. Pretend spice is migrated. */ + *spice_migrated = true; + } else { + *spice_migrated = STREQ(migrated_str, "true"); + } + + return 0; +} + + +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-spice", + NULL); + virJSONValuePtr reply = NULL; + + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + if (ret == 0) + ret = qemuMonitorJSONSpiceGetMigrationStatusReply(reply, + spice_migrated); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 8e80856..120e2e1 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -134,6 +134,9 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri); +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon); -- 1.7.8.6

2 4

[libvirt] [libvirt-glib PATCHv3] Fix *_new_from_xml
by Christophe Fergeau 26 Sep '12

26 Sep '12

For objects with a subtype 'type' attribute, when the _new_from_xml function was called, the 'type' attribute was forcefully set to the right value rather than checking that the passed-in value matches the type of the subclass we are trying to instantiate. This commit changes this, and returns NULL when the value of the 'type' attribute of the passed-in XML document does not match the expected type. --- libvirt-gconfig/libvirt-gconfig-domain-address-pci.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-address-usb.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-network.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-user.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c | 5 ++++- 13 files changed, 46 insertions(+), 19 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c index 48e3872..9ad7765 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c @@ -67,7 +67,10 @@ GVirConfigDomainAddressPci *gvir_config_domain_address_pci_new_from_xml(const gc object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_ADDRESS_PCI, "address", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "pci", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pci") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_ADDRESS_PCI(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c index 3da5811..cb7a986 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c @@ -67,7 +67,10 @@ GVirConfigDomainAddressUsb *gvir_config_domain_address_usb_new_from_xml(const gc object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_ADDRESS_USB, "address", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "usb", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "usb") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_ADDRESS_USB(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c index 201e123..8b14330 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c @@ -75,7 +75,10 @@ GVirConfigDomainChardevSourcePty *gvir_config_domain_chardev_source_pty_new_from */ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_PTY, "dummy", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "pty", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pty") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_PTY(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c index 22eabf5..10c0ab8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c @@ -75,6 +75,9 @@ GVirConfigDomainChardevSourceSpiceVmc *gvir_config_domain_chardev_source_spicevm */ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_VMC, "dummy", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "spicevmc", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "spicevmc") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_VMC(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c index 1fd248c..d7d7f65 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c @@ -167,7 +167,10 @@ GVirConfigDomainControllerUsb *gvir_config_domain_controller_usb_new_from_xml(co object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER_USB, "controller", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "usb", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "usb") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_CONTROLLER_USB(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 7871ae5..8b22ad0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_sdl_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SDL, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "sdl") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "sdl", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_SDL(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index e60a778..61d3f5b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_spice_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SPICE, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "spice") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "spice", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index d9d1303..f2fc9d5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_VNC, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "vnc") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "vnc", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_VNC(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index ea5eafa..09a7efc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -70,9 +70,10 @@ GVirConfigDomainInterfaceBridge *gvir_config_domain_interface_bridge_new_from_xm object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_BRIDGE, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "bridge") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "bridge", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 1a7bfad..ce39234 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -69,9 +69,10 @@ GVirConfigDomainInterfaceNetwork *gvir_config_domain_interface_network_new_from_ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_NETWORK, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "network") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "network", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index a455a73..4ede31f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -69,8 +69,9 @@ GVirConfigDomainInterfaceUser *gvir_config_domain_interface_user_new_from_xml(co object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_USER, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "user") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "user", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_USER(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c index d75cd30..d5e57f1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c @@ -67,6 +67,9 @@ GVirConfigDomainTimerPit *gvir_config_domain_timer_pit_new_from_xml(const gchar object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_TIMER_PIT, "timer", NULL, xml, error); - gvir_config_object_set_attribute(object, "name", "pit", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pit") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_TIMER_PIT(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c index b99c1e3..64b7f80 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c @@ -67,6 +67,9 @@ GVirConfigDomainTimerRtc *gvir_config_domain_timer_rtc_new_from_xml(const gchar object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_TIMER_RTC, "timer", NULL, xml, error); - gvir_config_object_set_attribute(object, "name", "rtc", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "rtc") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } return GVIR_CONFIG_DOMAIN_TIMER_RTC(object); } -- 1.7.10.4

2 3

[libvirt] [PATCH] Remove pointless virLXCProcessMonitorDestroy method
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Asynchronously setting priv->mon to NULL was pointless, just remove the destroy callback entirely. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_process.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 15572cd..b9cff85 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -554,20 +554,6 @@ cleanup: } -static void virLXCProcessMonitorDestroy(virLXCMonitorPtr mon, - virDomainObjPtr vm) -{ - virLXCDomainObjPrivatePtr priv; - - virDomainObjLock(vm); - priv = vm->privateData; - if (priv->monitor == mon) - priv->monitor = NULL; - if (virObjectUnref(vm)) - virDomainObjUnlock(vm); -} - - extern virLXCDriverPtr lxc_driver; static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) @@ -649,7 +635,6 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED static virLXCMonitorCallbacks monitorCallbacks = { .eofNotify = virLXCProcessMonitorEOFNotify, - .destroy = virLXCProcessMonitorDestroy, .exitNotify = virLXCProcessMonitorExitNotify, }; -- 1.7.11.2

2 1

[libvirt] [PATCH 0/5] Consolidate all code for process interaction
by Daniel P. Berrange 26 Sep '12

26 Sep '12

This series pulls a handful of functions out of command.c and util.c, into virprocess.c, in preparation for adding new process management functions.

2 10

[libvirt] [PATCH] Convert virLXCMonitor to use virObject
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Remove custom reference counting from virLXCMonitor, using virObject instead Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_monitor.c | 63 +++++++++++++++++++++------------------------------ src/lxc/lxc_monitor.h | 4 +--- src/lxc/lxc_process.c | 11 +++------ 3 files changed, 30 insertions(+), 48 deletions(-) diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index dacaab4..772c613 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -35,9 +35,9 @@ #define VIR_FROM_THIS VIR_FROM_LXC struct _virLXCMonitor { - int refs; + virObject parent; - virMutex lock; /* also used to protect refs */ + virMutex lock; virDomainObjPtr vm; virLXCMonitorCallbacksPtr cb; @@ -46,7 +46,21 @@ struct _virLXCMonitor { virNetClientProgramPtr program; }; -static void virLXCMonitorFree(virLXCMonitorPtr mon); +static virClassPtr virLXCMonitorClass; +static void virLXCMonitorDispose(void *obj); + +static int virLXCMonitorOnceInit(void) +{ + if (!(virLXCMonitorClass = virClassNew("virLXCMonitor", + sizeof(virLXCMonitor), + virLXCMonitorDispose))) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virLXCMonitor) + static void virLXCMonitorHandleEventExit(virNetClientProgramPtr prog, virNetClientPtr client, @@ -95,9 +109,7 @@ static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED, static void virLXCMonitorCloseFreeCallback(void *opaque) { virLXCMonitorPtr mon = opaque; - virLXCMonitorLock(mon); - if (virLXCMonitorUnref(mon) > 0) - virLXCMonitorUnlock(mon); + virObjectUnref(mon);; } @@ -108,12 +120,11 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, virLXCMonitorPtr mon; char *sockpath = NULL; - if (VIR_ALLOC(mon) < 0) { - virReportOOMError(); + if (virLXCMonitorInitialize() < 0) return NULL; - } - mon->refs = 1; + if (!(mon = virObjectNew(virLXCMonitorClass))) + return NULL; if (virMutexInit(&mon->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -146,7 +157,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, mon->vm = vm; mon->cb = cb; - virLXCMonitorRef(mon); + virObjectRef(mon); virNetClientSetCloseCallback(mon->client, virLXCMonitorEOFNotify, mon, virLXCMonitorCloseFreeCallback); @@ -157,43 +168,21 @@ cleanup: no_memory: virReportOOMError(); error: - virLXCMonitorFree(mon); + virObjectUnref(mon); mon = NULL; goto cleanup; } -static void virLXCMonitorFree(virLXCMonitorPtr mon) +static void virLXCMonitorDispose(void *opaque) { - VIR_DEBUG("mon=%p", mon); - if (mon->client) - virLXCMonitorClose(mon); + virLXCMonitorPtr mon = opaque; + VIR_DEBUG("mon=%p", mon); if (mon->cb && mon->cb->destroy) (mon->cb->destroy)(mon, mon->vm); virMutexDestroy(&mon->lock); virObjectUnref(mon->program); - VIR_FREE(mon); -} - - -int virLXCMonitorRef(virLXCMonitorPtr mon) -{ - mon->refs++; - return mon->refs; -} - -int virLXCMonitorUnref(virLXCMonitorPtr mon) -{ - mon->refs--; - - if (mon->refs == 0) { - virLXCMonitorUnlock(mon); - virLXCMonitorFree(mon); - return 0; - } - - return mon->refs; } diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index 806a6c6..bb8349a 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -21,6 +21,7 @@ #ifndef __LXC_MONITOR_H__ # define __LXC_MONITOR_H__ +# include "virobject.h" # include "domain_conf.h" # include "lxc_protocol.h" @@ -54,7 +55,4 @@ void virLXCMonitorClose(virLXCMonitorPtr mon); void virLXCMonitorLock(virLXCMonitorPtr mon); void virLXCMonitorUnlock(virLXCMonitorPtr mon); -int virLXCMonitorRef(virLXCMonitorPtr mon); -int virLXCMonitorUnref(virLXCMonitorPtr mon); - #endif /* __LXC_MONITOR_H__ */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 84128d1..15572cd 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -238,9 +238,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, if (priv->monitor) { virLXCMonitorClose(priv->monitor); - virLXCMonitorLock(priv->monitor); - if (virLXCMonitorUnref(priv->monitor) > 0) - virLXCMonitorUnlock(priv->monitor); + virObjectUnref(priv->monitor); priv->monitor = NULL; } @@ -675,8 +673,7 @@ static virLXCMonitorPtr virLXCProcessConnectMonitor(virLXCDriverPtr driver, if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) { if (monitor) { - virLXCMonitorLock(monitor); - virLXCMonitorUnref(monitor); + virObjectUnref(monitor); monitor = NULL; } goto cleanup; @@ -1198,9 +1195,7 @@ cleanup: } if (rc != 0) { if (priv->monitor) { - virLXCMonitorLock(priv->monitor); - if (virLXCMonitorUnref(priv->monitor) > 0) - virLXCMonitorUnlock(priv->monitor); + virObjectUnref(priv->monitor); priv->monitor = NULL; } virDomainConfVMNWFilterTeardown(vm); -- 1.7.11.2

2 1

[libvirt] [PATCH] Fix start of containers with custom root filesystem
by Daniel P. Berrange 26 Sep '12

26 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> A prefix change to unmount the SELinux filesystem broke starting of LXC containers with a custom root filesystem Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a749d24..4bb2aff 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1191,6 +1191,8 @@ static int lxcContainerGetSubtree(const char *prefix, char **mounts = NULL; size_t nmounts = 0; + VIR_DEBUG("prefix=%s", prefix); + *mountsret = NULL; *nmountsret = 0; @@ -1528,7 +1530,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ - if (lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) + if (STREQ(root->src, "/") && + lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) goto cleanup; #endif -- 1.7.11.2

2 1

[libvirt] [PATCH 00/23 v2] Add support for detecting QEMU capabilities via QMP
by Daniel P. Berrange 26 Sep '12

26 Sep '12

This is a followup to https://www.redhat.com/archives/libvir-list/2012-September/msg00643.html As of QEMU 1.2 libvirt is supposed to stop parsing -help and instead use various QMP commands to detect capabilities. Before we can do this, the current QEMU capabilities code needs a serious cleanup and some refactoring. The first half of this series does that major preparation work, and the rest adds the new monitor commands and finally uses them to detect capabilities. Currently we consider "capabilities" to just refer to flags we detect from -help. This series expands to cover all the things we detect from QEMU, specifically including machine types, CPU definitions and architecture. It introduces a single object to track all this data and a centralized caching mechanism so we never re-query data we already have somewhere. b/src/conf/capabilities.h | 1 b/src/qemu/qemu_capabilities.c | 1813 ++++++---- b/src/qemu/qemu_capabilities.h | 47 b/src/qemu/qemu_command.c | 113 b/src/qemu/qemu_command.h | 6 b/src/qemu/qemu_conf.h | 2 b/src/qemu/qemu_driver.c | 211 - b/src/qemu/qemu_monitor.c | 197 + b/src/qemu/qemu_monitor.h | 42 b/src/qemu/qemu_monitor_json.c | 707 +++ b/src/qemu/qemu_monitor_json.h | 36 b/src/qemu/qemu_process.c | 26 b/tests/qemuhelptest.c | 2 b/tests/qemumonitorjsontest.c | 303 + b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 2 b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args | 2 b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml | 2 b/tests/qemuxml2argvtest.c | 66 b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml | 2 b/tests/qemuxmlnstest.c | 7 tests/qemuxml2argvdata/qemu-lib.sh | 50 tests/qemuxml2argvdata/qemu-supported-cpus.sh | 15 tests/qemuxml2argvdata/qemu.sh | 15 67 files changed, 2499 insertions(+), 1256 deletions(-)

3 31