- Devel - libvirt List Archives

[libvirt] libvirt plans: dns support for IPv6?
by Gene Czarcinski 17 Sep '12

17 Sep '12

I would like to know what the plans are for supporting dns for virtual guests with only IPv6. My objective is to be able to reference a virtual guest for the host ... doing ssh, scp, etc. such functions work just fine if you specify the ip-address but, after a while, those ip-addresses are difficult to remember ... afterall, that is why dns exists. For IPv4, with a some patches to libvert implementing "--local=/virt/ --domain-needed" if "--domain virt" is specified, I am now able to ssh to guests by name. The additions needed are to run the NetworkManager supporting "--conf-dir=/etc/NetworkManager/dnsmasq.d/" (or patch it like I did), and add a file specifying the dnsmasq on the virtual NIC. For example, server=/virt/,192.168.122.1 will forward queries. Alternatively, you can run yet another dnsmasq on the host which just passes queries to the dnsmasq and modify your upstream dns server to forward any queries for the virtual domains to the dnsmasq on the host. IPv6 is another situation entirely. And it may be even more important to have dns support because if IPv4 address are difficult to remember, IPv6 are practically impossible. So, are there any plans for providing dns on the IPv6 virtual networks? I can see a couple of solutions and each has pluses and minuses. 1. Do it the same way the it is done for IPv4. The current version of dnsmasq (2.63) supports dhcp for IPv6 and, IIRC, has since 2.61. I realize that you need to continue support of libvirt on RHEL 6 and possibly others that are running an old version of dnsmasq, but isn't it time to move along? While you can manually configure IPv6 interfaces so that you can add the definitions to a /etc/host file, this is not a good approach from my perspective. The use of dnsmasq also allows specification of different domains for each virtual IPv6 network. 2. There is another approach and it would be useful for both dnsmasq and this approach be available. That is, continue to use radvd and have the virtual guests autoconf the ip addresses. Then use mDNS (avahi and nss-mdns) to support access by name. This does not require doing anything about dnsmasq. In fact, it is possible thatyou do not need it at all. In addition, the plans for Fedora 18 are to make mDNS the default for Desktop installs [I am not sure what that means]. A big problem is that there is only a single domain which is ".local" by default. An even bigger problem is that ssh (openssh) has an error if a mDNS name is specified. I noticed that Daniel Berrange has put in a bugzilla request that dnsmasq be updated. If someone is already coding up patches to add dhcp for IPv6 or will "real soon now", I will be happy to test it. Otherwise, I could take a shot at coming up with the patches. Gene

3 7

[libvirt] [V2 PATCH 0/3] Transport Open vSwitch per-port data during live migration
by Kyle Mestery 15 Sep '12

15 Sep '12

This series of commits has the end goal of allowing per-port data stored in the Open vSwitch DB to be transported during live migration. This is done by first providing a generic infrastructure for transporting network data, adding some utility functions specific to Open vSwitch, and hooking the two together. The framework provided is generic in that other networking data could be transferred as well by simply adding in additional hooks as needed. ---- V2 of this patch series fixes some issues found when migrating VMs on standard Linux bridges. Kyle Mestery (3): Add the ability for the Qemu V3 migration protocol to include transporting network configuration. A generic framework is proposed with this patch to allow for the transfer of opaque data. Add utility functions for Open vSwitch to both save per-port data before a live migration, and restore the per-port data after a live migration. Transport Open vSwitch per-port data during live migration by using the utility functions virNetDevOpenvswitchGetMigrateData() and virNetDevOpenvswitchSetMigrateData(). src/libvirt_private.syms | 2 + src/qemu/qemu_migration.c | 291 +++++++++++++++++++++++++++++++++++++++- src/util/virnetdevopenvswitch.c | 71 ++++++++++ src/util/virnetdevopenvswitch.h | 6 + 4 files changed, 368 insertions(+), 2 deletions(-) -- 1.7.11.4

3 5

[libvirt] [PATCH 0/3] Transport Open vSwitch per-port data during live migration
by Kyle Mestery 15 Sep '12

15 Sep '12

This series of commits has the end goal of allowing per-port data stored in the Open vSwitch DB to be transported during live migration. This is done by first providing a generic infrastructure for transporting network data, adding some utility functions specific to Open vSwitch, and hooking the two together. The framework provided is generic in that other networking data could be transferred as well by simply adding in additional hooks as needed. Kyle Mestery (3): Add the ability for the Qemu V3 migration protocol to include transporting network configuration. A generic framework is proposed with this patch to allow for the transfer of opaque data. Add utility functions for Open vSwitch to both save per-port data before a live migration, and restore the per-port data after a live migration. Transport Open vSwitch per-port data during live migration by using the utility functions virNetDevOpenvswitchGetMigrateData() and virNetDevOpenvswitchSetMigrateData(). cfg.mk | 9 + configure.ac | 36 +- docs/formatdomain.html.in | 45 +- docs/schemas/domaincommon.rng | 75 ++- src/conf/domain_conf.c | 394 +++++++++++- src/conf/domain_conf.h | 32 + src/esx/esx_util.c | 7 +- src/libvirt.c | 20 +- src/libvirt_private.syms | 5 + src/parallels/parallels_driver.c | 133 +++- src/qemu/qemu_capabilities.c | 679 +++++++++++++++------ src/qemu/qemu_capabilities.h | 49 +- src/qemu/qemu_command.c | 660 +++++++++++--------- src/qemu/qemu_command.h | 56 +- src/qemu/qemu_domain.c | 16 +- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 50 +- src/qemu/qemu_hotplug.c | 141 ++--- src/qemu/qemu_migration.c | 295 ++++++++- src/qemu/qemu_monitor.c | 114 ++-- src/qemu/qemu_monitor.h | 10 +- src/qemu/qemu_monitor_json.c | 77 ++- src/qemu/qemu_monitor_json.h | 5 +- src/qemu/qemu_monitor_text.c | 335 +++------- src/qemu/qemu_process.c | 62 +- src/rpc/virnetserverprogram.c | 11 +- src/rpc/virnettlscontext.c | 6 +- src/util/bitmap.c | 19 + src/util/bitmap.h | 6 + src/util/virnetdevopenvswitch.c | 71 +++ src/util/virnetdevopenvswitch.h | 6 + src/vbox/vbox_tmpl.c | 14 +- src/vmware/vmware_driver.c | 4 +- tests/Makefile.am | 10 +- .../domain-parallels-ct-simple.xml | 27 + tests/qemuhelptest.c | 16 +- tests/qemumonitortestutils.c | 12 +- .../qemuxml2argv-cpu-eoi-disabled.args | 4 + .../qemuxml2argv-cpu-eoi-disabled.xml | 28 + .../qemuxml2argv-cpu-eoi-enabled.args | 4 + .../qemuxml2argv-cpu-eoi-enabled.xml | 28 + .../qemuxml2argv-eoi-disabled.args | 4 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 25 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 4 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 25 + .../qemuxml2argv-usb-redir-filter.args | 10 + .../qemuxml2argv-usb-redir-filter.xml | 45 ++ tests/qemuxml2argvtest.c | 23 +- tests/qemuxml2xmltest.c | 6 + tests/qemuxmlnstest.c | 6 +- tests/undefine | 72 --- tests/virsh-undefine | 72 +++ tools/virsh-domain.c | 4 +- tools/virsh-network.c | 8 +- tools/virsh-pool.c | 8 +- tools/virsh-volume.c | 8 +- 56 files changed, 2678 insertions(+), 1217 deletions(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml delete mode 100755 tests/undefine create mode 100755 tests/virsh-undefine -- 1.7.11.4

3 5

[libvirt] [PATCH 1/2] build: allow building with newer glibc-headers and -O0
by Christophe Fergeau 15 Sep '12

15 Sep '12

Fix copied from libvirt, commit by Eric Blake. glibc 2.15 (on Fedora 17) coupled with explicit disabling of optimization during development dies a painful death: /usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] Work around this by only conditionally defining _FORTIFY_SOURCE, in the case where glibc can actually use it. The trick is using AH_VERBATIM instead of AC_DEFINE. --- m4/virt-compile-warnings.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index d403587..913abca 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -84,8 +84,12 @@ AC_DEFUN([LIBVIRT_DESIGNER_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) # Use improved glibc headers - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.7.11.4

3 4

[libvirt] [PATCH RFC] network: define new API virNetworkUpdate
by Laine Stump 15 Sep '12

15 Sep '12

This patch adds a new public API virNetworkUpdate that will permit updating an existing network configuration without requiring that the network be destroyed/restarted for the changes to take effect. --- an example of use: to add a dhcp host entry to network "net", you would do this: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55' ip='192.168.122.5'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_ADD_LAST); To delete that same entry: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_DELETE); If you wanted to force any of these to affect the dhcp host list in the 3rd <ip> element of the network, you would replace "-1" with "2". I'm still working on an example of one of the backends of this, but need eyeballs on the API, since that's the most critical part before the freeze. I would appreciate anyone with a few spare minutes who can take a look. Differences from email thread: 1) Aside from being actual code instead of just pseudo code, I've changed the "index" arg into "parentIndex" to avoid confusion between the index of the element we're looking at (e.g. which host in the list of hosts in a <dhcp> element) and the index of the parent (e.g. which <ip> element will contain the <dhcp> with the list of <hosts> we want to update). I also changed this from a unsigned into to an int so that it can hold the special value "-1", which means "pick the most useful/only item". Again, in the case of VIR_NETWORK_SECTION_IP_DHCP_HOST, this would mean to pick the one <ip> element that actually has a <dhcp> section (may not be the first, but there can only be one). I'll follow with a backend implementation of at least one of the update sections as soon as I get all the underlying utility functions working properly. 2) added VIR_NETWORK_UPDATE_AFFECT_CURRENT similar to VIR_DOMAIN_AFFECT_CURRENT include/libvirt/libvirt.h.in | 50 ++++++++++++++++++++++++++++++++++++ src/driver.h | 7 ++++++ src/libvirt.c | 60 +++++++++++++++++++++++++++++++++++++++++++- src/libvirt_public.syms | 1 + 4 files changed, 117 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index b0d34c5..d91e6c2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2328,6 +2328,56 @@ virNetworkPtr virNetworkDefineXML (virConnectPtr conn, int virNetworkUndefine (virNetworkPtr network); /* + * virNetworkUpdateSection: + * + * describes which section of a <network> definition the provided + * xml should be applied to. + * + */ +typedef enum { + VIR_NETWORK_SECTION_BRIDGE = 0, + VIR_NETWORK_SECTION_DOMAIN = 1, + VIR_NETWORK_SECTION_IP = 2, + VIR_NETWORK_SECTION_IP_DHCP_HOST = 3, + VIR_NETWORK_SECTION_IP_DHCP_RANGE = 4, + VIR_NETWORK_SECTION_FORWARD = 5, + VIR_NETWORK_SECTION_FORWARD_INTERFACE = 6, + VIR_NETWORK_SECTION_FORWARD_PF = 7, + VIR_NETWORK_SECTION_PORTGROUP = 8, + VIR_NETWORK_SECTION_DNS_HOST = 9, + VIR_NETWORK_SECTION_DNS_TXT = 10, + VIR_NETWORK_SECTION_DNS_SRV = 11, +#ifdef VIR_ENUM_SENTINELS + VIR_NETWORK_SECTION_LAST +#endif +} virNetworkUpdateSection; + +/* + * virNetworkUpdateFlags: + * + * Used to specify what type of operation to perform, and whether to + * affect live network, persistent config, or both. + */ +typedef enum { + VIR_NETWORK_UPDATE_AFFECT_CURRENT = 0, + VIR_NETWORK_UPDATE_AFFECT_LIVE = 1 << 0, + VIR_NETWORK_UPDATE_AFFECT_CONFIG = 1 << 1, + VIR_NETWORK_UPDATE_EXISTING = 1 << 2, + VIR_NETWORK_UPDATE_DELETE = 1 << 3, + VIR_NETWORK_UPDATE_ADD_LAST = 1 << 4, + VIR_NETWORK_UPDATE_ADD_FIRST = 1 << 5, + } virNetworkUpdateFlags; + +/* + * Update an existing network definition + */ +int virNetworkUpdate(virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); + +/* * Activate persistent network */ int virNetworkCreate (virNetworkPtr network); diff --git a/src/driver.h b/src/driver.h index 534da05..958712a 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1101,6 +1101,12 @@ typedef virNetworkPtr typedef int (*virDrvNetworkUndefine) (virNetworkPtr network); typedef int + (*virDrvNetworkUpdate) (virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); +typedef int (*virDrvNetworkCreate) (virNetworkPtr network); typedef int (*virDrvNetworkDestroy) (virNetworkPtr network); @@ -1150,6 +1156,7 @@ struct _virNetworkDriver { virDrvNetworkCreateXML networkCreateXML; virDrvNetworkDefineXML networkDefineXML; virDrvNetworkUndefine networkUndefine; + virDrvNetworkUpdate networkUpdate; virDrvNetworkCreate networkCreate; virDrvNetworkDestroy networkDestroy; virDrvNetworkGetXMLDesc networkGetXMLDesc; diff --git a/src/libvirt.c b/src/libvirt.c index 5639850..133fbf5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10207,7 +10207,7 @@ error: * @conn: pointer to the hypervisor connection * @xml: the XML description for the network, preferably in UTF-8 * - * Define a network, but does not create it + * Define a network, but do not create it. * * Returns NULL in case of error, a pointer to the network otherwise */ @@ -10286,6 +10286,64 @@ error: } /** + * virNetworkUpdate: + * @network: pointer to a defined network + * @section: which section of the network to update + * (virNetworkUpdateSection) + * @index: which parent element if there are multiple parents + * of the same type (e.g. which <ip> element when + * modifying a <dhcp> element) + * @xml: the XML description for the network, preferably in UTF-8 + * @flags: bitwise or of virNetworkDefineFlags (currently must be 0). + * + * Update the definition of an existing network, either its live + * running state, its persistent configuration, or both. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkUpdate(virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DEBUG("network=%p, section=%d, parentIndex=%d, xml=%s, flags=0x%x", + network, section, parentIndex, xml, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + virCheckNonNullArgGoto(xml, error); + + if (conn->networkDriver && conn->networkDriver->networkUpdate) { + int ret; + ret = conn->networkDriver->networkUpdate(network, section, + parentIndex, xml, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(network->conn); + return -1; +} + +/** * virNetworkCreate: * @network: pointer to a defined network * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 6ff5a77..f953f67 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -558,6 +558,7 @@ LIBVIRT_0.10.2 { global: virConnectListAllNetworks; virConnectListAllStoragePools; + virNetworkUpdate; virStoragePoolListAllVolumes; } LIBVIRT_0.10.0; -- 1.7.11.4

1 0

[libvirt] [PATCH 0/8] Hostdev-hybrid patches
by Shradha Shah 15 Sep '12

15 Sep '12

This patch series adds the support for interface-type="hostdev-hybrid" and forward mode="hostdev-hybrid". The hostdev-hybrid mode makes migration possible along with PCI-passthrough. I had posted a RFC on the hostdev-hybrid methodology earlier on the libvirt mailing list. The RFC can be found here: https://www.redhat.com/archives/libvir-list/2012-February/msg00309.html Shradha Shah (8): RNG updates, new xml parser/formatter code for interface type=hostdev-hybrid RNG updates, new xml parser/formatter code for forward mode=hostdev-hybrid Hostdev-hybrid mode requires a direct linkdev and direct mode. ActualParent is used to store the information about the NETDEV. network: support hostdev-hybrid in network driver qemu: support netdevs from hostdev-hybrid networks Using the Ephemeral Flag to prepare for Migration Support. Migration support for hostdev-hybrid. docs/formatdomain.html.in | 29 ++++ docs/formatnetwork.html.in | 46 ++++++ docs/schemas/domaincommon.rng | 50 ++++++ docs/schemas/network.rng | 1 + include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 167 +++++++++++++++++--- src/conf/domain_conf.h | 8 + src/conf/network_conf.c | 9 +- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 123 +++++++++++++-- src/qemu/qemu_command.c | 61 +++++++ src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hostdev.c | 158 +++++++++++++------ src/qemu/qemu_hotplug.c | 26 +++- src/qemu/qemu_migration.c | 106 ++++++++++++- src/qemu/qemu_process.c | 3 +- src/uml/uml_conf.c | 5 + src/util/pci.c | 2 +- src/util/pci.h | 2 + src/util/virnetdev.c | 40 +++++ src/util/virnetdev.h | 6 + src/xenxs/xen_sxpr.c | 1 + tests/networkxml2xmlin/hostdev-hybrid-pf.xml | 7 + tests/networkxml2xmlin/hostdev-hybrid.xml | 10 ++ tests/networkxml2xmlout/hostdev-hybrid-pf.xml | 7 + tests/networkxml2xmlout/hostdev-hybrid.xml | 10 ++ tests/networkxml2xmltest.c | 2 + .../qemuxml2argv-net-hostdevhybrid.args | 8 + .../qemuxml2argv-net-hostdevhybrid.xml | 35 ++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-net-hostdevhybrid.xml | 40 +++++ tests/qemuxml2xmltest.c | 1 + 35 files changed, 884 insertions(+), 99 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-hybrid-pf.xml create mode 100644 tests/networkxml2xmlin/hostdev-hybrid.xml create mode 100644 tests/networkxml2xmlout/hostdev-hybrid-pf.xml create mode 100644 tests/networkxml2xmlout/hostdev-hybrid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdevhybrid.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdevhybrid.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdevhybrid.xml -- 1.7.4.4

4 22

[libvirt] [PATCH v4 0/5] Per-guest configurable user/group for QEMU processes
by Marcelo Cerri 14 Sep '12

14 Sep '12

This is a v4 patch series that updates the libvirt's security driver mechanism to support per-guest configurable user and group for QEMU processes running together with other security drivers, such as SELinux and AppArmor. Marcelo Cerri (5): Internal refactory of data structures Multiple security drivers in XML data Update security layer to handle many security labels Support for multiple default security drivers in QEMU config Update the remote API daemon/remote.c | 63 ++++ docs/formatdomain.html.in | 11 +- docs/schemas/capability.rng | 18 +- docs/schemas/domaincommon.rng | 30 ++- include/libvirt/libvirt.h.in | 2 + python/generator.py | 1 + src/conf/capabilities.c | 17 +- src/conf/capabilities.h | 6 +- src/conf/domain_audit.c | 14 +- src/conf/domain_conf.c | 343 +++++++++++++++----- src/conf/domain_conf.h | 20 +- src/driver.h | 4 + src/libvirt.c | 47 +++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 1 + src/lxc/lxc_conf.c | 8 +- src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 11 +- src/lxc/lxc_process.c | 23 +- src/qemu/qemu.conf | 6 +- src/qemu/qemu_conf.c | 38 ++- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 218 +++++++++++--- src/qemu/qemu_process.c | 50 ++- src/remote/remote_driver.c | 46 +++ src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 11 + src/security/security_apparmor.c | 118 +++++-- src/security/security_dac.c | 324 +++++++++++++++++-- src/security/security_manager.c | 101 +++++-- src/security/security_manager.h | 8 +- src/security/security_selinux.c | 263 +++++++++++----- src/security/security_stack.c | 237 +++++++++----- src/security/security_stack.h | 13 + src/test/test_driver.c | 11 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 4 +- .../qemuxml2argv-seclabel-dynamic.xml | 2 +- 37 files changed, 1653 insertions(+), 448 deletions(-)

5 20

[libvirt] [PATCH] svirt: Label serial sockets (RHBZ#853393).
by Richard W.M. Jones 14 Sep '12

14 Sep '12

From: "Richard W.M. Jones" <rjones(a)redhat.com> libvirt skips labelling these, for unknown reasons. This breaks libguestfs. Adding this and some SELinux rules (RHBZ#857453) fixes everything for me. --- src/security/security_selinux.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index a7e2420..c3b33f8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1230,6 +1230,7 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_UNIX: ret = virSecuritySELinuxSetFilecon(dev->data.file.path, secdef->imagelabel); break; @@ -1280,6 +1281,7 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virDomainDefPtr def, switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_UNIX: if (virSecuritySELinuxRestoreSecurityFileLabel(dev->data.file.path) < 0) goto done; ret = 0; @@ -1318,11 +1320,6 @@ virSecuritySELinuxRestoreSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, void *opaque ATTRIBUTE_UNUSED) { - /* This is taken care of by processing of def->serials */ - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - dev->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) - return 0; - return virSecuritySELinuxRestoreSecurityChardevLabel(def, &dev->source); } @@ -1698,11 +1695,6 @@ virSecuritySELinuxSetSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, void *opaque ATTRIBUTE_UNUSED) { - /* This is taken care of by processing of def->serials */ - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - dev->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) - return 0; - return virSecuritySELinuxSetSecurityChardevLabel(def, &dev->source); } -- 1.7.10.4

2 2

[libvirt] [PATCH] qemu: fix uninitialized variable in qemuParseCommandLine
by Ján Tomko 14 Sep '12

14 Sep '12

Newly added if branch for kvm_pv_eoi did not set the ret variable. --- src/qemu/qemu_command.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec825bc..d0c8e22 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7655,7 +7655,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, else if (*p == '+' || *p == '-') { char *feature; int policy; - int ret; + int ret = 0; if (*p == '+') policy = VIR_CPU_FEATURE_REQUIRE; @@ -7702,7 +7702,6 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, goto error; } dom->clock.timers[i]->present = present; - ret = 0; } else if (STREQ(feature, "kvm_pv_eoi")) { if (policy == VIR_CPU_FEATURE_REQUIRE) dom->apic_eoi = VIR_DOMAIN_APIC_EOI_ON; -- 1.7.8.6

2 2

[libvirt] [PATCH 00/20] Prepare QEMU capabilities for detection via QMP
by Daniel P. Berrange 14 Sep '12

14 Sep '12

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. This series does that major preparation work. 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.

2 45

[libvirt] [PATCH 0/2] tell dnsmasq not to forward PTR queries
by gene＠czarc.net 14 Sep '12

14 Sep '12

From: Gene Czarcinski <gene(a)czarc.net> For networks which dnsmasq has "--listen-address" specified, add the command line parameter so that any dns PTR queries for those networks are not forwarded. There are separate patches for IPv4 and IPv6. Gene Czarcinski (2): IPV4 local=/....in-addr.arpa/ IPv6 local=/...ip6.arpa/ src/network/bridge_driver.c | 32 ++++++++++++++++++++++ tests/networkxml2argvdata/isolated-network.argv | 1 + .../networkxml2argvdata/nat-network-dns-hosts.argv | 1 + .../nat-network-dns-srv-record-minimal.argv | 5 ++++ .../nat-network-dns-srv-record.argv | 5 ++++ .../nat-network-dns-txt-record.argv | 11 ++++++-- tests/networkxml2argvdata/nat-network.argv | 18 ++++++++++-- tests/networkxml2argvdata/nat-network.xml | 4 +++ tests/networkxml2argvdata/netboot-network.argv | 1 + .../networkxml2argvdata/netboot-proxy-network.argv | 1 + tests/networkxml2argvdata/routed-network.argv | 3 +- 11 files changed, 76 insertions(+), 6 deletions(-) -- 1.7.11.4

2 3

[libvirt] [PATCH] fix memory leak in virCopyLastError
by Hu Tao 14 Sep '12

14 Sep '12

memset before virResetError will cause memory leak. virResetError and virCopyError, which calls virResetError, will do memset properly, so we don't have to worry about it here. --- src/util/virterror.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 7caa69e..46afd37 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -276,8 +276,6 @@ int virCopyLastError(virErrorPtr to) { virErrorPtr err = virLastErrorObject(); - /* We can't guarantee caller has initialized it to zero */ - memset(to, 0, sizeof(*to)); if (err) virCopyError(err, to); else -- 1.7.10.2

3 5

[libvirt] [PATCH 0/6 v2] New APIs to get/set node memory parameters
by Osier Yang 14 Sep '12

14 Sep '12

v1: https://www.redhat.com/archives/libvir-list/2012-September/msg00517.html v1 - v2: * Rename virNode{Get,Set}SharedMemoryParameters to virNode{Get,Set}MemoryParameters, in case of we could add more node memory tunables in future. As a result of RFC: https://www.redhat.com/archives/libvir-list/2012-August/msg01998.html, this adds two new APIs (virNode{Get,Set}MemoryParameters) to get and set the host shared memory tunables (ksm under linux). Osier Yang (6): node_memory: Define the APIs to get/set shared memory parameters node_memory: Wire up the RPC protocol node_memory: Implement the internal APIs node_memory: Support get/set memory parameters for drivers node_memory: Expose the APIs to virsh node_memory: Expose the APIs to Python bindings daemon/remote.c | 59 +++++++ include/libvirt/libvirt.h.in | 63 ++++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 125 +++++++++++++++ src/driver.h | 14 ++ src/libvirt.c | 121 ++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/nodeinfo.c | 332 +++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 ++ src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 50 ++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 20 +++ src/rpc/gendispatch.pl | 3 + src/uml/uml_driver.c | 2 + src/xen/xen_driver.c | 3 + tools/virsh-host.c | 116 ++++++++++++++ tools/virsh.pod | 8 + 21 files changed, 972 insertions(+), 1 deletions(-) -- 1.7.7.3

2 14

[libvirt] [PATCH 1/2] Add support for EOI with APIC
by Martin Kletzander 14 Sep '12

14 Sep '12

New options is added to support EOI (End of Interrupt) exposure for guests. As it makes sense only when APIC is enabled, I added this into the <apic> element in <features> because this should be tri-state option (cannot be handled as standalone feature). --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 9 ++++++++- src/conf/domain_conf.c | 35 ++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 503685f..66319d0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1018,6 +1018,13 @@ <dd>ACPI is useful for power management, for example, with KVM guests it is required for graceful shutdown to work. </dd> + <dt><code>apic</code></dt> + <dd>APIC allows the use of programmable IRQ + management. <span class="since">Since 0.10.2 (QEMU only)</span> + there is an optional attribute <code>eoi</code> with values "on" + and "off" which toggle the availability of EOI (End of + Interrupt) for the guest. + </dd> <dt><code>hap</code></dt> <dd>Enable use of Hardware Assisted Paging if available in the hardware. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c2c6184..029c796 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2859,7 +2859,14 @@ </optional> <optional> <element name="apic"> - <empty/> + <optional> + <attribute name="eoi"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 292cc9a..89c08da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -110,6 +110,11 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "viridian", "privnet") +VIR_ENUM_IMPL(virDomainApicEoi, VIR_DOMAIN_APIC_EOI_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", "restart", @@ -8621,6 +8626,28 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, goto error; } def->features |= (1 << val); + if (val == VIR_DOMAIN_FEATURE_APIC) { + char *attrstr = NULL; + if (virAsprintf(&attrstr, + "string(./features/%s/@eoi)", + nodes[i]->name) < 0) + goto no_memory; + + tmp = virXPathString(attrstr, ctxt); + if (tmp) { + int eoi; + if ((eoi = virDomainApicEoiTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for attribute eoi: %s"), + nodes[i]->name); + VIR_FREE(tmp); + goto error; + } + def->apic_eoi = eoi; + VIR_FREE(tmp); + } + VIR_FREE(attrstr); + } } VIR_FREE(nodes); } @@ -13413,7 +13440,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, _("unexpected feature %d"), i); goto cleanup; } - virBufferAsprintf(buf, " <%s/>\n", name); + virBufferAsprintf(buf, " <%s", name); + if (i == VIR_DOMAIN_FEATURE_APIC && def->apic_eoi) { + virBufferAsprintf(buf, + " eoi='%s'", + virDomainApicEoiTypeToString(def->apic_eoi)); + } + virBufferAsprintf(buf, "/>\n"); } } virBufferAddLit(buf, " </features>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3995c2d..86dae7d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1351,6 +1351,14 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_LAST }; +enum virDomainApicEoi { + VIR_DOMAIN_APIC_EOI_DEFAULT = 0, + VIR_DOMAIN_APIC_EOI_ON, + VIR_DOMAIN_APIC_EOI_OFF, + + VIR_DOMAIN_APIC_EOI_LAST, +}; + enum virDomainLifecycleAction { VIR_DOMAIN_LIFECYCLE_DESTROY, VIR_DOMAIN_LIFECYCLE_RESTART, @@ -1642,6 +1650,8 @@ struct _virDomainDef { virDomainOSDef os; char *emulator; int features; + /* enum virDomainApicEoi */ + int apic_eoi; virDomainClockDef clock; @@ -2104,6 +2114,7 @@ VIR_ENUM_DECL(virDomainTaint) VIR_ENUM_DECL(virDomainVirt) VIR_ENUM_DECL(virDomainBoot) VIR_ENUM_DECL(virDomainFeature) +VIR_ENUM_DECL(virDomainApicEoi) VIR_ENUM_DECL(virDomainLifecycle) VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainPMState) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0494e1f..5dd9313 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -263,6 +263,8 @@ virBlkioDeviceWeightArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; +virDomainApicEoiTypeFromString; +virDomainApicEoiTypeToString; virDomainAssignDef; virDomainBlockedReasonTypeFromString; virDomainBlockedReasonTypeToString; -- 1.7.12

3 6

[libvirt] [PATCH v3 0/9] improve virBitmap
by Hu Tao 14 Sep '12

14 Sep '12

In many places we store bitmap info in a chunk of data (pointed to by a char *), and have redundant codes to set/unset bits. This series extends virBitmap, and convert those codes to use virBitmap. patch 01 is based on https://www.redhat.com/archives/libvir-list/2012-September/msg00644.html changes: v3: - renaming member variables of virBitmap - rewrite virBitmapFormat using virBitmapNextSetBit - store bits in machine native endian format - more tests of virBitmap v2: - fix bug in qemuSetupCgroupForEmulator - new function virBitmapNextSetBit - virBitmapcmp -> virBitmapEqual - virBitmap: store bits in little endian format - some improvements of virBitmap - fix some memory leaks Hu Tao (9): bitmap: add a new member variable map_len New functions for virBitmap use virBitmap to store cpupin info use virBitmap to store cpu affinity info use virBitmap to store numa nodemask info. use virBitmap to store cpumask info. use virBitmap to store cells' cpumask info. use virBitmap to store nodeinfo. remove virDomainCpuSetFormat and virDomainCpuSetParse .gitignore | 1 + src/conf/cpu_conf.c | 17 +- src/conf/cpu_conf.h | 3 +- src/conf/domain_conf.c | 392 ++++++---------------------------- src/conf/domain_conf.h | 18 +- src/libvirt_private.syms | 14 +- src/lxc/lxc_controller.c | 56 +++-- src/nodeinfo.c | 26 +-- src/nodeinfo.h | 6 +- src/parallels/parallels_driver.c | 5 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 43 +--- src/qemu/qemu_driver.c | 168 +++++++-------- src/qemu/qemu_process.c | 141 ++++--------- src/test/test_driver.c | 5 +- src/util/bitmap.c | 429 ++++++++++++++++++++++++++++++++++++-- src/util/bitmap.h | 34 +++ src/util/processinfo.c | 36 ++-- src/util/processinfo.h | 9 +- src/vmx/vmx.c | 36 ++-- tests/Makefile.am | 7 +- tests/cpuset | 2 +- tests/virbitmaptest.c | 362 ++++++++++++++++++++++++++++++++ 24 files changed, 1126 insertions(+), 696 deletions(-) create mode 100644 tests/virbitmaptest.c -- 1.7.10.2

2 12

[libvirt] [PATCH 0/7] New APIs to get/set node shared memory parameters
by Osier Yang 14 Sep '12

14 Sep '12

As a result of RFC: https://www.redhat.com/archives/libvir-list/2012-August/msg01998.html, this adds two new APIs (virNode{Get,Set}SharedMemoryParameters) to get and set the host shared memory tunables (ksm under linux). Osier Yang (7): Improve virTypedParameterValidateSet shared_memory: Define the APIs to get/set shared memory parameters shared_memory: Wire up the RPC protocol shared_memory: Implement the internal APIs shared_memory: Support get/set shared memory parameters for drivers shared_memory: Expose the APIs to virsh shared_memory: Expose the APIs to Python bindings daemon/remote.c | 61 +++++++ include/libvirt/libvirt.h.in | 63 +++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 125 ++++++++++++++ src/driver.h | 14 ++ src/libvirt.c | 141 +++++++++++++++- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/nodeinfo.c | 344 +++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 + src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 50 ++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 20 +++ src/rpc/gendispatch.pl | 3 + src/uml/uml_driver.c | 2 + src/xen/xen_driver.c | 3 + tools/virsh-host.c | 110 +++++++++++++ tools/virsh.pod | 8 + 21 files changed, 990 insertions(+), 11 deletions(-) -- 1.7.7.3

2 16

[libvirt] [PATCH] snapshot: fix rollback failure in transaction mode
by Guannan Ren 14 Sep '12

14 Sep '12

After failure of qemu transaction command, the snapshot file still be there with non-zero in size. In order to unlink the file, the patch removes the file size checking. --- 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 8e8e00c..1fedfb8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10833,7 +10833,7 @@ qemuDomainSnapshotUndoSingleDiskActive(struct qemud_driver *driver, if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); if (need_unlink && stat(disk->src, &st) == 0 && - st.st_size == 0 && S_ISREG(st.st_mode) && unlink(disk->src) < 0) + S_ISREG(st.st_mode) && unlink(disk->src) < 0) VIR_WARN("Unable to remove just-created %s", disk->src); /* Update vm in place to match changes. */ -- 1.7.11.2

3 9

[libvirt] [PATCH 1/1 V2] Migrate per-port data for Open vSwitch ports during Qemu Live Migration
by Kyle Mestery 14 Sep '12

14 Sep '12

Add the ability to migrate per-port data on Open vSwitch ports during qemu live migration. A controller can use this to store data relating to each port, and have it migrated with the virtual machine and populated on the destination host. Signed-off-by: Kyle Mestery <kmestery(a)cisco.com> Cc: Laine Stump <laine(a)laine.org> --- src/qemu/qemu_migration.c | 246 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..8c1a8f1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OVS_PORT_DATA, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "ovsportdata"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OVS_PORT_DATA = (1 << QEMU_MIGRATION_COOKIE_FLAG_OVS_PORT_DATA), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -95,6 +97,19 @@ struct _qemuMigrationCookieGraphics { char *tlsSubject; }; +typedef struct _qemuMigrationCookieOvsPortData qemuMigrationCookieOvsPortData; +typedef qemuMigrationCookieOvsPortData *qemuMigrationCookieOvsPortDataPtr; +struct _qemuMigrationCookieOvsPortData { + /* How many virtual NICs are we saving data for? */ + int nnets; + + /* + * Array of pointers to saved data. Each VIF will have it's own + * data to transfer. + */ + char **portdata; +}; + typedef struct _qemuMigrationCookie qemuMigrationCookie; typedef qemuMigrationCookie *qemuMigrationCookiePtr; struct _qemuMigrationCookie { @@ -120,6 +135,9 @@ struct _qemuMigrationCookie { /* If (flags & QEMU_MIGRATION_COOKIE_PERSISTENT) */ virDomainDefPtr persistent; + + /* If (flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) */ + qemuMigrationCookieOvsPortDataPtr ovsportdata; }; static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) @@ -132,6 +150,24 @@ static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) } +static void qemuMigrationCookieOvsPortDataFree(qemuMigrationCookieOvsPortDataPtr + ovsportdata) +{ + int i; + + if (!ovsportdata) + return; + + for (i = 0; i < ovsportdata->nnets; i++) { + VIR_FREE(ovsportdata->portdata[i]); + } + + VIR_FREE(ovsportdata->portdata); + + VIR_FREE(ovsportdata); +} + + static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) { if (!mig) @@ -140,6 +176,10 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) qemuMigrationCookieGraphicsFree(mig->graphics); + if (mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) { + qemuMigrationCookieOvsPortDataFree(mig->ovsportdata); + } + VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); VIR_FREE(mig->name); @@ -256,6 +296,60 @@ error: } +static qemuMigrationCookieOvsPortDataPtr +qemuMigrationCookieOvsPortDataAlloc(struct qemud_driver *driver ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + qemuMigrationCookieOvsPortDataPtr mig; + int i; + virCommandPtr cmd = NULL; + virDomainNetDefPtr netptr; + + if (VIR_ALLOC(mig) < 0) + goto no_memory; + + mig->nnets = def->nnets; + + if (VIR_ALLOC_N(mig->portdata, def->nnets) < 0) + goto no_memory; + + for (i = 0; i < def->nnets; i++) { + virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(def->nets[i]); + netptr = def->nets[i]; + + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + if (VIR_ALLOC(mig->portdata[i]) < 0) + goto no_memory; + + cmd = virCommandNewArgList(OVSVSCTL, "get", "Interface", + netptr->ifname, "external_ids:PortData", + NULL); + + virCommandSetOutputBuffer(cmd, &mig->portdata[i]); + + /* Run the command */ + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to get OVS port data for " + "interface %s"), netptr->ifname); + goto error; + } + + /* Wipeout the newline */ + mig->portdata[i][strlen(mig->portdata[i]) - 1] = '\0'; + } + } + + return mig; + +no_memory: + virReportOOMError(); +error: + qemuMigrationCookieOvsPortDataFree(mig); + return NULL; +} + + static qemuMigrationCookiePtr qemuMigrationCookieNew(virDomainObjPtr dom) { @@ -370,6 +464,27 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, } +static int +qemuMigrationCookieAddOvsPortData(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, + virDomainObjPtr dom) +{ + if (mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration ovs port data data already present")); + return -1; + } + + if (dom->def->nnets >= 1) { + if (!(mig->ovsportdata = qemuMigrationCookieOvsPortDataAlloc( + driver, dom->def))) + return -1; + mig->flags |= QEMU_MIGRATION_COOKIE_OVS_PORT_DATA; + } + + return 0; +} + static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, qemuMigrationCookieGraphicsPtr grap) @@ -389,6 +504,25 @@ static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, } +static void qemuMigrationCookieOvsPortDataXMLFormat(virBufferPtr buf, + qemuMigrationCookieOvsPortDataPtr optr) +{ + int i; + + virBufferAsprintf(buf, " <ovsportdata nnets='%d'>\n", optr->nnets); + if (optr->nnets > 0) + virBufferAsprintf(buf, " <vifs>\n"); + for (i = 0; i < optr->nnets; i++) { + virBufferAsprintf(buf, " <vif num='%d' portdata='%s'/>\n", + i, optr->portdata[i]); + } + if (optr->nnets > 0) + virBufferAsprintf(buf, " </vifs>\n"); + + virBufferAddLit(buf, " </ovsportdata>\n"); +} + + static int qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferPtr buf, @@ -439,6 +573,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if ((mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) && + mig->ovsportdata) + qemuMigrationCookieOvsPortDataXMLFormat(buf, mig->ovsportdata); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -516,6 +654,57 @@ error: } +static qemuMigrationCookieOvsPortDataPtr +qemuMigrationCookieOvsPortDataXMLParse(xmlXPathContextPtr ctxt) +{ + qemuMigrationCookieOvsPortDataPtr optr; + int i; + int n; + xmlNodePtr *vifs = NULL; + + if (VIR_ALLOC(optr) < 0) + goto no_memory; + + if (virXPathInt("string(./ovsportdata/@nnets)", ctxt, &optr->nnets) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing nnets attribute in migration data")); + goto error; + } + + if (VIR_ALLOC_N(optr->portdata, optr->nnets) < 0) + goto no_memory; + + if ((n = virXPathNodeSet("./ovsportdata/vifs/vif", ctxt, &vifs)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing vif information")); + goto error; + } + + for (i = 0; i < n; i++) { + if (VIR_ALLOC(optr->portdata[i]) < 0) + goto no_memory; + + if (!(optr->portdata[i] = virXMLPropString(vifs[i], "portdata"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing portdata attribute in migration data")); + goto error; + } + } + + VIR_FREE(vifs); + + return optr; + +no_memory: + virReportOOMError(); +error: + if (vifs) + VIR_FREE(vifs); + qemuMigrationCookieOvsPortDataFree(optr); + return NULL; +} + + static int qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, struct qemud_driver *driver, @@ -662,6 +851,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) && + virXPathBoolean("count(./ovsportdata) > 0", ctxt) && + (!(mig->ovsportdata = qemuMigrationCookieOvsPortDataXMLParse(ctxt)))) + goto error; + return 0; error: @@ -721,6 +915,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA && + qemuMigrationCookieAddOvsPortData(mig, driver, dom) < 0) + return -1; + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1050,6 +1248,44 @@ qemuDomainMigrateGraphicsRelocate(struct qemud_driver *driver, } +static int +qemuDomainMigrateOPDRelocate(struct qemud_driver *driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + qemuMigrationCookiePtr cookie) +{ + virCommandPtr cmd = NULL; + virDomainNetDefPtr netptr; + int ret = 0; + int i; + virBufferPtr buf; + + if (VIR_ALLOC(buf) < 0) { + ret = -1; + goto out; + } + + for (i = 0; i < cookie->ovsportdata->nnets; i++) { + netptr = vm->def->nets[i]; + + virBufferAsprintf(buf, "external_ids:PortData=%s", + cookie->ovsportdata->portdata[i]); + + cmd = virCommandNewArgList(OVSVSCTL, "set", "Interface", + netptr->ifname, virBufferCurrentContent(buf), + NULL); + /* Run the command */ + if ((ret = virCommandRun(cmd, NULL)) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to set OVS port data for " + "interface %s"), vm->def->nets[i]->ifname); + } + } + +out: + return ret; +} + + /* This is called for outgoing non-p2p migrations when a connection to the * client which initiated the migration was closed but we were waiting for it * to follow up with the next phase, that is, in between @@ -1994,7 +2230,8 @@ cleanup: if (ret == 0 && qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, - QEMU_MIGRATION_COOKIE_PERSISTENT ) < 0) + QEMU_MIGRATION_COOKIE_PERSISTENT | + QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) < 0) VIR_WARN("Unable to encode migration cookie"); qemuMigrationCookieFree(mig); @@ -2929,6 +3166,7 @@ qemuMigrationFinish(struct qemud_driver *driver, qemuDomainCleanupRemove(vm, qemuMigrationPrepareCleanup); + cookie_flags = QEMU_MIGRATION_COOKIE_OVS_PORT_DATA; if (flags & VIR_MIGRATE_PERSIST_DEST) cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; @@ -2956,6 +3194,10 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + if (mig->ovsportdata) + if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + VIR_WARN("unable to provide data for OVS port data relocation"); + if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) -- 1.7.11.4

5 7

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

14 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. --- Okay, I am ignoring the event completely in this patch. I am just asking for 'query-spice' until after 'query-migrate' reports 'completed'. It's simple and small. However, if there is a wider consensus I should catch the event as well, e.g. so we don't have to enter the monitor and thus have smaller overhead, I can rewrite this patch. src/qemu/qemu_migration.c | 32 ++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 22 +++++++++++++++++ src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ 5 files changed, 108 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 99fc8ce..e4ec66d 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) { @@ -939,7 +948,8 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, break; 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 +977,12 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; const char *job; + bool wait_for_spice; + + /* If guest uses SPICE 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); switch (priv->job.asyncJob) { case QEMU_ASYNC_JOB_MIGRATION_OUT: @@ -988,7 +1004,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 +1857,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 +1866,11 @@ qemuMigrationRun(struct qemud_driver *driver, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType); + /* If guest uses SPICE 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); + if (virLockManagerPluginUsesState(driver->lockManager) && !cookieout) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1946,7 +1969,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 b43b15e..20bb333 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1844,6 +1844,28 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, return ret; } +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, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f206d49..d3a0877 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -346,6 +346,9 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, QEMU_MONITOR_MIGRATE_NON_SHARED_DISK = 1 << 1, /* migration with non-shared storage with full disk copy */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8842817..63dbd25 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2487,6 +2487,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 f5d515f..88edb73 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -132,6 +132,9 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri); -- 1.7.8.6

2 1

[libvirt] [PATCH] conf: avoid libvirt crash with empty address guestfwd channel
by Alex Jia 14 Sep '12

14 Sep '12

The 'def->target.addr' hasn't been initialized in virDomainChrDefNew() and its value is always '0xffffffff', in addition, the following test scenario hasn't also include 'port' element in channel XML block, so the branch 'if (addrStr == NULL)' is hit in virDomainChrDefParseTargetXML(), the programming jumps to 'error' label to release relevant resources, and the statement 'if (VIR_ALLOC(def->target.addr) < 0)' hasn't been executed then the virDomainChrDefFree() will free 'def->target.addr'(0xffffffff) via VIR_FREE(), which results in libvirt crash, to use valgrind can also find a 'Invalid free() / delete / delete[]' error. This patch just adjusts codes order to initialize 'def->target.addr' firstly. With this patch, libvirt hasn't crash and can get a expected error message " XML error: guestfwd channel does not define a target address". How to reproduce? 1. define a guest with the following channel XML configuration $ cat foo.xml <snip> <channel type='pty'> <target type='guestfwd'/> </channel> </snip> $ virsh define foo.xml 2. actual result error: Failed to define domain from /tmp/foo.xml error: End of file while reading data: Input/output error error: Failed to reconnect to the hypervisor GDB debugger information: <snip> Breakpoint 1, virDomainChrDefFree (def=0x7f8ab000ec70) at conf/domain_conf.c:1264 ...ignore 1264 { (gdb) p def->target $2 = {port = -1, addr = 0xffffffff, name = 0xffffffff <Address 0xffffffff out of bounds>} </snip> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=856489 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2f8e5d2..02048c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5231,6 +5231,11 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, addrStr = virXMLPropString(cur, "address"); portStr = virXMLPropString(cur, "port"); + if (VIR_ALLOC(def->target.addr) < 0) { + virReportOOMError(); + goto error; + } + if (addrStr == NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("guestfwd channel does not " @@ -5238,11 +5243,6 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, goto error; } - if (VIR_ALLOC(def->target.addr) < 0) { - virReportOOMError(); - goto error; - } - if (virSocketAddrParse(def->target.addr, addrStr, AF_UNSPEC) < 0) goto error; -- 1.7.1

2 3

[libvirt] [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'.
by Richard W.M. Jones 13 Sep '12

13 Sep '12

I have added the attached patch to Fedora because Fedora (only?) renames 'qemu' to 'qemu-system-i386'. As a result of this, on 32 bit Fedora would run 'qemu-system-x86_64 [...] -cpu qemu32'. In fact this caused no issues (I originally added the patch because I suspected this was a cause of RHBZ#857026, but that doesn't appear to be the case). But if we're going to package qemu-system-i386 we might as well run it. The alternative would be to delete that binary altogether if it does nothing useful ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 2

[libvirt] [PATCH 0/4 v2] Support to set disk wwn
by Osier Yang 13 Sep '12

13 Sep '12

v1 - v2: * Validate wwn while parsing * Error out earlier "if (disk->device == "lun" && disk->wwn)", no logic change. This introduces new element <wwn> for disk, to allow to set wwn (just like setting serial number) for the virtual disk (Only QEMU devices like ide-drive, ide-hd, ide-cd, scsi-disk, scsi-hd, and scsi-cd support it). Osier Yang (4): schema: Add schema for disk <wwn> conf: Parse and format disk <wwn> qemu: Add caps to indentify if setting wwn is supported by qemu qemu: Use disk wwn in qemu command line docs/formatdomain.html.in | 6 +++ docs/schemas/basictypes.rng | 6 +++ docs/schemas/domaincommon.rng | 5 +++ docs/schemas/nodedev.rng | 6 --- src/conf/domain_conf.c | 12 +++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 34 +++++++++++++++++++ src/util/util.c | 17 +++++++++ src/util/util.h | 2 + .../qemuxml2argv-disk-ide-wwn.args | 6 +++ .../qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml | 28 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-wwn.args | 10 ++++++ .../qemuxml2argv-disk-scsi-disk-wwn.xml | 35 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ 17 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml -- 1.7.7.3

2 7

[libvirt] [PATCH] Don't overwrite errors raised by qemuMonitorHMPCommand
by Daniel P. Berrange 13 Sep '12

13 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The qemuMonitorHMPCommand() API and things it calls will report a wide variety of errors. The QEMU text monitor should not be overwriting these errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_monitor_text.c | 335 ++++++++++--------------------------------- 1 file changed, 76 insertions(+), 259 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a575e30..f7b88a7 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -387,14 +387,11 @@ qemuMonitorTextStartCPUs(qemuMonitorPtr mon, int qemuMonitorTextStopCPUs(qemuMonitorPtr mon) { char *info; + int ret; - if (qemuMonitorHMPCommand(mon, "stop", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot stop CPU execution")); - return -1; - } + ret = qemuMonitorHMPCommand(mon, "stop", &info); VIR_FREE(info); - return 0; + return ret; } @@ -409,11 +406,8 @@ qemuMonitorTextGetStatus(qemuMonitorPtr mon, if (reason) *reason = VIR_DOMAIN_PAUSED_UNKNOWN; - if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot get status info")); + if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) return -1; - } if (strstr(reply, "running")) { *running = true; @@ -448,14 +442,12 @@ cleanup: int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon) { char *info; + int ret; + + ret = qemuMonitorHMPCommand(mon, "system_powerdown", &info); - if (qemuMonitorHMPCommand(mon, "system_powerdown", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("system shutdown operation failed")); - return -1; - } VIR_FREE(info); - return 0; + return ret; } int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainNetInterfaceLinkState state) { @@ -473,11 +465,8 @@ int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainN virReportOOMError(); goto error; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("set_link operation failed")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto error; - } /* check if set_link command is supported */ if (strstr(info, "\nunknown ")) { @@ -507,14 +496,12 @@ error: int qemuMonitorTextSystemReset(qemuMonitorPtr mon) { char *info; + int ret; + + ret = qemuMonitorHMPCommand(mon, "system_reset", &info); - if (qemuMonitorHMPCommand(mon, "system_reset", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("system reset operation failed")); - return -1; - } VIR_FREE(info); - return 0; + return ret; } @@ -527,11 +514,8 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, pid_t *cpupids = NULL; size_t ncpupids = 0; - if (qemuMonitorHMPCommand(mon, "info cpus", &qemucpus) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to fetch CPU thread info")); + if (qemuMonitorHMPCommand(mon, "info cpus", &qemucpus) < 0) return -1; - } /* * This is the gross format we're about to parse :-{ @@ -608,11 +592,8 @@ int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, *virtType = VIR_DOMAIN_VIRT_QEMU; - if (qemuMonitorHMPCommand(mon, "info kvm", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query kvm status")); + if (qemuMonitorHMPCommand(mon, "info kvm", &reply) < 0) return -1; - } if (strstr(reply, "enabled")) *virtType = VIR_DOMAIN_VIRT_KVM; @@ -715,11 +696,8 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, int ret = -1; char *offset; - if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query memory balloon allocation")); + if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) return -1; - } if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { offset += strlen(BALLOON_PREFIX); @@ -759,11 +737,8 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, int ret = 0; char *offset; - if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query memory balloon statistics")); + if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) return -1; - } if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { offset += strlen(BALLOON_PREFIX); @@ -786,11 +761,8 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, char *dev; int tmp; - if (qemuMonitorHMPCommand(mon, "info block", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("info block command failed")); + if (qemuMonitorHMPCommand(mon, "info block", &reply) < 0) goto cleanup; - } if (strstr(reply, "\ninfo ")) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -905,11 +877,8 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, const char *p, *eol; int devnamelen = strlen(dev_name); - if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("'info blockstats' command failed")); + if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints the supported * info commands, so the output starts "info ". Since this is @@ -1032,11 +1001,8 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, int num = 0; const char *p, *eol; - if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("'info blockstats' command failed")); + if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints the supported * info commands, so the output starts "info ". Since this is @@ -1116,11 +1082,8 @@ int qemuMonitorTextBlockResize(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to resize block")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1197,11 +1160,8 @@ int qemuMonitorTextSetPassword(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("setting password failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1231,11 +1191,8 @@ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("expiring password failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1271,8 +1228,6 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon, } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not balloon memory allocation")); VIR_FREE(cmd); return -1; } @@ -1308,8 +1263,6 @@ int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online) } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not change CPU online status")); VIR_FREE(cmd); return -1; } @@ -1342,11 +1295,8 @@ int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not eject media on %s"), dev_name); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * device not found, device is locked ... @@ -1386,11 +1336,8 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not change media on %s"), dev_name); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * device not found, device is locked ... @@ -1438,11 +1385,8 @@ static int qemuMonitorTextSaveMemory(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not save memory region to '%s'"), path); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX what is printed on failure ? */ @@ -1485,11 +1429,8 @@ int qemuMonitorTextSetMigrationSpeed(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not restrict migration speed")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } ret = 0; @@ -1512,11 +1453,8 @@ int qemuMonitorTextSetMigrationDowntime(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not set maximum migration downtime")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } ret = 0; @@ -1553,11 +1491,8 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, *remaining = 0; *total = 0; - if (qemuMonitorHMPCommand(mon, "info migrate", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot query migration status")); + if (qemuMonitorHMPCommand(mon, "info migrate", &reply) < 0) return -1; - } if ((tmp = strstr(reply, MIGRATION_PREFIX)) != NULL) { tmp += strlen(MIGRATION_PREFIX); @@ -1704,11 +1639,8 @@ int qemuMonitorTextMigrate(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to start migration to %s"), dest); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } /* Now check for "fail" in the output string */ if (strstr(info, "fail") != NULL) { @@ -1738,15 +1670,12 @@ cleanup: int qemuMonitorTextMigrateCancel(qemuMonitorPtr mon) { char *info = NULL; + int ret; - if (qemuMonitorHMPCommand(mon, "migrate_cancel", &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to cancel migration")); - return -1; - } - VIR_FREE(info); + ret = qemuMonitorHMPCommand(mon, "migrate_cancel", &info); - return 0; + VIR_FREE(info); + return ret; } @@ -1769,8 +1698,6 @@ int qemuMonitorTextGraphicsRelocate(qemuMonitorPtr mon, if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { VIR_FREE(cmd); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to relocate graphics client")); return -1; } VIR_FREE(cmd); @@ -1799,11 +1726,8 @@ int qemuMonitorTextAddUSBDisk(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to add usb disk")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } /* If the command failed qemu prints: * Could not add ... */ @@ -1835,11 +1759,8 @@ static int qemuMonitorTextAddUSBDevice(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot attach usb device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * Could not add ... */ @@ -1976,11 +1897,8 @@ int qemuMonitorTextAddPCIHostDevice(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot attach host pci device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "invalid type: host")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2027,11 +1945,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s disk %s"), bus, path); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { if (!tryOldSyntax && strstr(reply, "invalid char in expression")) { @@ -2069,11 +1984,8 @@ int qemuMonitorTextAddPCINetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add NIC with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -2113,11 +2025,8 @@ try_command: } } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to remove PCI device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* Syntax changed when KVM merged PCI hotplug upstream to QEMU, * so check for an error message from old KVM indicating the @@ -2161,11 +2070,8 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommandWithFd(mon, cmd, fd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to pass fd to qemu with '%s'"), cmd); + if (qemuMonitorHMPCommandWithFd(mon, cmd, fd, &reply) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints: * unknown command: getfd" */ @@ -2204,11 +2110,8 @@ int qemuMonitorTextCloseFileHandle(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints: * unknown command: getfd" */ @@ -2240,11 +2143,8 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add host net with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2275,11 +2175,8 @@ int qemuMonitorTextRemoveHostNetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to remove host network in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2304,11 +2201,8 @@ int qemuMonitorTextAddNetdev(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add netdev with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2333,11 +2227,8 @@ int qemuMonitorTextRemoveNetdev(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to remove netdev in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2368,11 +2259,8 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - if (qemuMonitorHMPCommand(mon, "info chardev", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("failed to retrieve chardev info in qemu with 'info chardev'")); + if (qemuMonitorHMPCommand(mon, "info chardev", &reply) < 0) return -1; - } char *pos; /* The current start of searching */ char *next = reply; /* The start of the next line */ @@ -2453,11 +2341,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s disk controller"), bus); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { if (!tryOldSyntax && strstr(reply, "invalid char in expression")) { @@ -2552,11 +2437,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to attach drive '%s'"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2643,11 +2525,8 @@ int qemuMonitorTextGetAllPCIAddresses(qemuMonitorPtr mon, *retaddrs = NULL; - if (qemuMonitorHMPCommand(mon, "info pci", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot query PCI addresses")); + if (qemuMonitorHMPCommand(mon, "info pci", &reply) < 0) return -1; - } p = reply; @@ -2736,11 +2615,8 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon, } VIR_DEBUG("TextDelDevice devalias=%s", devalias); - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot detach %s device"), devalias); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -2776,11 +2652,8 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s device"), devicestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the host device is hotpluged first time, qemu will output * husb: using %s file-system with %s if the command succeeds. @@ -2829,11 +2702,8 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add drive '%s'"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2877,11 +2747,8 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot delete %s drive"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { VIR_ERROR(_("deleting drive is not supported. " @@ -2930,11 +2797,8 @@ int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("failed to set disk password")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2968,11 +2832,8 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to take snapshot using command '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "Error while creating snapshot") != NULL) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -3016,12 +2877,8 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to restore snapshot using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "No block device supports snapshots") != NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3074,12 +2931,8 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) virReportOOMError(); goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to delete snapshot using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "No block device supports snapshots") != NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3120,11 +2973,8 @@ qemuMonitorTextDiskSnapshot(qemuMonitorPtr mon, const char *device, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to take snapshot using command '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "error while creating qcow2") != NULL || strstr(reply, "unknown command:") != NULL) { @@ -3158,9 +3008,6 @@ int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, } ret = qemuMonitorHMPCommand(mon, safecmd, reply); - if (ret != 0) - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to run cmd '%s'"), safecmd); VIR_FREE(safecmd); @@ -3169,30 +3016,21 @@ int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, int qemuMonitorTextInjectNMI(qemuMonitorPtr mon) { - const char *cmd = "inject-nmi"; char *reply = NULL; - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) - goto fail; + if (qemuMonitorHMPCommand(mon, "inject-nmi", &reply) < 0) + return -1; if (strstr(reply, "unknown command") != NULL) { VIR_FREE(reply); /* fallback to 'nmi' if qemu has not supported "inject-nmi" yet. */ - cmd = "nmi 0"; - reply = NULL; - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) - goto fail; + if (qemuMonitorHMPCommand(mon, "nmi 0", &reply) < 0) + return -1; } VIR_FREE(reply); return 0; - -fail: - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to inject NMI using command '%s'"), - cmd); - return -1; } int qemuMonitorTextSendKey(qemuMonitorPtr mon, @@ -3232,12 +3070,8 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon, } cmd = virBufferContentAndReset(&buf); - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to send key using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -3265,11 +3099,8 @@ int qemuMonitorTextScreendump(qemuMonitorPtr mon, const char *file) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("taking screenshot failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -3299,11 +3130,8 @@ int qemuMonitorTextOpenGraphics(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("adding graphics client failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) goto cleanup; @@ -3323,34 +3151,28 @@ int qemuMonitorTextSetBlockIoThrottle(qemuMonitorPtr mon, { char *cmd = NULL; char *result = NULL; - int ret = 0; + int ret = -1; const char *cmd_name = NULL; /* For the not specified fields, 0 by default */ cmd_name = "block_set_io_throttle"; - ret = virAsprintf(&cmd, "%s %s %llu %llu %llu %llu %llu %llu", cmd_name, - device, info->total_bytes_sec, info->read_bytes_sec, - info->write_bytes_sec, info->total_iops_sec, - info->read_iops_sec, info->write_iops_sec); - - if (ret < 0) { + if (virAsprintf(&cmd, "%s %s %llu %llu %llu %llu %llu %llu", cmd_name, + device, info->total_bytes_sec, info->read_bytes_sec, + info->write_bytes_sec, info->total_iops_sec, + info->read_iops_sec, info->write_iops_sec) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command")); - ret = -1; + if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) goto cleanup; - } if (qemuMonitorTextCommandNotFound(cmd_name, result)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Command '%s' is not found"), cmd_name); - ret = -1; goto cleanup; } + ret = 0; cleanup: VIR_FREE(cmd); @@ -3441,20 +3263,15 @@ int qemuMonitorTextGetBlockIoThrottle(qemuMonitorPtr mon, virDomainBlockIoTuneInfoPtr reply) { char *result = NULL; - int ret = 0; + int ret = -1; const char *cmd_name = "info block"; - if (qemuMonitorHMPCommand(mon, cmd_name, &result) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command")); - ret = -1; + if (qemuMonitorHMPCommand(mon, cmd_name, &result) < 0) goto cleanup; - } if (qemuMonitorTextCommandNotFound(cmd_name, result)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Command '%s' is not found"), cmd_name); - ret = -1; goto cleanup; } -- 1.7.11.4

2 1

[libvirt] [libvirt-designer][PATCH 0/3] Another cleanup
by Michal Privoznik 13 Sep '12

13 Sep '12

to address Chritophe's improvements hints. Michal Privoznik (3): init_check: Ignore DB loading errors get_supported_disk_bus_types: NULL is valid list add_disk_full: Only set error if !NULL libvirt-designer/libvirt-designer-domain.c | 5 ++--- libvirt-designer/libvirt-designer-main.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) -- 1.7.8.6

3 6

[libvirt] [PATCH] parallels: implement containers creation
by Dmitry Guryanov 13 Sep '12

13 Sep '12

Add separate function parallelsCreateCt, which creates container. Also add example xml configuration domain-parallels-ct-simple.xml. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_driver.c | 41 +++++++++++++++++++- .../domain-parallels-ct-simple.xml | 27 +++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 9eb2526..0dd13fe 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1663,6 +1663,36 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def) return -1; } +static int +parallelsCreateCt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDefPtr def) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(def->uuid, uuidstr); + + if (def->nfss != 1 || + def->fss[0]->type != VIR_DOMAIN_FS_TYPE_TEMPLATE) { + + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("There must be only 1 template FS for " + "container creation")); + goto error; + } + + if (parallelsCmdRun(PRLCTL, "create", def->name, "--vmtype", "ct", + "--uuid", uuidstr, + "--ostemplate", def->fss[0]->src, NULL) < 0) + goto error; + + if (parallelsCmdRun(PRLCTL, "set", def->name, "--vnc-mode", "auto", NULL) < 0) + goto error; + + return 0; + +error: + return -1; +} + static virDomainPtr parallelsDomainDefineXML(virConnectPtr conn, const char *xml) { @@ -1703,8 +1733,17 @@ parallelsDomainDefineXML(virConnectPtr conn, const char *xml) def = NULL; } else { - if (parallelsCreateVm(conn, def)) + if (STREQ(def->os.type, "hvm")) { + if (parallelsCreateVm(conn, def)) + goto cleanup; + } else if (STREQ(def->os.type, "exe")) { + if (parallelsCreateCt(conn, def)) + goto cleanup; + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported OS type: %s"), def->os.type); goto cleanup; + } if (parallelsLoadDomains(privconn, def->name)) goto cleanup; dom = virDomainFindByName(&privconn->domains, def->name); diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml new file mode 100644 index 0000000..a2b87ce --- /dev/null +++ b/tests/domainschemadata/domain-parallels-ct-simple.xml @@ -0,0 +1,27 @@ +<domain type='parallels'> + <name>1010</name> + <uuid>88576506-d611-41c2-b6b6-c9043704a0dd</uuid> + <description></description> + <memory unit='KiB'>262144</memory> + <currentMemory unit='KiB'>262144</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <filesystem type='template'> + <source name='centos-6-x86_64'/> + <target dir='/'/> + </filesystem> + <video> + <model type='vga' vram='16777216' heads='1'> + <acceleration accel3d='no' accel2d='no'/> + </model> + </video> + </devices> +</domain> -- 1.7.1

2 1