- Devel - libvirt List Archives

[libvirt] [PATCH] virInitctlRequest: Don't hardcode 384 bytes size
by Guido Günther 02 May '13

02 May '13

When MAXHOSTNAMELEN is set we have to take it's value into account. Otherwise the build fails on kFreeBSD (FreeBSD kernel and GNU userland) --- src/util/virinitctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 1618ffa..9a3e8a3 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -103,7 +103,11 @@ struct virInitctlRequest { } i; }; -verify(sizeof(struct virInitctlRequest) == 384); +# ifdef MAXHOSTNAMELEN + verify(sizeof(struct virInitctlRequest) == 320 + MAXHOSTNAMELEN); +# else + verify(sizeof(struct virInitctlRequest) == 384); +#endif /* * Send a message to init to change the runlevel -- 1.7.10.4

2 3

[libvirt] [PATCH 0/3] Fix license violation of virsh when vbox is enabled
by Eric Blake 02 May '13

02 May '13

See the big hairy analysis here: https://www.redhat.com/archives/libvir-list/2013-May/msg00030.html I feel comfortable enough with these patches that I'm hoping to get them into libvirt 1.0.5, while saving the bigger task of refactoring vbox support into libvirtd out to libvirt 1.0.6. Eric Blake (3): build: move readline check into its own macro build: check for libedit build: fall back to libedit if libvirt.so is crippled configure.ac | 54 +++++++++++++------------------------------- libvirt.spec.in | 8 +++++++ m4/virt-edit.m4 | 26 +++++++++++++++++++++ m4/virt-readline.m4 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 21 ++++++++++++----- 5 files changed, 131 insertions(+), 43 deletions(-) create mode 100644 m4/virt-edit.m4 create mode 100644 m4/virt-readline.m4 -- 1.8.1.4

2 4

[libvirt] License issues
by Eric Blake 02 May '13

02 May '13

tl:dr; summary: It was pointed out to me off-list that libvirt has a licensing issue depending on how it is configured, present since 0.6.3 (introduction of vbox:// URI in commit 10d16508 in April 2009), and which has caused at least libvirt itself to risk shipping non-compliant binaries (at least virsh in Fedora 12 and later is non-compliant, thanks to GPLv3 libreadline 6.0 since mid-2009; although RHEL 6 is immune). The licensing issue can be avoided by configuring --without-vbox, and/or virsh can be fixed by configuring lv_use_readline=no. Meanwhile, we have a plan of attack that would allow future releases of libvirt to provide vbox support to GPLv3 apps, and so that virsh is no longer legally prevented from using GPLv3 readline. Details: The problem stems from the fact that various files in src/vbox (such as vbox_XPCOMCGlue.c) have an explicit LGPLv2-only license. That means that any binary that includes code based on these files is also LGPLv2-only. At least Fedora distributes libvirt.so with vbox support enabled, which means ANY application that links against such a libvirt.so must be compatible with LGPLv2-only. But there is at least one popular license that is definitely incompatible with LGPLv2-only: GPLv3. This means that it is impossible to use Fedora's libvirt.so in a GPLv3 (or GPLv3+) binary, even if that binary will not be directly using vbox:// URIs. (Note that RHEL 6 ships without vbox:// URI support, and therefore its libvirt.so is not poisoned.) Meanwhile, the libvirt package itself usually ships a binary that wants to use GPLv3 code. virsh defaults to compiling against libreadline if it is present (you can avoid it with the undocumented './configure lv_use_readline=no', but to date we have never added a --without-readline configure switch). Prior to 2009, libreadline 5.x was GPLv2+; but in 2009, with the release of readline 6.0, it's license was changed to GPLv3+. Therefore, ever since Fedora 12, virsh has been in license violation - it links against two incompatible libraries (libvirt.so with vbox support is LGPLv2-only, and libreadline 6.0 is GPLv3+). With regards to libreadline, we have a couple of sneaky backdoors: The first is a liberal interpretation of the GPLv2 exception that allows you to use standard system libraries regardless of their licensing - if you can succesfully argue that libreadline is a system library (on the same par as libc) then even though it is GPLv3, using it in a GPLv2 project under the system library clause does not constitute a license violation. I'm not a lawyer, but trying to use this exception feels sleazy; and while it may hold up to scrutiny on GNU/Linux (where libreadline really is present on all installs thanks to bash), it's harder to argue that it will work on all other systems (BSD systems come to mind, which try hard to provide the option of getting a running system without the need for installing GPLv3 libraries). The second backdoor is the existence of libedit, a BSD-licensed library that provides the same API as (at least some versions of) libreadline. If virsh is not using any libreadline features beyond what libedit provides, we could link virsh against libedit instead of libreadline, at which point virsh would no longer be using GPLv3 code, and can be distributed under GPLv2-only as needed according to whether libvirt.so is poisoned to be LGPLv2-only. I'm hoping to patch configure.ac to probe for libedit, and if present, to prefer that over libreadline if vbox is enabled. We'd also want to add a configure --with-readline=... to give the user a documented way to choose which backend they want for interactive virsh (libedit, libreadline, or none) rather than forcing the decision via undocumented cache variables. The /usr/libexec/libvirt_parthelper binary is another potential binary that needs auditing. It exists because we need to interact with libparted, but that library is GPLv3, and thus cannot be linked into libvirt.so proper. By creating a separate application, our goal was to have libvirt_parthelper be a GPLv3 app (thanks to parted) but reuse libvirt code (exercising the "or later" clause of all libvirt LGPLv2+ code used in that binary). At the moment, ldd says that libvirt_parthelper is not linked against libvirt.so (but rather just statically includes other libvirt files such as "virutil.h"), so we can argue that this binary is immune to the problem with vbox code. Note that libvirt's intent has always been to ship LGPLv2+ code, precisely because we want libvirt to be usable in both GPLv2 and GPLv3 projects (anyone wanting to use an LGPLv2+ library in a GPLv3 project merely exercises their "or later" rights of LGPLv2+ to use that library under LGPLv3). But since we are currently falling short of that goal, we need to make a change. Unfortunately, the copyright holder (Sun) that exerted the restrictive LGPLv2-only license no longer exists, and it is not obvious whether their successor Oracle is legally able to relax the license. Even if they are, there is then the question of whether Oracle would choose to relax the license, and how much time it would take to pursue the legal paperwork to get a license change authorized. But we have another possibility, by using what we have already done with the libvirt_parthelper as our guide. That is, as long as we can isolate poisoned licenses out of libvirt.so, and ensure that they are only compiled into standalone binaries, those standalone binaries can have a more restrictive license. We can go in either direction so long each individual binary never mixes both GPLv3 and LGPLv2-only code. Obviously, libvirt_parthelper chose to restrict things to GPLv3, but so far, the libvirtd executable has not been poisoned in either direction. Furthermore, since we have already gone to the efforts of creating a libvirt_parthelper to keep GPLv3 code out of libvirtd, it seems reasonable to assume that we can create other helper apps for any future tasks that libvirtd may want to perform that require GPLv3 code. Therefore, I propose that we poison libvirtd into being [L]GPLv2-only, by linking the vbox support into libvirtd instead of in libvirt.so. Implementation wise, this would mean that we compile the vbox driver as an independent module (much the same as we do for qemu or lxc), and link that module into libvirtd rather than into libvirt.so directly. In libvirt.so, attempts to use a vbox:// URI would then be forwarded over RPC to libvirtd, instead of directly using vbox code. vbox would then be a remote instead of a local protocol. Since existing vbox:// connections are local, vbox users have not previously had to ensure that the system libvirtd daemon is running. Therefore, I suspect that it would be nicer to reuse the qemu://session code that auto-spawns a session libvirtd, so that from the user standpoint, they can continue to connect to vbox without having to have a libvirtd system daemon running. The initial connection time will take slightly longer as a session libvirtd is autospawned, but that should not be too much impact. Qemu has announced that they are delaying their release of 1.5 in part because of a license problem [1]. I'm wondering if we need to follow qemu's lead and possibly delay the release of libvirt 1.0.5 if we don't have a fix in time (at any rate, I'm certainly trying to tackle both proposed solutions in the near future, starting with the libedit idea first). On the other hand, the issue has been around for 4 years, so we could argue that releasing 1.0.5 with the same problem is no worse than what we have done in the past, and that we can wait to fix it until 1.0.6. If we do go with the delay for libvirt.so, users still have the option of configuring --without-vbox to get a libvirt.so that is not poisoned to be LGPLv2-only. And hopefully the libedit work is simple enough that at least virsh can be fixed for 1.0.5, even if libvirt.so is not fixed until 1.0.6. [1] qemu license issue first identified: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg02096.html Efforts to fix it: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg05807.html qemu release delay, in part because of license issue: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg06042.html -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 3

[libvirt] [PATCH] pci: autolearn name of stub driver, remove from arglist
by Laine Stump 02 May '13

02 May '13

virPCIDeviceReattach and virPCIDeviceUnbindFromStub (called by virPCIDeviceReattach) had previously required the name of the stub driver as input. This is unnecessary, because the name of the driver the device is currently bound to can be found by looking at the link: /sys/bus/pci/dddd:bb:ss.ff/driver Instead of requiring that the name of the expected stub driver name and only unbinding if that one name is matched, we no longer take a driver name in the arglist for either of these functions. virPCIDeviceUnbindFromStub just compares the name of the currently bound driver to a list of "well known" stubs (right now contains "pci-stub" and "vfio-pci" for qemu, and "pciback" for xen), and only performs the unbind if it's one of those devices. This allows virsh nodedevice-reattach to work properly across a libvirtd restart, and fixes a couple of cases where we were erroneously still hard-coding "pci-stub" as the drive name. For some unknown reason, virPCIDeviceReattach had been calling modprobe on the stub driver prior to unbinding the device. This was problematic because we no longer know the name of the stub driver in that function. However, it is pointless to probe for the stub driver at that time anyway - because the device is bound to the stub driver, we are guaranteed that it is already loaded, and so that call to modprobe has been removed. --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 4 +-- src/util/virpci.c | 66 ++++++++++++++++++++++++++++++++++--------------- src/util/virpci.h | 3 +-- src/xen/xen_driver.c | 2 +- 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 296efe3..9492850 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9832,7 +9832,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceReattachInit(pci); if (virPCIDeviceReattach(pci, driver->activePciHostdevs, - driver->inactivePciHostdevs, "pci-stub") < 0) + driver->inactivePciHostdevs) < 0) goto out; ret = 0; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 4d1f39d..e4af036 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -609,7 +609,7 @@ reattachdevs: /* NB: This doesn't actually re-bind to original driver, just * unbinds from the stub driver */ - virPCIDeviceReattach(dev, driver->activePciHostdevs, NULL, NULL); + virPCIDeviceReattach(dev, driver->activePciHostdevs, NULL); } cleanup: @@ -869,7 +869,7 @@ void qemuReattachPciDevice(virPCIDevicePtr dev, virQEMUDriverPtr driver) } if (virPCIDeviceReattach(dev, driver->activePciHostdevs, - driver->inactivePciHostdevs, "pci-stub") < 0) { + driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : _("unknown error")); diff --git a/src/util/virpci.c b/src/util/virpci.c index 97bba74..8d0dec8 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -909,25 +909,61 @@ recheck: return -1; } +static const char *virPCIKnownStubs[] = { + "pciback", /* used by xen */ + "pci-stub", /* used by kvm legacy passthrough */ + "vfio-pci", /* used by VFIO device assignment */ + NULL +}; + static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev, const char *driver) +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) { int result = -1; char *drvdir = NULL; char *path = NULL; + char *driver = NULL; + const char **stubTest; + bool isStub = false; - if (virPCIDriverDir(&drvdir, driver) < 0) + /* If the device is currently bound to one of the "well known" + * stub drivers, then unbind it, otherwise ignore it. + */ + if (virPCIFile(&path, dev->name, "driver") < 0) + goto cleanup; + /* path = "/sys/bus/pci/dddd:bb:ss.ff/driver" */ + if (virFileIsLink(path) != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid device %s driver file %s is not a symlink"), + dev->name, path); + goto cleanup; + } + if (virFileResolveLink(path, &drvdir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to resolve device %s driver symlink %s"), + dev->name, path); goto cleanup; + } + /* drvdir = "/sys/bus/pci/drivers/${drivername} */ if (!dev->unbind_from_stub) goto remove_slot; - /* If the device is bound to stub, unbind it. - */ - if (virPCIFile(&path, dev->name, "driver") < 0) - goto cleanup; + /* If the device isn't bound to a known stub, skip the unbind. */ + if (!(driver = strdup(last_component(drvdir)))) + goto remove_slot; - if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) { + for (stubTest = virPCIKnownStubs; *stubTest != NULL; stubTest++) { + if (STREQ(driver, *stubTest)) { + isStub = true; + VIR_DEBUG("Found stub driver %s", *stubTest); + break; + } + } + if (!isStub) + goto remove_slot; + + if (virFileExists(drvdir)) { if (virPCIDriverFile(&path, driver, "unbind") < 0) { goto cleanup; } @@ -1141,7 +1177,7 @@ cleanup: VIR_FREE(path); if (result < 0) { - virPCIDeviceUnbindFromStub(dev, driver); + virPCIDeviceUnbindFromStub(dev); } return result; @@ -1183,25 +1219,15 @@ virPCIDeviceDetach(virPCIDevicePtr dev, int virPCIDeviceReattach(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, - virPCIDeviceListPtr inactiveDevs, - const char *driver) + virPCIDeviceListPtr inactiveDevs) { - if (!driver && dev->stubDriver) - driver = dev->stubDriver; - - if (virPCIProbeStubDriver(driver) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s"), driver); - return -1; - } - if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Not reattaching active device %s"), dev->name); return -1; } - if (virPCIDeviceUnbindFromStub(dev, driver) < 0) + if (virPCIDeviceUnbindFromStub(dev) < 0) return -1; /* Steal the dev from list inactiveDevs */ diff --git a/src/util/virpci.h b/src/util/virpci.h index 3911b72..7bcadb4 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -54,8 +54,7 @@ int virPCIDeviceDetach(virPCIDevicePtr dev, const char *driver); int virPCIDeviceReattach(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, - virPCIDeviceListPtr inactiveDevs, - const char *driver); + virPCIDeviceListPtr inactiveDevs); int virPCIDeviceReset(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, virPCIDeviceListPtr inactiveDevs); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 8971d4c..0642edb 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2254,7 +2254,7 @@ xenUnifiedNodeDeviceReAttach(virNodeDevicePtr dev) goto out; } - if (virPCIDeviceReattach(pci, NULL, NULL, "pciback") < 0) + if (virPCIDeviceReattach(pci, NULL, NULL) < 0) goto out; ret = 0; -- 1.7.11.7

2 2

[libvirt] [libvirt-glib] Rename misnamed 'conn' variable everywhere
by Christophe Fergeau 02 May '13

02 May '13

Through copy and paste from libvirt-gobject-connection.c, we end up with an instance variable named 'conn' in most of our classes even if we are not manipulating a connection object. This commit renames it all 'conn' occurrences in libvirt-gobject and libvirt-gconfig with a name more consistent with the type of the variable named 'conn'. --- .../libvirt-gconfig-domain-interface-bridge.c | 6 ++--- .../libvirt-gconfig-domain-interface-network.c | 6 ++--- .../libvirt-gconfig-domain-interface-user.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-interface.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network-filter.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-node-device.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-object.c | 12 +++++----- libvirt-gconfig/libvirt-gconfig-secret.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 6 ++--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-domain.c | 26 +++++++++++----------- libvirt-gobject/libvirt-gobject-interface.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-manager.c | 6 ++--- libvirt-gobject/libvirt-gobject-network-filter.c | 6 ++--- libvirt-gobject/libvirt-gobject-network.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-node-device.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-secret.c | 24 ++++++++++---------- libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ++-- libvirt-gobject/libvirt-gobject-storage-vol.c | 20 ++++++++--------- 23 files changed, 125 insertions(+), 125 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index fc2f359..c942200 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -45,11 +45,11 @@ static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInter } -static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *conn) +static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *bridge) { - g_debug("Init GVirConfigDomainInterfaceBridge=%p", conn); + g_debug("Init GVirConfigDomainInterfaceBridge=%p", bridge); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(conn); + bridge->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(bridge); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index a5f6270..8c0c920 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte } -static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *conn) +static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *iface) { - g_debug("Init GVirConfigDomainInterfaceNetwork=%p", conn); + g_debug("Init GVirConfigDomainInterfaceNetwork=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index a2b7219..2f844dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfa } -static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *conn) +static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *iface) { - g_debug("Init GVirConfigDomainInterfaceUser=%p", conn); + g_debug("Init GVirConfigDomainInterfaceUser=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index c46a23a..3d967f1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -42,11 +42,11 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass } -static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *conn) +static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *snapshot) { - g_debug("Init GVirConfigDomainSnapshot=%p", conn); + g_debug("Init GVirConfigDomainSnapshot=%p", snapshot); - conn->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 7ef0be8..eb97cd5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -188,11 +188,11 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) } -static void gvir_config_domain_init(GVirConfigDomain *conn) +static void gvir_config_domain_init(GVirConfigDomain *domain) { - g_debug("Init GVirConfigDomain=%p", conn); + g_debug("Init GVirConfigDomain=%p", domain); - conn->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(domain); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 4b63091..521455c 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -42,11 +42,11 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) } -static void gvir_config_interface_init(GVirConfigInterface *conn) +static void gvir_config_interface_init(GVirConfigInterface *iface) { - g_debug("Init GVirConfigInterface=%p", conn); + g_debug("Init GVirConfigInterface=%p", iface); - conn->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index 1efef7c..68c5c79 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -42,11 +42,11 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * } -static void gvir_config_network_filter_init(GVirConfigNetworkFilter *conn) +static void gvir_config_network_filter_init(GVirConfigNetworkFilter *filter) { - g_debug("Init GVirConfigNetworkFilter=%p", conn); + g_debug("Init GVirConfigNetworkFilter=%p", filter); - conn->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(filter); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index cd23aa6..e14b9c7 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -42,11 +42,11 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) } -static void gvir_config_network_init(GVirConfigNetwork *conn) +static void gvir_config_network_init(GVirConfigNetwork *network) { - g_debug("Init GVirConfigNetwork=%p", conn); + g_debug("Init GVirConfigNetwork=%p", network); - conn->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(network); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index e23cc7c..eab4aab 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -42,11 +42,11 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) } -static void gvir_config_node_device_init(GVirConfigNodeDevice *conn) +static void gvir_config_node_device_init(GVirConfigNodeDevice *device) { - g_debug("Init GVirConfigNodeDevice=%p", conn); + g_debug("Init GVirConfigNodeDevice=%p", device); - conn->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index d6e4bd8..9e3b5f2 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -120,10 +120,10 @@ static void gvir_config_object_set_property(GObject *object, static void gvir_config_object_finalize(GObject *object) { - GVirConfigObject *conn = GVIR_CONFIG_OBJECT(object); - GVirConfigObjectPrivate *priv = conn->priv; + GVirConfigObject *gvir_object = GVIR_CONFIG_OBJECT(object); + GVirConfigObjectPrivate *priv = gvir_object->priv; - g_debug("Finalize GVirConfigObject=%p", conn); + g_debug("Finalize GVirConfigObject=%p", gvir_object); g_free(priv->schema); @@ -182,11 +182,11 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) } -static void gvir_config_object_init(GVirConfigObject *conn) +static void gvir_config_object_init(GVirConfigObject *object) { - g_debug("Init GVirConfigObject=%p", conn); + g_debug("Init GVirConfigObject=%p", object); - conn->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(conn); + object->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(object); } void gvir_config_object_validate(GVirConfigObject *config, diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index fb268b0..c2dbcff 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -42,11 +42,11 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) } -static void gvir_config_secret_init(GVirConfigSecret *conn) +static void gvir_config_secret_init(GVirConfigSecret *secret) { - g_debug("Init GVirConfigSecret=%p", conn); + g_debug("Init GVirConfigSecret=%p", secret); - conn->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(secret); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index b06c24c..87caeb6 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -44,11 +44,11 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas } -static void gvir_config_storage_pool_init(GVirConfigStoragePool *conn) +static void gvir_config_storage_pool_init(GVirConfigStoragePool *pool) { - g_debug("Init GVirConfigStoragePool=%p", conn); + g_debug("Init GVirConfigStoragePool=%p", pool); - conn->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(conn); + pool->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(pool); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index e2a0ae8..6690dd7 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -44,11 +44,11 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) } -static void gvir_config_storage_vol_init(GVirConfigStorageVol *conn) +static void gvir_config_storage_vol_init(GVirConfigStorageVol *vol) { - g_debug("Init GVirConfigStorageVol=%p", conn); + g_debug("Init GVirConfigStorageVol=%p", vol); - conn->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(vol); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index b2c49a4..d4e9b97 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -61,8 +61,8 @@ static void gvir_domain_snapshot_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_domain_snapshot_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_domain_snapshot_set_property(GObject *object, static void gvir_domain_snapshot_finalize(GObject *object) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; - g_debug("Finalize GVirDomainSnapshot=%p", conn); + g_debug("Finalize GVirDomainSnapshot=%p", snapshot); virDomainSnapshotFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) } -static void gvir_domain_snapshot_init(GVirDomainSnapshot *conn) +static void gvir_domain_snapshot_init(GVirDomainSnapshot *snapshot) { - g_debug("Init GVirDomainSnapshot=%p", conn); + g_debug("Init GVirDomainSnapshot=%p", snapshot); - conn->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } typedef struct virDomainSnapshot GVirDomainSnapshotHandle; diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index a296144..c6e30e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -75,8 +75,8 @@ static void gvir_domain_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -84,7 +84,7 @@ static void gvir_domain_get_property(GObject *object, break; case PROP_PERSISTENT: - g_value_set_boolean(value, gvir_domain_get_persistent (conn)); + g_value_set_boolean(value, gvir_domain_get_persistent (domain)); break; default: @@ -98,8 +98,8 @@ static void gvir_domain_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -116,10 +116,10 @@ static void gvir_domain_set_property(GObject *object, static void gvir_domain_finalize(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; - g_debug("Finalize GVirDomain=%p", conn); + g_debug("Finalize GVirDomain=%p", domain); virDomainFree(priv->handle); @@ -129,8 +129,8 @@ static void gvir_domain_finalize(GObject *object) static void gvir_domain_constructed(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; G_OBJECT_CLASS(gvir_domain_parent_class)->constructed(object); @@ -232,11 +232,11 @@ static void gvir_domain_class_init(GVirDomainClass *klass) } -static void gvir_domain_init(GVirDomain *conn) +static void gvir_domain_init(GVirDomain *domain) { - g_debug("Init GVirDomain=%p", conn); + g_debug("Init GVirDomain=%p", domain); - conn->priv = GVIR_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); } typedef struct virDomain GVirDomainHandle; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index aaf81b9..1fc6656 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -61,8 +61,8 @@ static void gvir_interface_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_interface_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_interface_set_property(GObject *object, static void gvir_interface_finalize(GObject *object) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; - g_debug("Finalize GVirInterface=%p", conn); + g_debug("Finalize GVirInterface=%p", iface); virInterfaceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) } -static void gvir_interface_init(GVirInterface *conn) +static void gvir_interface_init(GVirInterface *iface) { - g_debug("Init GVirInterface=%p", conn); + g_debug("Init GVirInterface=%p", iface); - conn->priv = GVIR_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_INTERFACE_GET_PRIVATE(iface); } typedef struct virInterface GVirInterfaceHandle; diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 005b793..e20343e 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -108,13 +108,13 @@ static void gvir_manager_class_init(GVirManagerClass *klass) } -static void gvir_manager_init(GVirManager *conn) +static void gvir_manager_init(GVirManager *manager) { GVirManagerPrivate *priv; - g_debug("Init GVirManager=%p", conn); + g_debug("Init GVirManager=%p", manager); - priv = conn->priv = GVIR_MANAGER_GET_PRIVATE(conn); + priv = manager->priv = GVIR_MANAGER_GET_PRIVATE(manager); priv->lock = g_mutex_new(); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index c1ba6ac..60756c0 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -148,11 +148,11 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) } -static void gvir_network_filter_init(GVirNetworkFilter *conn) +static void gvir_network_filter_init(GVirNetworkFilter *filter) { - g_debug("Init GVirNetworkFilter=%p", conn); + g_debug("Init GVirNetworkFilter=%p", filter); - conn->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(filter); } typedef struct virNWFilter GVirNetworkFilterHandle; diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 25d89af..b1b38a0 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -62,8 +62,8 @@ static void gvir_network_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_network_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_network_set_property(GObject *object, static void gvir_network_finalize(GObject *object) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; - g_debug("Finalize GVirNetwork=%p", conn); + g_debug("Finalize GVirNetwork=%p", network); virNetworkFree(priv->handle); @@ -145,11 +145,11 @@ static void gvir_network_class_init(GVirNetworkClass *klass) } -static void gvir_network_init(GVirNetwork *conn) +static void gvir_network_init(GVirNetwork *network) { - g_debug("Init GVirNetwork=%p", conn); + g_debug("Init GVirNetwork=%p", network); - conn->priv = GVIR_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_NETWORK_GET_PRIVATE(network); } typedef struct virNetwork GVirNetworkHandle; diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 2540795..18394d1 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -61,8 +61,8 @@ static void gvir_node_device_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_node_device_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_node_device_set_property(GObject *object, static void gvir_node_device_finalize(GObject *object) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; - g_debug("Finalize GVirNodeDevice=%p", conn); + g_debug("Finalize GVirNodeDevice=%p", device); virNodeDeviceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) } -static void gvir_node_device_init(GVirNodeDevice *conn) +static void gvir_node_device_init(GVirNodeDevice *device) { - g_debug("Init GVirNodeDevice=%p", conn); + g_debug("Init GVirNodeDevice=%p", device); - conn->priv = GVIR_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_NODE_DEVICE_GET_PRIVATE(device); } typedef struct virNodeDevice GVirNodeDeviceHandle; diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 8ff17b5..f03b44c 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -62,8 +62,8 @@ static void gvir_secret_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_secret_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_secret_set_property(GObject *object, static void gvir_secret_finalize(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; - g_debug("Finalize GVirSecret=%p", conn); + g_debug("Finalize GVirSecret=%p", secret); virSecretFree(priv->handle); @@ -112,8 +112,8 @@ static void gvir_secret_finalize(GObject *object) static void gvir_secret_constructed(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; G_OBJECT_CLASS(gvir_secret_parent_class)->constructed(object); @@ -147,11 +147,11 @@ static void gvir_secret_class_init(GVirSecretClass *klass) } -static void gvir_secret_init(GVirSecret *conn) +static void gvir_secret_init(GVirSecret *secret) { - g_debug("Init GVirSecret=%p", conn); + g_debug("Init GVirSecret=%p", secret); - conn->priv = GVIR_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_SECRET_GET_PRIVATE(secret); } typedef struct virSecret GVirSecretHandle; diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 282eee1..e02adc8 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -123,8 +123,8 @@ static void gvir_storage_pool_finalize(GObject *object) static void gvir_storage_pool_constructed(GObject *object) { - GVirStoragePool *conn = GVIR_STORAGE_POOL(object); - GVirStoragePoolPrivate *priv = conn->priv; + GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePoolPrivate *priv = pool->priv; G_OBJECT_CLASS(gvir_storage_pool_parent_class)->constructed(object); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 7e5ac7d..4c0160a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -65,8 +65,8 @@ static void gvir_storage_vol_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -88,8 +88,8 @@ static void gvir_storage_vol_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -109,10 +109,10 @@ static void gvir_storage_vol_set_property(GObject *object, static void gvir_storage_vol_finalize(GObject *object) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; - g_debug("Finalize GVirStorageVol=%p", conn); + g_debug("Finalize GVirStorageVol=%p", vol); virStorageVolFree(priv->handle); @@ -154,11 +154,11 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) } -static void gvir_storage_vol_init(GVirStorageVol *conn) +static void gvir_storage_vol_init(GVirStorageVol *vol) { - g_debug("Init GVirStorageVol=%p", conn); + g_debug("Init GVirStorageVol=%p", vol); - conn->priv = GVIR_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_STORAGE_VOL_GET_PRIVATE(vol); } typedef struct virStorageVol GVirStorageVolHandle; -- 1.8.1.4

2 1

[libvirt] [libvirt-glib] gconfig: Fix gvir_config_domain_graphics_new_from_tree
by Christophe Fergeau 02 May '13

02 May '13

It does not handle the recently added GVirConfigDomainGraphicsRdp and GVirConfigDomainGraphicsDesktop classes. --- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 2b54b87..e42e0cc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -67,17 +67,13 @@ gvir_config_domain_graphics_new_from_tree(GVirConfigXmlDoc *doc, } else if (g_str_equal(type, "spice")) { gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SPICE; } else if (g_str_equal(type, "rdp")) { - goto unimplemented; + gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_RDP; } else if (g_str_equal(type, "desktop")) { - goto unimplemented; + gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_DESKTOP; } else { g_debug("Unknown graphics node: %s", type); return NULL; } return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); - -unimplemented: - g_debug("Parsing of '%s' graphics nodes is unimplemented", type); - return NULL; } -- 1.8.1.4

2 1

[libvirt] [PATCH] docs: Fix closing tag in snapshot documentation
by Christophe Fergeau 02 May '13

02 May '13

Commit cc6d19f3 added text containing "<code>snapshot<code>" to formatsnapshot.html.in. The closing tag is missing '/' which causes the documentation to misrender. --- Pushed under the trivial rule. docs/formatsnapshot.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatsnapshot.html.in b/docs/formatsnapshot.html.in index b1e259f..2e830f8 100644 --- a/docs/formatsnapshot.html.in +++ b/docs/formatsnapshot.html.in @@ -147,7 +147,7 @@ devices</a> specified for the domain at the time of the snapshot. The attribute <code>snapshot</code> is optional, and the possible values are the same as the - <code>snapshot<code> attribute for + <code>snapshot</code> attribute for <a href="formatdomain.html#elementsDisks">disk devices</a> (<code>no</code>, <code>internal</code>, or <code>external</code>). Some hypervisors like ESX -- 1.8.1.4

1 0

[libvirt] Entering freeze for libvirt-1.0.5
by Daniel Veillard 02 May '13

02 May '13

So as discussed earlier this week, I have tagged the release candidate 1 of libvirt-1.0.5 in git and pushed the tarball and associated rpms to the FTP at: ftp://libvirt.org/libvirt/ We may still push some of the patches needed by Laine to finish the serie started yesterday, but at this point we should focuse our commits on bug fixes and documentation. I will make an rc2 at the beginning of next week and hopefully can push the final version on May 2nd. This passed my own small usage tests, but please give it a try. As usual some feedback on portability issues are really welcome too :-) thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 16

[libvirt] Should we keep the original vnc behavior even if the underlying qemu changes?
by Guan Nan Ren 02 May '13

02 May '13

Hi Everybody, Since qemu v1.1.0 upstream commit 8cf364, qemu implemented shared-flag handling the default qemu vnc server behavior from mode 'ignore' to 'allow-exclusive'. The direct effect is as follows for libvirt user: vncviwer client: before: all client could share desktop without any option after: all client need -Shared options for desktop sharing. One client without -Shared option breaks others's connection virt-viewer: before: virt-viewer could support multiple desktop sharing after: only one active connection If we need to keep the original vnc behavior at libvirt level, the '-vnc :1,share=ignore' need to add into qemu commandline. Any ideas about this? Reference RFB Protocol about shared-flag Shared-flag is non-zero (true) if the server should try to share the desktop by leaving other clients connected, zero (false) if it should give exclusive access to this client by disconnecting all other clients From qemu doc: Set display sharing policy. 'allow-exclusive' allows clients to ask for exclusive access. As suggested by the rfb spec this is implemented by dropping other connections. Connecting multiple clients in parallel requires all clients asking for a shared session (vncviewer: -shared switch). This is the default. 'force-shared' disables exclusive client access. Useful for shared desktop sessions, where you don't want someone forgetting specify -shared disconnect everybody else. 'ignore' completely ignores the shared flag and allows everybody connect unconditionally. Doesn't conform to the rfb spec but is traditional qemu behavior. Guannan

2 1

[libvirt] Bug Reports
by Dennis Zou (yunzou) 01 May '13

01 May '13

1.Lost soapAction in http request header When I tried to retrieve the property of storage.perDatastoreUsage under specify virtual machine and got a invalidProperty error but other properties(e.g. summary.storage, guest) under the same virtual machine are ok. Then I write a same program use vsphere web service sdk in java and catch the http package by wireshark. By comparing, I found that we lost soapAction field in http request header, it seems to like this: SOAPAction: "urn:vim25/5.0". I checked the vsphere development document and found some key description as following: When a client application connects to a Web service running on an vSphere server (ESX/ESXi or vCenter Server system), the server detects the version of the API that was used to develop the client and makes available only those operations supported by the client. Client applications convey information about the API version used in the SOAP messages that they send to a vSphere server. These SOAP messages include a versionID in the soapAction attribute. The details are handled transparently by the SOAP toolkit and the client proxy code. The server adjusts its behavior based on the client's version information, exposing the API version that the client supports to the client. If you are developing a client application that must support multiple server versions at the same time (ESX/ESXi 5.0 and ESX/ESXi 3.x, for example), you must obtain information about the API versions that are supported on the server and provide logic in your code to use or not use features, based upon the version information. Finally, I added the soapAction field into http request header and got a correct result. So I added some lines in function esxVI_Context_Connect() at src/esx/esx_vi.c as following: if (virAsprintf(&soapAction, "SOAPAction: \"urn:vim25/%s\"", ctx->service->about->apiVersion) < 0) { virReportOOMError(); goto cleanup; } ctx->curl->headers = curl_slist_append(ctx->curl->headers, soapAction); 2.cat not deserialize the String(maybe other primary types are included) which as a list when I tried to retrieve the property of config.network.pnic under hostsystem and got an error in virsh.log which goes like as following: 2013-04-22 01:57:42.692+0000: 29640: error : esxVI_String_Deserialize:1233 : internal error Wrong XML element type 3 Then I debug my program and find that bug lays where deserialize resourcePoolSchedulerDisallowedReason which is a member of PhysicalNic and has a string[] type. I catch the soap message by wireshark and find that this xml element has no child ,it seems like as following: <resourcePoolSchedulerDisallowedReason>hardwareUnsupported</resourcePoolSchedulerDisallowedReason But the libvirt program still parses it as if it has children, I think this is key point that leads to this bug. Now I fix my program by setting this member as ignore in esx_vi_generator.input. Maybe you want to investigate and fix this bug. Regards, Dennis

2 1

[libvirt] libvirt-snmp on Ubuntu
by george john 01 May '13

01 May '13

Hi, Are there packages of "libvirt-snmp" for Ubuntu? Or instructions to compile libvirt-snmp on Ubuntu? Looks like the instructions given at http://wiki.libvirt.org/page/Libvirt-snmp are for RedHat. Thank you, George

1 0

[libvirt] [sandbox PATCH] Add a option --rpm if rpm autodetection fail
by Michael Scherer 01 May '13

01 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=954187 If someone use a custom unit file for the sandbox, the rpm autodetection fail with a exception. Now, this will show a error message, asking to use --rpm and use this rpm if autodetection fail. --- bin/virt-sandbox-service | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 3b78512..a076397 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -363,10 +363,11 @@ class SystemdContainer(Container): DEFAULT_UNIT = "/etc/systemd/system/%s_sandbox.service" - def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False): + def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False, rpm=None): Container.__init__(self, name, uri, path, config, create) self.copy = False self.unit_file_list = [] + self.rpm = rpm if create: self.config = LibvirtSandbox.ConfigServiceSystemd.new(name) else: @@ -496,8 +497,18 @@ WantedBy=%(TARGET)s self.ts = rpm.ts() + nb_rpm = 0 for u, src in self.unit_file_list: - self.extract_rpm_for_unit(src) + rpm_name = self.get_rpm_for_unit(src) + if rpm_name: + self.extract_rpm(rpm_name) + nb_rpm += 1 + + if nb_rpm == 0: + if self.rpm: + self.extract_rpm(self.rpm) + else: + raise ValueError([_("Cannot autodetect the rpm for unit files, please use --rpm")]) def split_filename(self, filename): if filename[-4:] == '.rpm': @@ -521,12 +532,21 @@ WantedBy=%(TARGET)s name = filename[epochIndex + 1:verIndex] return name, ver, rel, epoch, arch - def extract_rpm_for_unit(self, unitfile): + def get_rpm_for_unit(self, unitfile): mi = self.ts.dbMatch(rpm.RPMTAG_BASENAMES, unitfile) try: h = mi.next(); except exceptions.StopIteration: - raise ValueError([_("Cannot find package containing %s") % unitfile]) + return None + return h['name'] + + + def extract_rpm(self, rpm_name): + mi = self.ts.dbMatch('name', rpm_name) + try: + h = mi.next(); + except exceptions.StopIteration: + raise ValueError([_("Cannot find package named %s") % rpm_name]) for fentry in h.fiFromHeader(): fname = fentry[0] @@ -765,11 +785,14 @@ def create(args): if len(args.command) == 0 and len(args.unitfiles) == 0: raise ValueError([_("You must specify a command or a unit file")]) + if args.rpm and len(args.unitfiles) != 1: + raise ValueError([_("Option --rpm cannot be used without a unit file")]) + if len(args.command) > 0: container = GenericContainer(name = args.name, uri=args.uri, create = True) container.set_command(args.command) else: - container = SystemdContainer(name = args.name, uri=args.uri, create = True) + container = SystemdContainer(name = args.name, uri=args.uri, create = True, rpm = args.rpm) container.set_copy(args.copy) container.set_unit_file_list(args.unitfiles) for net in args.network: @@ -972,6 +995,15 @@ class SetNet(argparse.Action): nets = [values] setattr(namespace, self.dest, nets) +class CheckRpm(argparse.Action): + def __call__(self, parser, namespace, value, option_string=None): + nb_rpm = len(rpm.TransactionSet().dbMatch('name', value)) + if nb_rpm == 0: + raise OSError(_("Cannot find %s rpm") % value) + elif nb_rpm > 1: + raise OSError(_("%s rpm is installed more than once") % value) + setattr(namespace, self.dest, value) + def requires_name(parser): parser.add_argument("name", help=_("name of the sandbox container")) @@ -1015,6 +1047,10 @@ def gen_create_args(subparser): action=CheckUnit, dest="unitfiles", default=[], help=_("Systemd Unit file to run within the systemd sandbox container. Commands cannot be specified with unit files.")) + parser.add_argument("-r", "--rpm", + action=CheckRpm, + dest="rpm", default=None, + help=_("Rpm configuration to use in the container. Default: autodetected from unit files, unless if using a custom unit file.")) parser.add_argument("--username", dest="username", help=_("Specify the username for the container. Default: UID username.")) parser.add_argument("-U", "--uid", dest="uid", -- 1.8.2.1

2 2

[libvirt] [PATCHv2] rpc: message related sizes enlarged
by Viktor Mihajlovski 01 May '13

01 May '13

From: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> We have seen an issue on s390x platform where domain XMLs larger than 1MB were used. The define command was finished successfully. The dumpxml command was not successful (i.e. could not encode message payload). Enlarged message related sizes (e.g. maximum string size, message size, etc.) to handle larger system configurations used on s390x platform. To improve handling of the RPC message size the allocation during encode process is changed to a dynamic one (i.e. starting with 64kB initial size and increasing that size in steps up to 16MB if the payload data is larger). Signed-off-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/libvirt.c | 4 ++++ src/remote/remote_protocol.x | 6 +++--- src/rpc/virnetmessage.c | 46 ++++++++++++++++++++++++++++++++++-------- src/rpc/virnetmessage.h | 3 ++- src/rpc/virnetprotocol.x | 16 +++++++++++---- tests/virnetmessagetest.c | 2 +- 6 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2daa0b4..e6dd315 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7784,6 +7784,8 @@ error: * For your program to be able to work reliably over a remote * connection you should split large requests to <= 65536 bytes. * However, with 0.9.13 this RPC limit has been raised to 1M byte. + * Starting with version 1.0.5 the RPC limit has been raised again. + * Now large requests up to 16M byte are supported. * * Returns: 0 in case of success or -1 in case of failure. */ @@ -7934,6 +7936,8 @@ error: * For your program to be able to work reliably over a remote * connection you should split large requests to <= 65536 bytes. * However, with 0.9.13 this RPC limit has been raised to 1M byte. + * Starting with version 1.0.5 the RPC limit has been raised again. + * Now large requests up to 16M byte are supported. * * Returns: 0 in case of success or -1 in case of failure. */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 512ba2e..f61d10c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -65,7 +65,7 @@ * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const REMOTE_STRING_MAX = 1048576; +const REMOTE_STRING_MAX = 4194304; /* A long string, which may NOT be NULL. */ typedef string remote_nonnull_string<REMOTE_STRING_MAX>; @@ -160,13 +160,13 @@ const REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX = 1024; * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 4194304; /* Maximum length of a memory peek buffer message. * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 4194304; /* * Maximum length of a security label list. diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 647fef7..b2c6e5b 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -221,7 +221,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg) int ret = -1; unsigned int len = 0; - msg->bufferLength = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX; + msg->bufferLength = VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX; if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { virReportOOMError(); return ret; @@ -351,9 +351,27 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, msg->bufferLength - msg->bufferOffset, XDR_ENCODE); - if (!(*filter)(&xdr, data)) { - virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); - goto error; + /* Try to encode the payload. If the buffer is too small increase it. */ + while (!(*filter)(&xdr, data)) { + if ((msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 > VIR_NET_MESSAGE_MAX) { + virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); + goto error; + } + + xdr_destroy(&xdr); + + msg->bufferLength = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 + + VIR_NET_MESSAGE_LEN_MAX; + + if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { + virReportOOMError(); + goto error; + } + + xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, + msg->bufferLength - msg->bufferOffset, XDR_ENCODE); + + VIR_DEBUG("Increased message buffer length = %zu", msg->bufferLength); } /* Get the length stored in buffer. */ @@ -415,11 +433,23 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, XDR xdr; unsigned int msglen; + /* If the message buffer is too small for the payload increase it accordingly. */ if ((msg->bufferLength - msg->bufferOffset) < len) { - virReportError(VIR_ERR_RPC, - _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), - len, (msg->bufferLength - msg->bufferOffset)); - return -1; + if ((msg->bufferOffset + len) > VIR_NET_MESSAGE_MAX) { + virReportError(VIR_ERR_RPC, + _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), + len, (VIR_NET_MESSAGE_MAX - msg->bufferOffset)); + return -1; + } + + msg->bufferLength = msg->bufferOffset + len; + + if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { + virReportOOMError(); + return -1; + } + + VIR_DEBUG("Increased message buffer length = %zu", msg->bufferLength); } memcpy(msg->buffer + msg->bufferOffset, data, len); diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index dfa1c6c..c94dddc 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -34,7 +34,8 @@ typedef void (*virNetMessageFreeCallback)(virNetMessagePtr msg, void *opaque); struct _virNetMessage { bool tracked; - char *buffer; /* Typically VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX */ + char *buffer; /* Initially VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX */ + /* Maximum VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX */ size_t bufferLength; size_t bufferOffset; diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index eb2e81d..131e40b 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -44,23 +44,31 @@ /*----- Data types. -----*/ +/* Initial message size. + * When the message payload is larger this initial size will be + * quadrupled until the maximum total message size is reached. + */ +const VIR_NET_MESSAGE_INITIAL = 65536; + /* Maximum total message size (serialised). */ -const VIR_NET_MESSAGE_MAX = 4194304; +const VIR_NET_MESSAGE_MAX = 16777216; /* Size of struct virNetMessageHeader (serialised)*/ const VIR_NET_MESSAGE_HEADER_MAX = 24; /* Size of message payload */ -const VIR_NET_MESSAGE_PAYLOAD_MAX = 4194280; +const VIR_NET_MESSAGE_PAYLOAD_MAX = 16777192; -/* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX */ +/* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX + * and VIR_NET_MESSAGE_INITIAL. + */ const VIR_NET_MESSAGE_LEN_MAX = 4; /* Length of long, but not unbounded, strings. * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const VIR_NET_MESSAGE_STRING_MAX = 1048576; +const VIR_NET_MESSAGE_STRING_MAX = 4194304; /* Limit on number of File Descriptors allowed to be * passed per message diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index e58fd1f..607e0bd 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -47,7 +47,7 @@ static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) }; /* According to doc to virNetMessageEncodeHeader(&msg): * msg->buffer will be this long */ - unsigned long msg_buf_size = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX; + unsigned long msg_buf_size = VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX; int ret = -1; if (!msg) { -- 1.7.9.5

3 2

[libvirt] [PATCH v2 0/5] Support NBD volumes with LXC containers
by Daniel P. Berrange 01 May '13

01 May '13

A second version of: https://www.redhat.com/archives/libvir-list/2013-March/msg00941.html Aside from the addressing the previous round of feedbac, this adds use of the new '--format' flag to qemu-nbd. This is introduced due to CVE-2013-1922. The upshot is that this code won't work with any qemu-nbd binary lacking the --format flag. This is intentionale.

2 12

[libvirt] [PATCH] qemu: fix failure to start with spice graphics and no tls
by Laine Stump 01 May '13

01 May '13

Commit eca3fdf inadvertantly caused a failure to start for any domain with the following in its config: <graphics type='spice' autoport='yes'/> The problem is that when tlsPort == 0 and defaultMode == "any" (which is the default for defaultMode), this would be flagged in the code as "needTLSPort", and if there was then no spice tls config, the new error+fail would happen. This patch checks for the case of defaultMode == "any", and in that case simply doesn't allocate a TLS port (since that's probably not what the user wanted, and it would have failed later anyway.). It does leave the error in place for cases when the user specifically asked to use tls in one way or another, though. --- src/qemu/qemu_process.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e75c8c9..58f64b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3294,23 +3294,34 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, if (needTLSPort || graphics->data.spice.tlsPort == -1) { if (!cfg->spiceTLS) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Auto allocation of spice TLS port requested " - "but spice TLS is disabled in qemu.conf")); - goto error; - } - - if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto error; + /* log an error and fail if tls was specifically + * requested, or simply ignore (don't allocate a port) + * if we're here due to "defaultMode='any'" + * (aka unspecified). + */ + if ((graphics->data.spice.tlsPort == -1) || + (graphics->data.spice.defaultMode + == VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice TLS is disabled in qemu.conf")); + goto error; + } + } else { + /* cfg->spiceTLS *is* in place, so it makes sense to + * allocate a port. + */ + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) + goto error; - if (tlsPort == 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to find an unused port for SPICE TLS")); - virPortAllocatorRelease(driver->remotePorts, port); - goto error; + if (tlsPort == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find an unused port for SPICE TLS")); + virPortAllocatorRelease(driver->remotePorts, port); + goto error; + } + graphics->data.spice.tlsPort = tlsPort; } - - graphics->data.spice.tlsPort = tlsPort; } return 0; -- 1.7.11.7

2 2

[libvirt] [PATCH 0/2] Get rid of default USB controller on S390
by Viktor Mihajlovski 01 May '13

01 May '13

QEMU for S390 has presently no USB controllers nor a PCI bus. Both are created by the default in the libvirt domain definition. Although this can be suppressed by explicitly specifying an USB controller with model='none', it's a real bad default. With Jan's recent patch we can reliably suppress the USB controller (including it's bogus PCI address) if the source XML has no usb controller element. Explicitly set addresses are still honored. Viktor Mihajlovski (2): S390: Mention changed USB behavior S390: Do not generate a default USB controller docs/formatdomain.html.in | 5 +++-- src/qemu/qemu_domain.c | 8 ++++++++ .../qemuxml2argv-console-sclp.args | 2 +- .../qemuxml2argv-console-virtio-ccw.args | 2 +- .../qemuxml2argv-console-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 2 +- .../qemuxml2argv-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-net-virtio-ccw.args | 2 +- .../qemuxml2argv-net-virtio-s390.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 2 +- 12 files changed, 21 insertions(+), 12 deletions(-) -- 1.7.9.5

2 3

[libvirt] [PATCH] build: fix cygwin build in virnetdev
by Eric Blake 01 May '13

01 May '13

On cygwin, compilation failed because SIOCSIFHWADDR is undefined. * src/util/virnetdev.c (virNetDevSetMAC): Cygwin can query but not set mac address. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. I may have a few more cygwin-related patches as I continue to try and build there, but figured it's better to send things as individual patches instead of squashing unrelated fixes in one go. src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 0a3e17d..8013f23 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -132,7 +132,8 @@ int virNetDevExists(const char *ifname) #endif -#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(SIOCSIFHWADDR) && \ + defined(HAVE_STRUCT_IFREQ) /** * virNetDevSetMAC: * @ifname: interface name to set MTU for -- 1.8.1.4

1 0

[libvirt] [PATCH] build: fix cygwin build in virnetdev
by Eric Blake 01 May '13

01 May '13

On cygwin, compilation failed because SIOCSIFHWADDR is undefined. * src/util/virnetdev.c (virNetDevSetMAC): Cygwin can query but not set mac address. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 0a3e17d..8013f23 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -132,7 +132,8 @@ int virNetDevExists(const char *ifname) #endif -#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(SIOCSIFHWADDR) && \ + defined(HAVE_STRUCT_IFREQ) /** * virNetDevSetMAC: * @ifname: interface name to set MTU for -- 1.8.1.4

1 0

[libvirt] [PATCH] Need to call virFreeError after virSaveLastError
by John Ferlan 01 May '13

01 May '13

This is a followup to https://www.redhat.com/archives/libvir-list/2013-April/msg02004.html which noted that bridge_driver.c also had a missing virFreeError() call --- src/network/bridge_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 19c9bdb..8da28e4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2141,6 +2141,7 @@ err: /* return the original error */ virSetError(orig_error); + virFreeError(orig_error); return -1; } -- 1.8.1.4

2 2

[libvirt] [PATCH] libvirt-guests: status: return non-zero when stopped
by Ján Tomko 01 May '13

01 May '13

Return 3 when the service is stopped, whether there are saved guests or not. --- tools/libvirt-guests.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 4f2e203..261c488 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -524,10 +524,11 @@ rh_status() { else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then gettext "started"; echo + RETVAL=0 else gettext "stopped, with no saved guests"; echo + RETVAL=3 fi - RETVAL=0 fi } -- 1.8.1.5

2 2

[libvirt] Location of 64 bit libvirt dlls (Windows)?
by george john 01 May '13

01 May '13

Thank you for your email. I had tried compiling myself following the instructions at http://libvirt.org/windows.html (Matthias Bolte's msys_setup) but it failed on 2 different machines with an error. I get the below error when I try to run compile_libxml2.sh as per instructions https://github.com/photron/msys_setup/blob/master/readme_libvirt.txt Last few lines before the error is : >>>>>>>>>>>>>>>>> make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' Making install in tests make[4]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Nothing to be done for `install-exec-am'. test -z "/share/doc/libxml2-python-2.9.0/examples" || /bin/mkdir -p "/share/doc/ libxml2-python-2.9.0/examples" /bin/install -c -m 644 build.py attribs.py tst.py tstxpath.py xpathext.py push. py pushSAX.py pushSAXhtml.py error.py serialize.py validate.py tstURI.py cutnpas te.py xpathret.py xpath.py outbuf.py inbuf.py resolver.py regexp.py reader.py re ader2.py reader3.py reader4.py reader5.py reader6.py reader7.py reader8.py reade rnext.py walker.py nsdel.py ctxterror.py readererr.py relaxng.py schema.py threa d2.py sync.py tstLastError.py indexes.py dtdvalid.py tstmem.py '/share/doc/libxm l2-python-2.9.0/examples' /bin/install -c -m 644 validDTD.py validSchemas.py validRNG.py compareNodes.py xpathns.py xpathleak.py tst.xml valid.xml invalid.xml test.dtd '/share/doc/libxm l2-python-2.9.0/examples' make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[3]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[2]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[1]: Leaving directory `/src/libxml2/libxml2-2.9.0-0' + cp /python/Lib/site-packages/libxml2mod.dll /python/DLLs/libxml2mod.pyd cp: cannot stat `/python/Lib/site-packages/libxml2mod.dll': No such file or directory >>>>>>>>>>>>>>>>>> Do you know how this error could be resolved? Or are there a different set of instructions I could follow to create the a 64 bit libvirt dll (I am not a C/C++ guy and so have to ask for the instructions). I had posted another question to this forum earlier today(04/30/2013) with the subject "Java client error on Windows 7 64 bit for Libvirt on KVM" on this error. Thank you once again for your help. - George > > --- On Tue, 4/30/13, Eric Blake <eblake(a)redhat.com> > wrote: > > > From: Eric Blake <eblake(a)redhat.com> > > Subject: Re: [libvirt] Location of 64 bit libvirt dlls > (Windows)? > > To: "george john" <simplyjoe13(a)yahoo.com> > > Cc: libvir-list(a)redhat.com > > Date: Tuesday, April 30, 2013, 8:14 AM > > On 04/30/2013 08:49 AM, george john > > wrote: > > > I have written a Java client (64 bit JVM) that > uses > > libvirt APIs on a remote KVM for KVM management. Since > the > > JVM is 64 bit, the client needs 64 bit libvirt dlls and > I > > could not find them (I found 32 bit libvirt dlls on http://libvirt.org/windows.html) > > > > > > Could someone point to where I could find 64 bit > > libvirt dlls? > > > > I don't know if anyone is providing pre-compiled > versions of > > 64-bit > > dlls; you may have to compile it yourself using a > mingw64 > > (cross-)compiler. > > > > -- > > Eric Blake eblake redhat com > > +1-919-301-3266 > > Libvirt virtualization library http://libvirt.org > > > > >

1 0

[libvirt] [PATCH 0/2] fix cgroup setup for vfio hostdevs
by Laine Stump 30 Apr '13

30 Apr '13

The first patch is required for vfio hostdev to work. The 2nd is just a refactor to eliminate duplicated code for usb hostdev cgroup setup. Laine Stump (2): qemu: add vfio devices to cgroup ACL when appropriate qemu: put usb cgroup setup in common function src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 182 ++++++++++++++++++++++++++++++++----- src/qemu/qemu_cgroup.h | 9 +- src/qemu/qemu_hotplug.c | 26 ++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 5 files changed, 174 insertions(+), 46 deletions(-) -- 1.7.11.7

2 7

[libvirt] [PATCH] libxl: Fix double-dispose of libxl domain config
by Jim Fehlig 30 Apr '13

30 Apr '13

libxlBuildDomainConfig() was disposing the libxl_domain_config object on error, only to have it disposed again by libxlBuildDomainConfig()'s caller, which resulted in a segfault. Leave disposing of the config object to it's owner. --- src/libxl/libxl_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 7e0753a..3de642b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -796,19 +796,19 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, return -1; if (libxlMakeDomBuildInfo(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeDiskList(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeNicList(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeVfbList(driver, def, d_config) < 0) { - goto error; + return -1; } d_config->on_reboot = def->onReboot; @@ -816,8 +816,4 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, d_config->on_crash = def->onCrash; return 0; - -error: - libxl_domain_config_dispose(d_config); - return -1; } -- 1.8.0.1

2 2

[libvirt] [PATCH v2 00/37] Change OOM reporting
by Michal Privoznik 30 Apr '13

30 Apr '13

Previously, the first version dropped virReportOOMError from almost everywhere. This series don't set such high goal yet. It just prepares ground for doing so. The worst case scenario is the OOM error is reported twice. Once in VIR_ALLOC, VIR_STRDUP, virAsprintf (or similar), then in virReportOOMError itself. However, once this is pushed, it's easy to get rid of the latter one. Patches available at: git://gitorious.org/~zippy2/libvirt/michal-staging.git branch oom3 Remember, this will not be pushed until we are after the freeze. But the freeze creates a nice steady HEAD which is needed in such a giant change like this one. Michal Privoznik (37): virutil: Move string related functions to virstring.c virstring: Introduce VIR_STRUP and VIR_STRNDUP Adapt to VIR_STRDUP in daemon/* Adapt to VIR_STRDUP in src/conf/* Adapt to VIR_STRDUP in src/cpu/* Adapt to VIR_STRDUP in src/esx/* Adapt to VIR_STRDUP in src/hyperv/* Adapt to VIR_STRDUP in src/libxl/* Adapt to VIR_STRDUP in src/locking/* Adapt to VIR_STRDUP in src/lxc/* Adapt to VIR_STRDUP in src/network/* Adapt to VIR_STRDUP in src/node_device/* Adapt to VIR_STRDUP in src/interface/ Adapt to VIR_STRDUP in src/nwfilter/* Adapt to VIR_STRDUP in src/openvz/* Adapt to VIR_STRDUP in src/parallels/* Adapt to VIR_STRDUP in src/phyp/* Adapt to VIR_STRDUP in src/qemu/* Adapt to VIR_STRDUP in src/remote/* Adapt to VIR_STRDUP in src/rpc/* Adapt to VIR_STRDUP in src/secret/* Adapt to VIR_STRDUP in src/security/* Adapt to VIR_STRDUP in src/storage/* Adapt to VIR_STRDUP in src/test/* Adapt to VIR_STRDUP in src/uml/* Adapt to VIR_STRDUP in src/util/* Adapt to VIR_STRDUP in src/vbox/* Adapt to VIR_STRDUP in src/vmware/* Adapt to VIR_STRDUP in src/vmx/* Adapt to VIR_STRDUP in src/xen/* Adapt to VIR_STRDUP in src/xenapi/* Adapt to VIR_STRDUP in src/xenxs/* Adapt to VIR_STRDUP in tests/* Adapt to VIR_STRDUP in src/* Introduce syntax-check rule to prefer VIR_STRDUP over strdup virstring: Introduce virAsprintfQuiet and virVasprintfQuiet viralloc.c: Do report OOM error in VIR_ALLOC and friends HACKING | 19 ++ cfg.mk | 12 +- daemon/libvirtd-config.c | 39 +-- daemon/libvirtd.c | 19 +- daemon/remote.c | 97 +++---- docs/hacking.html.in | 26 ++ include/libvirt/libvirt.h.in | 10 +- po/POTFILES.in | 1 + python/libvirt-override.c | 103 +++---- src/conf/capabilities.c | 27 +- src/conf/cpu_conf.c | 14 +- src/conf/device_conf.c | 2 +- src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 66 ++--- src/conf/domain_conf.h | 1 - src/conf/domain_event.c | 31 +- src/conf/interface_conf.c | 1 - src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/netdev_vport_profile_conf.c | 1 + src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 29 +- src/conf/nwfilter_conf.c | 20 +- src/conf/nwfilter_conf.h | 1 - src/conf/nwfilter_params.c | 23 +- src/conf/secret_conf.c | 1 - src/conf/snapshot_conf.c | 8 +- src/conf/storage_conf.c | 11 +- src/conf/storage_conf.h | 1 - src/conf/storage_encryption_conf.c | 1 - src/conf/virchrdev.c | 7 +- src/cpu/cpu_generic.c | 6 +- src/cpu/cpu_map.c | 3 +- src/cpu/cpu_powerpc.c | 11 +- src/cpu/cpu_x86.c | 9 +- src/datatypes.c | 26 +- src/driver.c | 2 +- src/esx/esx_device_monitor.c | 1 - src/esx/esx_driver.c | 35 +-- src/esx/esx_interface_driver.c | 6 +- src/esx/esx_network_driver.c | 21 +- src/esx/esx_nwfilter_driver.c | 1 - src/esx/esx_secret_driver.c | 1 - src/esx/esx_storage_backend_iscsi.c | 15 +- src/esx/esx_storage_backend_vmfs.c | 10 +- src/esx/esx_util.c | 39 +-- src/esx/esx_vi.c | 54 +--- src/esx/esx_vi_types.c | 24 +- src/fdstream.c | 1 + src/hyperv/hyperv_device_monitor.c | 1 - src/hyperv/hyperv_driver.c | 37 +-- src/hyperv/hyperv_interface_driver.c | 1 - src/hyperv/hyperv_network_driver.c | 1 - src/hyperv/hyperv_nwfilter_driver.c | 1 - src/hyperv/hyperv_secret_driver.c | 1 - src/hyperv/hyperv_storage_driver.c | 1 - src/hyperv/hyperv_util.c | 16 +- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_udev.c | 25 +- src/libvirt.c | 10 +- src/libvirt_private.syms | 36 +-- src/libxl/libxl_conf.c | 59 ++-- src/libxl/libxl_driver.c | 14 +- src/locking/lock_daemon.c | 13 +- src/locking/lock_daemon_config.c | 10 +- src/locking/lock_daemon_dispatch.c | 4 +- src/locking/lock_driver_lockd.c | 24 +- src/locking/lock_driver_sanlock.c | 9 +- src/locking/lock_manager.c | 4 +- src/lxc/lxc_cgroup.c | 3 +- src/lxc/lxc_conf.c | 18 +- src/lxc/lxc_container.c | 10 +- src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 9 +- src/lxc/lxc_fuse.c | 1 + src/lxc/lxc_fuse.h | 1 - src/lxc/lxc_monitor.c | 1 + src/lxc/lxc_process.c | 5 +- src/network/bridge_driver.c | 30 +- src/node_device/node_device_driver.c | 29 +- src/node_device/node_device_hal.c | 13 +- src/node_device/node_device_linux_sysfs.c | 1 + src/node_device/node_device_udev.c | 104 +++---- src/nodeinfo.c | 6 +- src/nwfilter/nwfilter_dhcpsnoop.c | 16 +- src/nwfilter/nwfilter_driver.c | 5 +- src/nwfilter/nwfilter_ebiptables_driver.c | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 4 +- src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/openvz/openvz_conf.c | 33 ++- src/openvz/openvz_driver.c | 32 +-- src/parallels/parallels_driver.c | 36 +-- src/parallels/parallels_network.c | 14 +- src/parallels/parallels_storage.c | 40 ++- src/parallels/parallels_utils.c | 2 +- src/phyp/phyp_driver.c | 37 +-- src/qemu/qemu_agent.c | 1 + src/qemu/qemu_bridge_filter.c | 1 - src/qemu/qemu_capabilities.c | 38 +-- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 282 ++++++++----------- src/qemu/qemu_conf.c | 33 +-- src/qemu/qemu_domain.c | 17 +- src/qemu/qemu_driver.c | 93 +++--- src/qemu/qemu_hotplug.c | 9 +- src/qemu/qemu_migration.c | 17 +- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor_json.c | 40 ++- src/qemu/qemu_monitor_text.c | 10 +- src/qemu/qemu_process.c | 58 ++-- src/remote/remote_driver.c | 83 +++--- src/rpc/gendispatch.pl | 13 +- src/rpc/virkeepalive.c | 1 - src/rpc/virnetclient.c | 8 +- src/rpc/virnetmessage.c | 11 +- src/rpc/virnetsaslcontext.c | 3 +- src/rpc/virnetserver.c | 4 +- src/rpc/virnetserverclient.c | 8 +- src/rpc/virnetservermdns.c | 4 +- src/rpc/virnetsocket.c | 8 +- src/rpc/virnetsshsession.c | 23 +- src/rpc/virnettlscontext.c | 14 +- src/secret/secret_driver.c | 5 +- src/security/security_apparmor.c | 13 +- src/security/security_dac.c | 8 +- src/security/security_nop.c | 4 +- src/security/security_selinux.c | 51 ++-- src/security/virt-aa-helper.c | 6 +- src/storage/parthelper.c | 7 +- src/storage/storage_backend.c | 18 +- src/storage/storage_backend_disk.c | 16 +- src/storage/storage_backend_fs.c | 18 +- src/storage/storage_backend_iscsi.c | 16 +- src/storage/storage_backend_logical.c | 25 +- src/storage/storage_backend_mpath.c | 4 +- src/storage/storage_backend_rbd.c | 4 +- src/storage/storage_backend_scsi.c | 17 +- src/storage/storage_backend_sheepdog.c | 1 - src/storage/storage_driver.c | 13 +- src/test/test_driver.c | 84 +++--- src/uml/uml_conf.c | 7 +- src/uml/uml_driver.c | 8 +- src/util/iohelper.c | 1 + src/util/viralloc.c | 95 ++++++- src/util/viralloc.h | 54 +++- src/util/viraudit.c | 6 +- src/util/virauth.c | 9 +- src/util/virauthconfig.c | 7 +- src/util/virbitmap.c | 10 +- src/util/virbuffer.c | 8 +- src/util/vircgroup.c | 31 +- src/util/vircommand.c | 34 ++- src/util/vircommand.h | 1 - src/util/virconf.c | 21 +- src/util/virdnsmasq.c | 5 +- src/util/virebtables.c | 36 +-- src/util/virerror.c | 25 +- src/util/virfile.c | 1 + src/util/virhash.c | 5 +- src/util/virhook.h | 1 - src/util/viridentity.c | 9 +- src/util/virinitctl.c | 3 +- src/util/viriptables.c | 6 +- src/util/virjson.c | 18 +- src/util/virkeyfile.c | 7 +- src/util/virlockspace.c | 14 +- src/util/virlog.c | 21 +- src/util/virnetdev.c | 2 + src/util/virnetdevbandwidth.c | 1 + src/util/virnetdevbridge.c | 1 + src/util/virnetdevmacvlan.c | 10 +- src/util/virnetdevopenvswitch.c | 1 + src/util/virnetdevopenvswitch.h | 1 - src/util/virnetdevtap.c | 7 +- src/util/virnetdevveth.c | 2 + src/util/virnetdevvportprofile.c | 4 +- src/util/virobject.c | 5 +- src/util/virpci.c | 7 +- src/util/virpidfile.c | 1 + src/util/virprocess.c | 1 + src/util/virrandom.c | 1 + src/util/virsexpr.c | 27 +- src/util/virsocketaddr.c | 6 +- src/util/virstatslinux.c | 1 - src/util/virstoragefile.c | 13 +- src/util/virstring.c | 451 +++++++++++++++++++++++++++++- src/util/virstring.h | 74 +++++ src/util/virsysinfo.c | 170 +++++------ src/util/virthreadpthread.c | 2 +- src/util/virtime.c | 1 - src/util/virtpm.c | 2 +- src/util/virtypedparam.c | 9 +- src/util/viruri.c | 20 +- src/util/virusb.c | 1 + src/util/virutil.c | 393 ++------------------------ src/util/virutil.h | 49 ---- src/util/virxml.c | 7 +- src/vbox/vbox_MSCOMGlue.c | 1 - src/vbox/vbox_XPCOMCGlue.c | 5 +- src/vbox/vbox_driver.c | 1 - src/vbox/vbox_tmpl.c | 191 +++++++------ src/vmware/vmware_conf.c | 15 +- src/vmware/vmware_driver.c | 13 +- src/vmx/vmx.c | 26 +- src/xen/block_stats.c | 2 +- src/xen/xen_driver.c | 4 +- src/xen/xen_hypervisor.c | 17 +- src/xen/xen_inotify.c | 11 +- src/xen/xend_internal.c | 55 ++-- src/xen/xm_internal.c | 8 +- src/xen/xs_internal.c | 22 +- src/xenapi/xenapi_driver.c | 34 ++- src/xenapi/xenapi_utils.c | 22 +- src/xenxs/xen_sxpr.c | 108 +++---- src/xenxs/xen_xm.c | 44 +-- tests/commandhelper.c | 14 +- tests/commandtest.c | 4 +- tests/cputest.c | 1 + tests/domainsnapshotxml2xmltest.c | 1 + tests/esxutilstest.c | 1 - tests/interfacexml2xmltest.c | 2 +- tests/libvirtdconftest.c | 1 + tests/lxcxml2xmltest.c | 1 + tests/networkxml2conftest.c | 3 + tests/networkxml2xmltest.c | 1 + tests/nodedevxml2xmltest.c | 1 + tests/nodeinfotest.c | 2 +- tests/nwfilterxml2xmltest.c | 1 + tests/openvzutilstest.c | 8 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 1 + tests/qemumonitortest.c | 1 - tests/qemumonitortestutils.c | 10 +- tests/qemuxml2argvtest.c | 28 +- tests/qemuxml2xmltest.c | 1 + tests/qemuxmlnstest.c | 6 +- tests/securityselinuxhelper.c | 7 +- tests/securityselinuxlabeltest.c | 5 +- tests/securityselinuxtest.c | 9 +- tests/sexpr2xmltest.c | 1 + tests/storagebackendsheepdogtest.c | 6 +- tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2argvtest.c | 1 + tests/storagevolxml2xmltest.c | 1 + tests/sysinfotest.c | 2 +- tests/test_conf.c | 2 +- tests/testutils.c | 5 +- tests/testutilsqemu.c | 5 +- tests/virauthconfigtest.c | 1 - tests/virbuftest.c | 2 +- tests/vircgrouptest.c | 4 +- tests/virdrivermoduletest.c | 1 - tests/virhashtest.c | 3 +- tests/viridentitytest.c | 1 - tests/virkeyfiletest.c | 1 - tests/virnetmessagetest.c | 22 +- tests/virnetsockettest.c | 1 + tests/virportallocatortest.c | 2 +- tests/virshtest.c | 2 +- tests/virstoragetest.c | 1 + tests/virstringtest.c | 1 - tests/virtimetest.c | 1 - tests/viruritest.c | 1 - tests/vmx2xmltest.c | 11 +- tests/xencapstest.c | 1 + tests/xmconfigtest.c | 3 + tests/xml2sexprtest.c | 1 + tests/xml2vmxtest.c | 11 +- tools/console.c | 1 - tools/virsh-domain-monitor.c | 1 + tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 +- tools/virsh-interface.c | 1 + tools/virsh-network.c | 1 - tools/virsh-nodedev.c | 1 - tools/virsh-pool.c | 2 +- tools/virsh-snapshot.c | 1 - tools/virsh-volume.c | 1 + tools/virsh.c | 8 +- tools/virt-host-validate-common.c | 1 + 279 files changed, 2544 insertions(+), 2653 deletions(-) -- 1.8.1.5

3 50

[libvirt] [PATCH] security driver: eliminate memory leaks in failure paths
by Laine Stump 30 Apr '13

30 Apr '13

If virPCIDeviceGetVFIOGroupDev() failed, virSecurity*(Set|Restore)HostdevLabel() would fail to free a virPCIDevice that had been allocated. These leaks were all introduced (by me) very recently, in commit f0bd70a. --- src/security/security_apparmor.c | 4 +++- src/security/security_dac.c | 10 ++++++---- src/security/security_selinux.c | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 4fa0384..5be5ff0 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -835,8 +835,10 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr); VIR_FREE(vfioGroupDev); } else { diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 0366c17..e197eff 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -520,8 +520,10 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, params); VIR_FREE(vfioGroupDev); } else { @@ -530,7 +532,6 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, } virPCIDeviceFree(pci); - break; } @@ -611,15 +612,16 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecurityDACRestoreSecurityPCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecurityDACRestoreSecurityPCILabel, mgr); } virPCIDeviceFree(pci); - break; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 87a09c7..0cf4009 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1346,15 +1346,16 @@ virSecuritySELinuxSetSecurityHostdevSubsysLabel(virDomainDefPtr def, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecuritySELinuxSetSecurityPCILabel(pci, vfioGroupDev, def); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxSetSecurityPCILabel, def); } virPCIDeviceFree(pci); - break; } @@ -1518,15 +1519,16 @@ virSecuritySELinuxRestoreSecurityHostdevSubsysLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecuritySELinuxRestoreSecurityPCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxRestoreSecurityPCILabel, mgr); } virPCIDeviceFree(pci); - break; } -- 1.7.11.7

2 1

[libvirt] [PATCH] esx: Support virtualHW version 9
by Martin Kletzander 30 Apr '13

30 Apr '13

We already support ESX 5.1, but virtualHW version used by such hypervisor [1] wasn't taken into account. [1] http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externa… Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vmx/vmx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index f520a85..87bec5b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1,8 +1,7 @@ - /* * vmx.c: VMware VMX parsing/formatting functions * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2009-2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or @@ -45,6 +44,7 @@ domain-xml <=> vmx virtualHW.version = "4" # essential for ESX 3.5 virtualHW.version = "7" # essential for ESX 4.0 virtualHW.version = "8" # essential for ESX 5.0 + virtualHW.version = "9" # essential for ESX 5.1 ??? <=> guestOS = "<value>" # essential, FIXME: not representable @@ -1320,10 +1320,10 @@ virVMXParseConfig(virVMXContext *ctx, } if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8) { + virtualHW_version != 8 && virtualHW_version != 9) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4, 7 or 8 " - "but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be " + "4, 7, 8 or 9 but found %lld"), virtualHW_version); goto cleanup; } -- 1.8.2.1

2 3

[libvirt] libxl: expose and control xen device model versions
by David Scott 30 Apr '13

30 Apr '13

Hi, These patches expose multiple xen device model options in the capabilities XML and allow the user to select a specific device model via the domain XML's <emulator> tag. It is important to control the device model per VM, since the default is changing from xen-4.2 "qemu traditional" to xen-4.3 "qemu upstream". In this proposal, the capabilities XML now has multiple <domain> elements per <arch> as follows: <arch name='i686'> <wordsize>32</wordsize> <machine>xenfv</machine> <domain type='xen'> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> </domain> <domain type='xen'> <emulator>/usr/lib64/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> </domain> </arch> -- is it valid/ sensible to have multiple <domain>'s with the same 'type'? Let me know if you can think of a better mapping. Comments, criticism welcome. Cheers, Dave

3 13

[libvirt] Java client error on Windows 7 64 bit for Libvirt on KVM
by george john 30 Apr '13

30 Apr '13

Hi, I need some help in building a Java client on Windows 7 64 bit plaftorm to manage a KVM using the libvirt APIs. Using the instructions at http://libvirt.org/java.html, i was able to build libvirt.jar. My understanding is that libvirt.jar uses JNA to call libvirt's native windows library. I tried using the libvirt dlls in the experimental Windows installation package mentioned in http://libvirt.org/windows.html at http://libvirt.org/sources/win32_experimental/Libvirt-0.8.8-0.exe but whenever I try to connect to my remote API, I get the below Java exception : Exception in thread "main" java.lang.UnsatisfiedLinkError: %1 is not a valid Win32 application. at com.sun.jna.Native.open(Native Method) at com.sun.jna.Native.open(Native.java:1718) at com.sun.jna.NativeLibrary.loadLibrary(NativeLibrary.java:210) at com.sun.jna.NativeLibrary.getInstance(NativeLibrary.java:322) at com.sun.jna.Library$Handler.<init>(Library.java:142) at com.sun.jna.Native.loadLibrary(Native.java:387) at com.sun.jna.Native.loadLibrary(Native.java:366) at org.libvirt.jna.Libvirt.<clinit>(Unknown Source) at org.libvirt.Library.<clinit>(Unknown Source) at org.libvirt.Connect.<init>(Unknown Source) at Main.main(Main.java:8) But when I try the same client code on a Windows XP 32 bit machine (with 32 bit JVM), I don't see this problem and the connection succeeds. So it looks like the problem is that I am not using 64 bit windows libvirt dlls and 64 bit JVM cannot load 32 bit dlls. Is there a Windows installer with 64 bit Libvirt dlls ? Or are the 64 bit version of DLLs published somewhere? I tried using Matthias Bolte's msys_setup script (I tried in 2 machines) and in both machines, I get the below error when I try to run compile_libxml2.sh as per instructions https://github.com/photron/msys_setup/blob/master/readme_libvirt.txt Last few lines before the error is : >>>>>>>>>>>>>>>>> make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' Making install in tests make[4]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Nothing to be done for `install-exec-am'. test -z "/share/doc/libxml2-python-2.9.0/examples" || /bin/mkdir -p "/share/doc/ libxml2-python-2.9.0/examples" /bin/install -c -m 644 build.py attribs.py tst.py tstxpath.py xpathext.py push. py pushSAX.py pushSAXhtml.py error.py serialize.py validate.py tstURI.py cutnpas te.py xpathret.py xpath.py outbuf.py inbuf.py resolver.py regexp.py reader.py re ader2.py reader3.py reader4.py reader5.py reader6.py reader7.py reader8.py reade rnext.py walker.py nsdel.py ctxterror.py readererr.py relaxng.py schema.py threa d2.py sync.py tstLastError.py indexes.py dtdvalid.py tstmem.py '/share/doc/libxm l2-python-2.9.0/examples' /bin/install -c -m 644 validDTD.py validSchemas.py validRNG.py compareNodes.py xpathns.py xpathleak.py tst.xml valid.xml invalid.xml test.dtd '/share/doc/libxm l2-python-2.9.0/examples' make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[3]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[2]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[1]: Leaving directory `/src/libxml2/libxml2-2.9.0-0' + cp /python/Lib/site-packages/libxml2mod.dll /python/DLLs/libxml2mod.pyd cp: cannot stat `/python/Lib/site-packages/libxml2mod.dll': No such file or dire ctory >>>>>>>>>>>>>>>>>> Do you know how this error could be resolved? All help will be greatly appreciated. Thank you.

1 0

[libvirt] [PATCH] Fix typo in augeas comment
by Martin Kletzander 30 Apr '13

30 Apr '13

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as 'trivial' before 1.0.5 as suggested [1] by Michal [1] http://www.redhat.com/archives/libvir-list/2013-April/msg02059.html --- src/qemu/libvirtd_qemu.aug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 61740a9..a3dcb30 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -74,7 +74,7 @@ module Libvirtd_qemu = | int_entry "keepalive_interval" | int_entry "keepalive_count" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following ... *) let entry = vnc_entry | spice_entry | remote_display_entry -- 1.8.2.1

1 0

Re: [libvirt] [PATCH 2/4] QMP: add cpu-add command
by Eduardo Habkost 30 Apr '13

30 Apr '13

(CCing libvir-list) On Tue, Apr 30, 2013 at 08:34:01AM +0200, Igor Mammedov wrote: > Adds "cpu-add id=xxx" QMP command. > > cpu-add's "id" argument is a CPU number in a range [0..max-cpus) > > Example QMP command: > -> { "execute": "cpu-add", "arguments": { "id": 2 } } > <- { "return": {} } > > Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> > Acked-by: Luiz Capitulino <lcapitulino(a)redhat.com> > Reviewed-by: Eric Blake <eblake(a)redhat.com> The only way to find out if CPU hotplug is really available on a given machine-type is by actually trying to run cpu-add, right? Is this sufficient for libvirt requirements? > --- > v7: > * added "Since 1.5" to cpu-add qapi schema definition > v6: > * added valid values description to qapi schema > * split out cpu_hot_add hooks introduction into separate patch > * split out implementation of cpu_hot_add for target-i386 > v5: > * accept id=[0..max_cpus) range in cpu-add command > v4: > * merge "qmp: add cpu-add qmp command" & "target-i386: implement CPU hot-add" patches > * move notifier call to CPUCLass.realize() > * add hook cpu_hot_add to QEMUMachine > * make QEMUMachineInitArgs global and keep default cpu_model there > > v3: > * it appears that 'online/offline' in cpu-set are confusing people > with what command actually does and users might have to distinguish > if 'offline' is not implemented by parsing error message. To simplify > things replace cpu-set with cpu-add command to show more clear what > command does and just add cpu-del when CPU remove is implemented. > > v2: > * s/cpu_set/cpu-set/ > * qmp doc style fix > * use bool type instead of opencodding online/offline string > suggested-by: Eric Blake <eblake(a)redhat.com> > --- > qapi-schema.json | 13 +++++++++++++ > qmp-commands.hx | 23 +++++++++++++++++++++++ > qmp.c | 10 ++++++++++ > 3 files changed, 46 insertions(+) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 5b0fb3b..6f58b0f 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1387,6 +1387,19 @@ > { 'command': 'cpu', 'data': {'index': 'int'} } > > ## > +# @cpu-add > +# > +# Adds CPU with specified ID > +# > +# @id: ID of CPU to be created, valid values [0..max_cpus) > +# > +# Returns: Nothing on success > +# > +# Since 1.5 > +## > +{ 'command': 'cpu-add', 'data': {'id': 'int'} } > + > +## > # @memsave: > # > # Save a portion of guest memory to a file. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 0e89132..ed99eb8 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -385,6 +385,29 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command. > EQMP > > { > + .name = "cpu-add", > + .args_type = "id:i", > + .mhandler.cmd_new = qmp_marshal_input_cpu_add, > + }, > + > +SQMP > +cpu-add > +------- > + > +Adds virtual cpu > + > +Arguments: > + > +- "id": cpu id (json-int) > + > +Example: > + > +-> { "execute": "cpu-add", "arguments": { "id": 2 } } > +<- { "return": {} } > + > +EQMP > + > + { > .name = "memsave", > .args_type = "val:l,size:i,filename:s,cpu:i?", > .mhandler.cmd_new = qmp_marshal_input_memsave, > diff --git a/qmp.c b/qmp.c > index ed6c7ef..dd34be6 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -24,6 +24,7 @@ > #include "hw/qdev.h" > #include "sysemu/blockdev.h" > #include "qom/qom-qobject.h" > +#include "hw/boards.h" > > NameInfo *qmp_query_name(Error **errp) > { > @@ -108,6 +109,15 @@ void qmp_cpu(int64_t index, Error **errp) > /* Just do nothing */ > } > > +void qmp_cpu_add(int64_t id, Error **errp) > +{ > + if (current_machine->hot_add_cpu) { > + current_machine->hot_add_cpu(id, errp); > + } else { > + error_setg(errp, "Not supported"); > + } > +} > + > #ifndef CONFIG_VNC > /* If VNC support is enabled, the "true" query-vnc command is > defined in the VNC subsystem */ > -- > 1.8.2.1 > -- Eduardo

3 2

[libvirt] [PATCH] virsh: clarify vol-{down,up}load description
by Ján Tomko 30 Apr '13

30 Apr '13

Mention file/volume contents instead of just 'file'/'volume'. Also change Download->download in vol-download help, to be consistent with other volume commands. https://bugzilla.redhat.com/show_bug.cgi?id=955537 --- tools/virsh-volume.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 0ca295f..728bc23 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -590,10 +590,10 @@ cleanup: */ static const vshCmdInfo info_vol_upload[] = { {.name = "help", - .data = N_("upload a file into a volume") + .data = N_("upload file contents to a volume") }, {.name = "desc", - .data = N_("Upload a file into a volume") + .data = N_("Upload file contents to a volume") }, {.name = NULL} }; @@ -704,10 +704,10 @@ cleanup: */ static const vshCmdInfo info_vol_download[] = { {.name = "help", - .data = N_("Download a volume to a file") + .data = N_("download volume contents to a file") }, {.name = "desc", - .data = N_("Download a volume to a file") + .data = N_("Download volume contents to a file") }, {.name = NULL} }; -- 1.8.1.5

2 2

[libvirt] [PATCH v2] qemu: Generate agent socket path if missing
by Michal Privoznik 30 Apr '13

30 Apr '13

It's not desired to force users imagine path for a socket they are not even supposed to connect to. On the other hand, we already have a release where the qemu agent socket path is exposed to XML, so we cannot silently drop it from there. The new path is generated in form: $LOCALSTATEDIR/lib/libvirt/qemu/channel/target/$domain.$name --- docs/formatdomain.html.in | 7 ++++++- libvirt.spec.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 34 ++++++++++++++++------------------ src/qemu/qemu_domain.c | 16 ++++++++++++++++ 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 888c005..59cbe9b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3928,7 +3928,12 @@ qemu-kvm -net nic,model=? /dev/null then libvirt can interact with a guest agent installed in the guest, for actions such as guest shutdown or file system quiescing. Since 0.7.7, guest agent interaction - since 0.9.10</dd> + since 0.9.10 Moreover, since 1.0.5 + it is possible to have source path auto generated for virtio unix channels. + This is very useful in case of a qemu guest agent, where users don't + usually care about the source path since it's libvirt who talks to + the guest agent. In case users want to utilize this feature, they should + leave <code><source></code> element out. <dt><code>spicevmc</code></dt> <dd>Paravirtualized SPICE channel. The domain must also have a diff --git a/libvirt.spec.in b/libvirt.spec.in index 328b009..11fc12d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1719,6 +1719,7 @@ fi %if %{with_qemu} %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr{0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} diff --git a/src/Makefile.am b/src/Makefile.am index 3adddb4..914b57d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2098,6 +2098,7 @@ if WITH_SANLOCK endif if WITH_QEMU $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dc0ecaa..839e849 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6507,7 +6507,9 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (path == NULL) { + /* path can be auto generated */ + if (!path && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); goto error; @@ -6602,7 +6604,6 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, char *type = NULL; const char *nodeName; virDomainChrDefPtr def; - int remaining; bool seenTarget = false; if (!(def = virDomainChrDefNew())) @@ -6626,29 +6627,26 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, } cur = node->children; - remaining = virDomainChrSourceDefParseXML(&def->source, cur, flags, - def, ctxt, - vmSeclabels, nvmSeclabels); - if (remaining < 0) - goto error; - if (remaining) { - while (cur != NULL) { - if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "target")) { - seenTarget = true; - if (virDomainChrDefParseTargetXML(def, cur) < 0) { - goto error; - } + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) { + seenTarget = true; + if (virDomainChrDefParseTargetXML(def, cur) < 0) { + goto error; } } - cur = cur->next; } + cur = cur->next; } if (!seenTarget && ((def->targetType = virDomainChrDefaultTargetType(def->deviceType)) < 0)) goto cleanup; + if (virDomainChrSourceDefParseXML(&def->source, node->children, flags, def, + ctxt, vmSeclabels, nvmSeclabels) < 0) + goto error; + if (def->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { if (def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -14094,8 +14092,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, case VIR_DOMAIN_CHR_TYPE_UNIX: virBufferAsprintf(buf, " <source mode='%s'", def->data.nix.listen ? "bind" : "connect"); - virBufferEscapeString(buf, " path='%s'/>\n", - def->data.nix.path); + virBufferEscapeString(buf, " path='%s'", def->data.nix.path); + virBufferAddLit(buf, "/>\n"); break; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a7aabdf..d8a87a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -745,6 +745,22 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X)) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO; + /* auto generate unix socket path */ + if (dev->type == VIR_DOMAIN_DEVICE_CHR && + dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !dev->data.chr->source.data.nix.path && + (driver && (cfg = virQEMUDriverGetConfig(driver)))) { + + if (virAsprintf(&dev->data.chr->source.data.nix.path, + "%s/channel/target/%s.%s", + cfg->libDir, def->name, + dev->data.chr->target.name) < 0) + goto no_memory; + dev->data.chr->source.data.nix.listen = true; + } + ret = 0; cleanup: -- 1.8.1.5

2 1

[libvirt] RFE: Ability to freeze/thaw guest using libvirt/virsh APIs
by Deepak C Shetty 30 Apr '13

30 Apr '13

I am sending this mail based on the below IRC discussion. Apr 23 18:55:02 <deepakcs> Hi all, is there a way to just do a fsfreeze (and un-freeze) of VM usign virsh. I don't see any option today.... Apr 23 18:55:52 <deepakcs> there is option to take snapshot (which in turn would do freeze/un-freeze), but i want to exercise the freeze/un-freeze only.. w/o the snapshot Apr 23 19:23:57 <eblake> deepakcs: virsh qemu-agent-command can trigger any agent command Apr 23 19:24:35 <eblake> but it is officially unsupported - more of a development aid Apr 23 19:26:38 <eblake> if it turns out that freezing the guest with libvirt commands is worth promoting into a supported api, instead of the qemu-agent-command backdoor, then report that as an RFE to the list Apr 23 19:27:14 <deepakcs> eblake, sorry was in a mtg.. Apr 23 19:28:03 <deepakcs> eblake, yeah.. i was wondering that it would be good to have freeze/un-freeze as supported virsh ops.. then it helps users exploit snapshot functionality provided by things like storage arrays (as an example) Apr 23 19:28:47 <eblake> well, as qemu continues to add more snapshot building blocks, it may make sense

1 0

[libvirt] [PATCH v2] virsh: fix incorrect argument errors for long options
by Ján Tomko 30 Apr '13

30 Apr '13

For long options, print: * the option as specified by the user if it's unknown * the cannoncial long option if its argument is not a number (and should be) And for missing arguments, print both the short and the long option name. (Doing only one of those would require either parsing argv ourselves or let getopt print the errors, since we can't tell long and short options apart by optopt or longindex) https://bugzilla.redhat.com/show_bug.cgi?id=949373 --- v1: https://www.redhat.com/archives/libvir-list/2013-April/msg01653.html tools/virsh.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6ec2f7b..ac86608 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2978,7 +2978,8 @@ vshAllowedEscapeChar(char c) static bool vshParseArgv(vshControl *ctl, int argc, char **argv) { - int arg, len, debug; + int arg, len, debug, i; + int longindex = -1; struct option opt[] = { {"debug", required_argument, NULL, 'd'}, {"help", no_argument, NULL, 'h'}, @@ -2995,11 +2996,12 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+:d:hqtc:vVrl:e:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+:d:hqtc:vVrl:e:", opt, &longindex)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { - vshError(ctl, "%s", _("option -d takes a numeric argument")); + vshError(ctl, _("option %s takes a numeric argument"), + longindex == -1 ? "-d" : "--debug"); exit(EXIT_FAILURE); } if (debug < VSH_ERR_DEBUG || debug > VSH_ERR_ERROR) @@ -3050,15 +3052,24 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } break; case ':': - vshError(ctl, _("option '-%c' requires an argument"), optopt); - exit(EXIT_FAILURE); + for (i = 0; opt[i].name != NULL; i++) { + if (opt[i].val == optopt) { + vshError(ctl, _("option '-%c'/'--%s' requires an argument"), + optopt, opt[i].name); + exit(EXIT_FAILURE); + } + } case '?': - vshError(ctl, _("unsupported option '-%c'. See --help."), optopt); + if (optopt) + vshError(ctl, _("unsupported option '-%c'. See --help."), optopt); + else + vshError(ctl, _("unsupported option '%s'. See --help."), argv[optind - 1]); exit(EXIT_FAILURE); default: vshError(ctl, _("unknown option")); exit(EXIT_FAILURE); } + longindex = -1; } if (argc > optind) { -- 1.8.1.5

2 2

[libvirt] [PATCH v2 0/2] qemu: xml->native memballoon fixes
by Ján Tomko 30 Apr '13

30 Apr '13

v1: https://www.redhat.com/archives/libvir-list/2013-April/msg01910.html v2: Instead of assuming 'pci' as the default memballoon device, assign the addresses when doing xml->native conversion and add an error message for the wrong address type. Ján Tomko (2): qemu: assign addresses when converting xml to native qemu: report an error if memballoon has wrong address type src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_driver.c | 3 +++ 2 files changed, 6 insertions(+) -- 1.8.1.5

2 5

[libvirt] [PATCH] qemu: Error out if spice port autoallocation is requested, but disabled
by Peter Krempa 30 Apr '13

30 Apr '13

When a user requests auto-allocation of the spice TLS port but spice TLS is disabled in qemu.conf, we start the machine and let qemu fail instead of erroring out sooner. Add an error message so that this doesn't happen. --- src/qemu/qemu_process.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f12d7d5..e81e57f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3292,8 +3292,14 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, graphics->data.spice.port = port; } - if (cfg->spiceTLS && - (needTLSPort || graphics->data.spice.tlsPort == -1)) { + if (needTLSPort || graphics->data.spice.tlsPort == -1) { + if (!cfg->spiceTLS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice is disabled in qemu.conf")); + goto error; + } + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) goto error; -- 1.8.2.1

2 2

[libvirt] [PATCH] network: Don't remove transient network if creating of config file fails
by Peter Krempa 30 Apr '13

30 Apr '13

On the off-chance that creation of persistent configuration file would fail when defining a network that is already started as transient, the code would remove the transient data structure and thus the network. This patch changes the code so that in such case, the network is again marked as transient and left behind. --- src/network/bridge_driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 27dd230..64c71af 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3160,8 +3160,13 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { freeDef = false; if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { - virNetworkRemoveInactive(&driver->networks, network); - network = NULL; + if (!virNetworkObjIsActive(network)) { + virNetworkRemoveInactive(&driver->networks, network); + network = NULL; + goto cleanup; + } + network->persistent = 0; + virNetworkDefFree(network->newDef); goto cleanup; } -- 1.8.2.1

2 3

[libvirt] [PATCH 0/2] libxl: Add support for qdisk disk backend
by Jim Fehlig 30 Apr '13

30 Apr '13

This small patch series adds support for qdisk backend type in libxl. A qdisk uses the block drivers in qemu to serve as a block backend, verses blktap or blkbk. While testing the second patch, I noticed a slightly misleading error was emitted when the tap backend didn't support the requested disk format. Fix this with the first patch, including adding format checks in the other supported disk backends. Jim Fehlig (2): libxl: Fix disk format error message libxl: support qdisk backend src/libxl/libxl_conf.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) -- 1.8.0.1

1 2

[libvirt] [PATCH 0/2] [RFC] Support for VNC WebSocket
by Martin Kletzander 30 Apr '13

30 Apr '13

This series, which is meant to be applied _after_ 1.0.5 release, is adding support for the VNC WebSocket to be configured for QEMU. I tagged this with [RFC] because this is the fastest way I managed to code it and I'd welcome any opinions on naming changes etc. Documentation from qemu_options.hx: qemu -vnc ...,websocket[=<port>] Opens an additional TCP listening port dedicated to VNC Websocket connections. By definition the Websocket port is 5700+@var{display}. If @var{host} is specified connections will only be allowed from this host. As an alternative the Websocket port could be specified by using @code{websocket}=@var{port}. Martin Kletzander (2): Add VNC WebSocket support qemu: Add VNC WebSocket support docs/formatdomain.html.in | 5 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 18 +++++++ src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 4 +- src/qemu/qemu.conf | 7 +++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 60 +++++++++++++++++++++- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_conf.c | 32 ++++++++++++ src/qemu/qemu_conf.h | 6 +++ src/qemu/qemu_driver.c | 5 ++ src/qemu/qemu_process.c | 31 ++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 2 + tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-graphics-vnc-websocket.args | 4 ++ .../qemuxml2argv-graphics-vnc-websocket.xml | 35 +++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 219 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml -- 1.8.2.1

4 7

[libvirt] [PATCH] qemu: honor allowDiskFormatProbing when parsing command line
by Ján Tomko 30 Apr '13

30 Apr '13

My commit 024e9af broke this. --- src/qemu/qemu_command.c | 3 --- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml | 4 ++-- .../qemuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +- 57 files changed, 72 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d23bdfc..d161b56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8540,7 +8540,6 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->type = VIR_DOMAIN_DISK_TYPE_FILE; - def->format = VIR_STORAGE_FILE_AUTO; for (i = 0 ; i < nkeywords ; i++) { if (STREQ(keywords[i], "file")) { @@ -9788,8 +9787,6 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, if (VIR_ALLOC(disk) < 0) goto no_memory; - disk->format = VIR_STORAGE_FILE_AUTO; - if (STRPREFIX(val, "/dev/")) disk->type = VIR_DOMAIN_DISK_TYPE_BLOCK; else if (STRPREFIX(val, "nbd:")) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml index c9fcfbb..b5c37bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml index f662990..e42f7ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/firmware.img'/> <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml index 9230816..8124f34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml index b4e7424..2acb71f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml index 1d7cc95..138a83a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml index a767eea..b1ee29c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml index a90be1c..d8ff676 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml index 259ea1f..75b9cec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml index 8683233..59ef29d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml index 32e511e..0c9bc08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml index f1840d0..bba512e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml index 0d47dfa..8bbd324 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml @@ -15,19 +15,19 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/fd0'/> <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/firmware.img'/> <target dev='fdb' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml index d91b783..edcd015 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdb' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='hdd' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='1'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml index 5f8b8e0..730c4f3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index 2ca305a..3e2e550 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='vda' bus='virtio'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='vdb' bus='virtio'/> </disk> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml index af3a4b7..3baf97d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='xvda' bus='xen'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='xvdg' bus='xen'/> </disk> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 64f173e..7793161 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index 99d13a5..26fe28b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index 4fe20c3..75563df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index b3214fd..24c7eed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index 4fe20c3..75563df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index 65f990b..6dcd076 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml index 63a0d2a..422127c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml index 26e8b42..ee00634 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml index c4534c4..0863737 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml index 208e2b7..03558dd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml index ab17e56..5eb229f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml index 7294ebb..0dd5b39 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml index 4997e5b..6fe8a85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml index 5f5690d..b9313e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml index a81f3c4..f432732 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml @@ -19,7 +19,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml index 42ad266..cea52f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml index f066c13..10c2d41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index 4997e5b..6fe8a85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index e8c2bf7..8ad6eb7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 4bc79ce..6f00fe1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml index e1d3046..960b7aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml index a699f6e..195a3d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml index 53381fb..60ea846 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml index 45ede22..29f84db 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml index 1d7cc95..138a83a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml index cde9718..b1a7429 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml index f7da73e..4335f43 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml index f5215bb..4829285 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml index b5be682..d2af760 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml index 4c4a131..06ce154 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml index 64361cc..493f8a1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml index b8895c2..d525965 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml index b24269b..8aa052d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml index e63ff57..12107d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml index 83ddcb3..55bf16d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index 21db704..0bd1185 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml index 31c0152..32d57e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> -- 1.8.1.5

2 2

[libvirt] [PATCH] Resolve valgrind error
by John Ferlan 29 Apr '13

29 Apr '13

As a result of commit id '19c345f2', 'make -C tests valgrind' has the following for qemuxml2argvtest: ==22482== 197 (80 direct, 117 indirect) bytes in 1 blocks are definitely lost in loss record 101 of 120 ==22482== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==22482== by 0x4C6F301: virAlloc (viralloc.c:124) ==22482== by 0x4C840FC: virSaveLastError (virerror.c:308) ==22482== by 0x431882: qemuBuildCommandLine (qemu_command.c:8204) ==22482== by 0x41E8F0: testCompareXMLToArgvHelper (qemuxml2argvtest.c:155) ==22482== by 0x41FE9F: virtTestRun (testutils.c:157) ==22482== by 0x419DEB: mymain (qemuxml2argvtest.c:654) ==22482== by 0x4204DA: virtTestMain (testutils.c:719) ==22482== by 0x39D0821A04: (below main) (libc-start.c:225) ==22482== --- src/qemu/qemu_command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d23bdfc..421a93c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8205,6 +8205,7 @@ error: for (i = 0; i <= last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); virSetError(originalError); + virFreeError(originalError); virCommandFree(cmd); return NULL; } -- 1.8.1.4

2 2

[libvirt] [PATCHv2] qemu: Do fake auto-allocation of ports when generating native command
by Peter Krempa 29 Apr '13

29 Apr '13

When attempting to generate the native command line from an XML file that uses graphics port auto allocation, the generated commandline wouldn't be valid. This patch adds fake autoallocation of ports as done when starting the actual machine. --- src/qemu/qemu_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d3b24a..068d6c4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5271,6 +5271,58 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + /* do fake auto-alloc of graphics ports, if such config is used */ + for (i = 0 ; i < def->ngraphics; ++i) { + virDomainGraphicsDefPtr graphics = def->graphics[i]; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + !graphics->data.vnc.socket && graphics->data.vnc.autoport) { + graphics->data.vnc.port = 5900; + } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + int j; + bool needTLSPort = false; + bool needPort = false; + int defaultMode = graphics->data.spice.defaultMode; + + if (graphics->data.spice.autoport) { + /* check if tlsPort or port need allocation */ + for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) { + switch (graphics->data.spice.channels[j]) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + switch (defaultMode) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + needTLSPort = true; + needPort = true; + break; + } + break; + } + } + } + + if (needPort || graphics->data.spice.port == -1) + graphics->data.spice.port = 5901; + + if (needTLSPort || graphics->data.spice.tlsPort == -1) + graphics->data.spice.tlsPort = 5902; + } + } + if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) -- 1.8.2.1

3 3

[libvirt] [PATCH] qemu: Do fake auto-allocation of ports when generating native command
by Peter Krempa 29 Apr '13

29 Apr '13

When attempting to generate the native command line from an XML file that uses graphics port auto allocation, the generated commandline wouldn't be valid. This patch adds fake autoallocation of ports as done when starting the actual machine. --- src/qemu/qemu_driver.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d3b24a..cec4a7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5271,6 +5271,57 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + /* do fake auto-alloc of graphics ports, if such config is used */ + for (i = 0 ; i < vm->def->ngraphics; ++i) { + virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + !graphics->data.vnc.socket && graphics->data.vnc.autoport) { + graphics->data.vnc.port = 5900; + } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + int j; + bool needTLSPort = false; + bool needPort = false; + + if (graphics->data.spice.autoport) { + /* check if tlsPort or port need allocation */ + for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) { + switch (graphics->data.spice.channels[j]) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + switch (defaultMode) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + needTLSPort = true; + needPort = true; + break; + } + break; + } + } + } + + if (needPort || graphics->data.spice.port == -1) + graphics->data.spice.port = 5901; + + if (needTLSPort || graphics->data.spice.tlsPort == -1) + graphics->data.spice.tlsPort = 5902; + } + } + if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) -- 1.8.2.1

1 1

[libvirt] [libvirt-java] [Patch] remove unused imports
by Stefan Majer 29 Apr '13

29 Apr '13

Hi, Clean up all java classes which have imports which are not used. Greetings Stefan Majer --- src/main/java/org/libvirt/Device.java | 1 - src/main/java/org/libvirt/Domain.java | 1 - src/main/java/org/libvirt/DomainSnapshot.java | 1 - src/main/java/org/libvirt/ErrorHandler.java | 1 - src/main/java/org/libvirt/Interface.java | 1 - src/main/java/org/libvirt/StorageVol.java | 1 - 6 files changed, 6 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index 416e06a..fe49ce9 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.DevicePointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; /** diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 12ff7f5..85de9b3 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -17,7 +17,6 @@ import com.sun.jna.Native; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; -import com.sun.jna.ptr.PointerByReference; /** * A virtual machine defined within libvirt. diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index 355d9d0..b58fd20 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.DomainSnapshotPointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; public class DomainSnapshot { diff --git a/src/main/java/org/libvirt/ErrorHandler.java b/src/main/java/org/libvirt/ErrorHandler.java index 4dd7c90..434c85d 100644 --- a/src/main/java/org/libvirt/ErrorHandler.java +++ b/src/main/java/org/libvirt/ErrorHandler.java @@ -1,6 +1,5 @@ package org.libvirt; -import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.Libvirt; import org.libvirt.jna.virError; diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 71ba3da..7782fb9 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.InterfacePointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; import com.sun.jna.Pointer; diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 39776b2..561cb4d 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -1,6 +1,5 @@ package org.libvirt; -import org.libvirt.jna.Libvirt; import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStorageVolInfo; -- 1.7.9.5 -- Stefan Majer

2 1

Re: [libvirt] [Xen-devel] libvirt, libxl and QDISKs
by Jim Fehlig 29 Apr '13

29 Apr '13

David Scott wrote: >> Something like the attached, which seems to work well for me when >> specifying driverName = qemu, e.g. >> >> <disk type='file' device='disk'> >> <driver name='qemu'/> >> <source file='/var/lib/xen/images/sles11sp2-pv/disk0.raw'/> >> <target dev='xvda' bus='xen'/> >> </disk> > > This also works for me! Good to hear. I'll send the patch to the libvirt list. > > On a related note, what do you think about the attached patch? It > allows the user to select a non-default qemu via the <emulator> > element. My domain XML looked like this: > > <devices> > <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> IMO, the possible emulators should be exposed in the capabilities. E.g. on a machine with both kvm and qemu, both emulators are shown as possibilities for an hvm, x86_64 guest # virsh capabilities ... <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <domain type='qemu'> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc-1.1</machine> <machine canonical='pc-1.1'>pc</machine> <machine>pc-1.0</machine> <machine>pc-0.15</machine> <machine>pc-0.14</machine> <machine>pc-0.13</machine> <machine>pc-0.12</machine> <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine>pc-1.1</machine> <machine canonical='pc-1.1'>pc</machine> <machine>pc-1.0</machine> <machine>pc-0.15</machine> <machine>pc-0.14</machine> <machine>pc-0.13</machine> <machine>pc-0.12</machine> <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> </domain> .... </guest> ... > <disk device="disk" type="network"> > <driver name='qemu'/> > <source protocol="rbd" name="rbd:rbd/ubuntu1204.img"/> > <target dev="hda"/> > </disk> > <graphics type="vnc" port="-1" autoport="yes" listen="0.0.0.0"/> > </devices> > > Now that upstream qemu is the default in xen-4.3, it seems useful to > be able to select the traditional qemu for older VMs. Agreed. And reporting that both emulators exist via the capabilities would be helpful for users. > > Also I backported this to my xen-4.2 system and used this patch + your > patch + the previous 'stat()' fix to successfully start a VM on ceph > storage via libvirt + libxl (my quest is almost complete!) Nice! > diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c > index f549a5d..abbd3c0 100644 > --- a/src/libxl/libxl_conf.c > +++ b/src/libxl/libxl_conf.c > @@ -811,6 +811,30 @@ libxlMakeCapabilities(libxl_ctx *ctx) > } > > int > +libxlMakeEmulator(virDomainDefPtr def, libxl_domain_config *d_config) > +{ > + /* No explicit override means use the default */ > + if (!def->emulator) { > + return 0; > + } > + if (strstr(def->emulator, "/qemu-system-")) { > + d_config->b_info.device_model_version = > + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; > + return 0; > + } > Here we could check the requested emulator against the capabilities, and then do the proper mapping for device_model_version. Do you have time for an upstream libvirt patch to expose the possible emulators in the capabilities, along with this patch allowing the user to specify one? Regards, Jim > + if (strstr(def->emulator, "/qemu-dm")) { > + d_config->b_info.device_model_version = > + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; > + return 0; > + } > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("libxenlight doesn't support emulator '%s'"), > + def->emulator); > + return -1; > +} > + > + > +int > libxlBuildDomainConfig(libxlDriverPrivatePtr driver, > virDomainDefPtr def, libxl_domain_config *d_config) > { > @@ -834,6 +858,10 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, > goto error; > } > > + if (libxlMakeEmulator(def, d_config) < 0) { > + goto error; > + } > + > d_config->on_reboot = def->onReboot; > d_config->on_poweroff = def->onPoweroff; > d_config->on_crash = def->onCrash; > > ------------------------------------------------------------------------

2 1

[libvirt] [PATCH 0/3] PCI mess fixes
by Ján Tomko 27 Apr '13

27 Apr '13

1/3 should allow domains without a PCI bus to start 2/3 prevents invalid memory access when the domain has no PCI bus 3/3 fixes a mising error message on OOM Ján Tomko (3): qemu: don't always reserve PCI addresses for implicit controllers qemu: prevent invalid reads in qemuAssignDevicePCISlots conf: add missing error on OOM src/conf/domain_conf.c | 1 + src/qemu/qemu_command.c | 42 +++++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) -- 1.8.1.5

2 8

Re: [libvirt] KVM Forum 2013 Save the Date
by tiejun.chen 27 Apr '13

27 Apr '13

On 04/27/2013 02:25 PM, Will Huck wrote: > Hi, > > Where can get slides in 2012 KVM Forum? http://www.linux-kvm.org/page/KVM_Forum_2012 Tiejun

1 0

[libvirt] [PATCH 00/10 v3] Support scsi device passthrough via scsi-generic
by Osier Yang 27 Apr '13

27 Apr '13

This adds the support for qemu's scsi-generic device, which can be used to passthrough scsi host device. An example of the XML: <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host7'/> <address bus='0' target='0' unit='0'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </hostdev> Mainly changes from v2.5 (details in each patch): * 1/10 and 2/10 of v2.5 are pushed * 8/10 of v2.5 is splitted * A better way to generate the address for scsi host device instead of the rigid one. * Support all scsi controllers when building the qemu command line. * Figure out the limits of the qemu properties, and do checking * Don't forget DAC and apparmor security backends * Orgnize the patches in a better way. * Fix the make check failure Han Cheng (7): conf: Introduce XMLs for scsi hostdev qemu: New cap flags for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi host device qemu: Introduce activeScsiHostdevs list for scsi host devices qemu: Allow the scsi-generic device in cgroup qemu: Add hotplug support for scsi host device Osier Yang (3): security: Manage the security label for scsi host device qemu: Refactor helpers for USB device attachment conf: Generate address for scsi host device automatically docs/formatdomain.html.in | 38 +- docs/schemas/domaincommon.rng | 29 ++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 10 + src/conf/domain_conf.c | 312 +++++++++++++++- src/conf/domain_conf.h | 8 + src/libvirt_private.syms | 22 ++ src/qemu/qemu_capabilities.c | 14 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 72 +++- src/qemu/qemu_cgroup.h | 3 + src/qemu/qemu_command.c | 154 +++++++- src/qemu/qemu_command.h | 6 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hostdev.c | 213 +++++++++++ src/qemu/qemu_hostdev.h | 10 + src/qemu/qemu_hotplug.c | 224 +++++++++--- src/qemu/qemu_process.c | 3 + src/security/security_apparmor.c | 49 ++- src/security/security_dac.c | 77 +++- src/security/security_selinux.c | 72 +++- src/util/virscsi.c | 407 +++++++++++++++++++++ src/util/virscsi.h | 84 +++++ tests/qemuhelpdata/qemu-1.0-device | 10 + tests/qemuhelpdata/qemu-1.1.0-device | 10 + tests/qemuhelpdata/qemu-1.2.0-device | 5 + tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 + tests/qemuhelptest.c | 19 +- .../qemuxml2argv-hostdev-scsi-boot.args | 9 + .../qemuxml2argv-hostdev-scsi-boot.xml | 34 ++ .../qemuxml2argv-hostdev-scsi-readonly.args | 9 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 35 ++ tests/qemuxml2argvtest.c | 9 + tests/qemuxml2xmltest.c | 2 + 36 files changed, 1842 insertions(+), 121 deletions(-) create mode 100644 src/util/virscsi.c create mode 100644 src/util/virscsi.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml -- 1.8.1.4

2 15

[libvirt] [PATCH 0/2] VFIO bugfix and naming tweak
by Laine Stump 27 Apr '13

27 Apr '13

Laine Stump (2): network: support <driver name='vfio'/> in network definitions conf: remove extraneous _TYPE from driver backend enums src/conf/domain_conf.c | 6 +++--- src/conf/domain_conf.h | 6 +++--- src/conf/network_conf.c | 39 +++++++++++++++++++++++++++++++++- src/conf/network_conf.h | 17 ++++++++++++++- src/network/bridge_driver.c | 23 ++++++++++++++++++++ src/qemu/qemu_command.c | 8 +++---- src/qemu/qemu_hostdev.c | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 ++-- src/security/security_selinux.c | 4 ++-- tests/networkxml2xmlin/hostdev-pf.xml | 1 + tests/networkxml2xmlout/hostdev-pf.xml | 1 + 13 files changed, 98 insertions(+), 21 deletions(-) -- 1.7.11.7

2 4

[libvirt] [PATCH v2 0/2] qemu: invoke qemu-bridge-helper from libvirtd
by Paolo Bonzini 27 Apr '13

27 Apr '13

The <interface type='bridge'> is working mostly because of a peculiar design decision in Linux. Ideally, QEMU would run with an empty capability bounding set and would not be able to do any privileged operation (not even by running a helper program). This is not the case because dropping capabilities from the bounding set requires a capability of its own, CAP_SETPCAP; thus QEMU does *not* run with an empty bounding set if invoked via qemu:///session. This is apparently for security reasons, to avoid that dropping _some_ caps but not all of them lets you exploit untested error paths in suid binaries. This series lets libvirtd invoke the privileged helper program on its own, which is a cleaner design that would work even if the above Linux quirk was not there. Also, this adds a <target dev='tap0'/> element to the XML of an active domain using <interface type='bridge'>. Thanks to the patches that have already been committed, the recvfd and virCommand APIs make the task almost trivial. v1->v2: OOM fix in patch 1, change label name in patch 2, rebase Paolo Bonzini (2): virnetdevtap: add virNetDevTapGetName qemu: launch bridge helper from libvirtd src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 133 ++++++++++++++++++++++++++++++++++------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 25 +++------ src/util/virnetdevtap.c | 33 ++++++++++++ src/util/virnetdevtap.h | 3 ++ 6 files changed, 143 insertions(+), 53 deletions(-) -- 1.8.2

3 6