February 2013 - Devel - libvirt List Archives

[libvirt] [PATCH 0/2] network: add force attribute for dhcp options
by Laine Stump 25 Feb '13

25 Feb '13

The firs patch just fixes unexpected behavior in virNetworkDHCPOptionDefParseXML found when testing the second patch. The second patch adds the "force" attribute I mentioned in the review of the patch that added support for specifying dhcp options in network config. While documenting this new attribute, I noticed that I'd neglected to see that original patch didn't include documentation, so I added full documentation for <option> in order to have a place to add the documentation for "force='yes'". I'm also working on a way to allow specification of option names rather than numbers, but didn't know if I could get it in before the freeze, so I'm sending this patch now. Laine Stump (2): conf: use VIR_EXPAND instead of VIR_REALLOC in virNetworkDHCPDefParseXML network: add force attribute for dhcp options docs/formatnetwork.html.in | 21 ++++++++++++++++++++ src/conf/network_conf.c | 32 +++++++++++++++++++++--------- src/conf/network_conf.h | 3 ++- src/network/bridge_driver.c | 3 ++- tests/networkxml2confdata/nat-network.conf | 2 +- tests/networkxml2confdata/nat-network.xml | 2 +- 6 files changed, 50 insertions(+), 13 deletions(-) -- 1.7.11.7

3 5

[libvirt] [PATCH tck] Avoid multicast MAC addrs in tests
by Daniel P. Berrange 25 Feb '13

25 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Certain MAC addrs are used for multicast and recent libvirt will refuse to start VMs using those addrs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/domain/215-nic-hotplug-many.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 5b935cc..8b4afbd 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -47,9 +47,9 @@ diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); -my $mac1 = "01:11:22:33:44:55"; -my $mac2 = "02:11:22:33:44:55"; -my $mac3 = "03:11:22:33:44:55"; +my $mac1 = "02:11:22:33:44:51"; +my $mac2 = "02:11:22:33:44:52"; +my $mac3 = "02:11:22:33:44:53"; my $model = "virtio"; my $netxml1 = <<EOF; -- 1.8.1.2

2 1

[libvirt] [PATCH] Fix crash changing CDROM media
by Daniel P. Berrange 25 Feb '13

25 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This change tried to fix a crash with changing CDROM media but failed to actually do so commit d0172d2b1b5d865aaa042070d7c2d00effb2ff8c Author: Osier Yang <jyang(a)redhat.com> Date: Tue Feb 19 20:27:45 2013 +0800 qemu: Remove the shared disk entry if the operation is ejecting or updating It was still accessing disk->src, when the entire 'disk' object has been free'd already. Even if it weren't free'd, accessing the 'src' value of virDomainDiskDef is not allowed without first validating disk->type is file or block. Just remove the broken code entirely. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e96915..8dae8f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5778,13 +5778,14 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, dev->data.disk = tmp; ret = qemuDomainChangeEjectableMedia(driver, vm, disk, orig_disk, false); + /* 'disk' must not be accessed now - it has been free'd. + * 'orig_disk' now points to the new disk, while 'dev_copy' + * now points to the old disk */ /* Need to remove the shared disk entry for the original disk src * if the operation is either ejecting or updating. */ - if (ret == 0 && - orig_disk->src && - STRNEQ_NULLABLE(orig_disk->src, disk->src)) + if (ret == 0) ignore_value(qemuRemoveSharedDisk(driver, dev_copy->data.disk, vm->def->name)); break; -- 1.8.1.2

2 1

[libvirt] [PATCH] qemu: Refactor qemuDomainSetMemoryParameters
by Peter Krempa 25 Feb '13

25 Feb '13

The new TypedParam helper APIs allow to simplify this function significantly. This patch integrates the fix in 75e5bec97b3045e4f926248d5c742f8a50d0f9 by correctly ordering the setting functions instead of reordering the parameters. --- src/qemu/qemu_driver.c | 149 ++++++++++++++++++------------------------------- 1 file changed, 54 insertions(+), 95 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 23499ef..f2f5872 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7140,15 +7140,15 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; virDomainDefPtr persistentDef = NULL; virCgroupPtr group = NULL; virDomainObjPtr vm = NULL; - virTypedParameterPtr hard_limit = NULL; - virTypedParameterPtr swap_hard_limit = NULL; - int hard_limit_index = 0; - int swap_hard_limit_index = 0; - unsigned long long val = 0; + unsigned long long swap_hard_limit; + unsigned long long memory_hard_limit; + unsigned long long memory_soft_limit; + bool set_swap_hard_limit = false; + bool set_memory_hard_limit = false; + bool set_memory_soft_limit = false; virQEMUDriverConfigPtr cfg = NULL; int ret = -1; int rc; @@ -7167,13 +7167,9 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, NULL) < 0) return -1; - vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); - if (vm == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No such domain %s"), dom->uuid); - goto cleanup; - } + if (!(vm = qemuDomObjFromDomain(dom))) + return -1; cfg = virQEMUDriverGetConfig(driver); @@ -7198,110 +7194,73 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } } - for (i = 0; i < nparams; i++) { - if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { - hard_limit = &params[i]; - hard_limit_index = i; - } else if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { - swap_hard_limit = &params[i]; - swap_hard_limit_index = i; - } - } +#define VIR_GET_LIMIT_PARAMETER(PARAM, VALUE) \ + if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE) < 0)) \ + goto cleanup; \ + \ + if (rc == 1) \ + set_ ## VALUE = true; + + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, memory_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, memory_soft_limit) + +#undef VIR_GET_LIMIT_PARAMETER + /* It will fail if hard limit greater than swap hard limit anyway */ - if (swap_hard_limit && - hard_limit && - (hard_limit->value.ul > swap_hard_limit->value.ul)) { + if (set_swap_hard_limit && set_memory_hard_limit && + (memory_hard_limit > swap_hard_limit)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("hard limit must be lower than swap hard limit")); goto cleanup; } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - /* Get current swap hard limit */ - rc = virCgroupGetMemSwapHardLimit(group, &val); - if (rc != 0) { + if (set_swap_hard_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemSwapHardLimit(group, swap_hard_limit)) < 0) { virReportSystemError(-rc, "%s", - _("unable to get swap hard limit")); + _("unable to set memory swap_hard_limit tunable")); goto cleanup; } - /* Swap hard_limit and swap_hard_limit to ensure the setting - * could succeed if both of them are provided. - */ - if (swap_hard_limit && hard_limit) { - virTypedParameter param; - - if (swap_hard_limit->value.ul > val) { - if (hard_limit_index < swap_hard_limit_index) { - param = params[hard_limit_index]; - params[hard_limit_index] = params[swap_hard_limit_index]; - params[swap_hard_limit_index] = param; - } - } else { - if (hard_limit_index > swap_hard_limit_index) { - param = params[hard_limit_index]; - params[hard_limit_index] = params[swap_hard_limit_index]; - params[swap_hard_limit_index] = param; - } - } - } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.swap_hard_limit = swap_hard_limit; } - ret = 0; - for (i = 0; i < nparams; i++) { - virTypedParameterPtr param = &params[i]; - - if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemoryHardLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory hard_limit tunable")); - ret = -1; - } - } + if (set_memory_hard_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemoryHardLimit(group, memory_hard_limit)) < 0) { + virReportSystemError(-rc, "%s", + _("unable to set memory hard_limit tunable")); + goto cleanup; + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.hard_limit = param->value.ul; - } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemorySoftLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory soft_limit tunable")); - ret = -1; - } - } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.hard_limit = memory_hard_limit; + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.soft_limit = param->value.ul; - } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemSwapHardLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set swap_hard_limit tunable")); - ret = -1; - } - } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.swap_hard_limit = param->value.ul; - } + if (set_memory_soft_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemorySoftLimit(group, memory_soft_limit)) < 0) { + virReportSystemError(-rc, "%s", + _("unable to set memory soft_limit tunable")); + goto cleanup; } - } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) - ret = -1; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.soft_limit = memory_soft_limit; } + if (flags & VIR_DOMAIN_AFFECT_CONFIG && + virDomainSaveConfig(cfg->configDir, persistentDef) < 0) + goto cleanup; + + ret = 0; + cleanup: virCgroupFree(&group); - if (vm) - virObjectUnlock(vm); + virObjectUnlock(vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; -- 1.8.1.1

2 2

[libvirt] [PATCHv2 0/5] Add API to allow TCP connection tunelling
by Peter Krempa 25 Feb '13

25 Feb '13

This series adds ability for the qemu driver to tunnel connections to TCP ports from the host. This is useful for enabling remote VNC/SPICE sessions without the need to configure SSH tunnels or portforwards and without the need to open the ports for public. There's also an advantage for tools such as virt-viewer that have to guess the remote connection parameters and you have to hope that nothing is in your way. With spice/VNC clients that have support for read/write callbacks, this would allow also direct connection without an intermediate socket. The API and tunelling works but there's no (stable and good working) client for this API. I hacked up a dirty netcat-like terminal into virsh for testing purposes (see patch 5/5) but that isn't what I'd like to see. The client should be able to open a listening socket and when a client connects to it, it opens a stream and connects it to the remote host. For the client there are two options: 1) do all the stuff in virsh: + one tool to rule them all - i'd like to daemonize it and I don't know if that's okay in virsh 2) add a new tool "virtunnel": + less virsh pollution - separate tool ... As nobody responded, I'd like to re-ask for someones opinion on this. (note: this is my personal effort, I'm annoyed of opening ssh tunnels to remote displays on my server and I don't want to open the ports to public. ) After this it would be great to add support for this to virt-viewer. I will have a look at that later. ---- Diff to v1: - fixed error reporting in 2/5 - documented limitation to "localhost" in 3/5 - fixed possible segfault in 4/5 --- Peter Krempa (5): api: Add API to allow TCP tunneling through streams to the host fdstream: Add support for TCP connections of streams qemu: Add configuration options to enable TCP tunelling qemu: Implement virNodeTunnelTcp for the qemu driver NOT_TO_BE_APPLIED_UPSTREAM: quick and dirty virsh client to test the stuff include/libvirt/libvirt.h.in | 11 +++++++ src/driver.h | 8 +++++ src/fdstream.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/fdstream.h | 5 +++ src/libvirt.c | 67 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu.conf | 16 ++++++++++ src/qemu/qemu_conf.c | 26 ++++++++++++++++ src/qemu/qemu_conf.h | 13 ++++++++ src/qemu/qemu_driver.c | 48 +++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++++- src/remote_protocol-structs | 6 ++++ src/rpc/gendispatch.pl | 1 + tools/console.c | 66 +++++++++++++++++++++------------------ tools/console.h | 9 ++---- tools/virsh-domain.c | 17 +++++++++-- tools/virsh-host.c | 60 ++++++++++++++++++++++++++++++++++++ 19 files changed, 397 insertions(+), 41 deletions(-) -- 1.8.0

2 7

[libvirt] [PATCH 0/2] Using client-id for DHCPv6 host identification
by Gene Czarcinski 25 Feb '13

25 Feb '13

The first patch is a trivial fix to the network schema since the name in dhcp-host is really optional. The second patch adds the capability to use the client id to improve the reliability of having a system use a fixed IPv6 address. Gene Czarcinski (2): Trivial fix: in dhcp-host the name is optional use client id for IPv6 DHCP host definition docs/formatnetwork.html.in | 18 ++++++- docs/schemas/basictypes.rng | 59 ++++++++++++++++++++++ docs/schemas/network.rng | 7 ++- src/conf/network_conf.c | 29 +++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 3 +- src/util/virdnsmasq.c | 20 ++++++-- src/util/virdnsmasq.h | 1 + tests/networkxml2confdata/dhcp6-nat-network.xml | 5 +- tests/networkxml2confdata/dhcp6-network.xml | 5 +- .../dhcp6host-routed-network.xml | 5 +- 11 files changed, 138 insertions(+), 15 deletions(-) -- 1.8.1.2

3 11

[libvirt] Versioning/Compatibility in the XML schemas
by Pieter Hollants 25 Feb '13

25 Feb '13

Out of curiosity, seeing that we doing modifications to the XML schema all the time, there does not seem to be some sort of version identifier in the XML schemas. If I take the recently merged patch for DHCP options, for instance, suppose virt-manager would add support for it in its GUI. How would such a network XML definition be interpreted by older libvirt versions? Is it supposed to ignore elements it doesn't know or do we have an implicit requirement of "always use the latest versions together"? -- Pieter Hollants <pieter(a)hollants.com>

2 1

[libvirt] [PATCH v2 resend 0/4]use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 25 Feb '13

25 Feb '13

v1 to v2 *removed i8* NIC models support for QEMU/KVM *updated docs *rebased This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise of the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/4, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any other idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(4) [PATCH v2 resend 1/4] add domain NIC model enum macro [PATCH v2 resend 2/4] net: use virDomainNICModelType{From|To}String functions [PATCH v2 resend 3/4] qemu: add NIC model checking for qemu hypervisor [PATCH v2 resend 4/4] qemu: add usb-net support docs/formatdomain.html.in | 29 +++++++++++------------------ src/conf/domain_conf.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ src/conf/domain_conf.h | 32 +++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 21 +++++++++++---------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 208 insertions(+), 137 deletions(-)

1 4

[libvirt] [PATCH] interface: Fix udev backend bridge device display
by Doug Goldstein 25 Feb '13

25 Feb '13

The bridge device was showing the vnet devices created for the domains as connected to the bridge. libvirt should only show host devices when trying to get the interface definition rather than the domain devices as well. --- Honestly this method sucks. But it makes the code path work and doesn't result in brokenness. I was really thinking of sscanf() but I don't really care to store the values. Suggestions? --- src/interface/interface_backend_udev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index bd83545..dca85b3 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -24,7 +24,9 @@ #include <libudev.h> #include "virerror.h" +#include "c-ctype.h" #include "datatypes.h" +#include "domain_conf.h" #include "interface_driver.h" #include "interface_conf.h" #include "viralloc.h" @@ -527,6 +529,16 @@ udevIfaceBridgeScanDirFilter(const struct dirent *entry) if (STREQ(entry->d_name, ".") || STREQ(entry->d_name, "..")) return 0; + /* Omit the domain interfaces from the list of bridge attached + * devices. All we can do is check for the device name matching + * vnet%d. Improvements to this check are welcome. + */ + if (strlen(entry->d_name) >= 5) { + if (STRPREFIX(entry->d_name, VIR_NET_GENERATED_PREFIX) && + c_isdigit(entry->d_name[4])) + return 0; + } + return 1; } -- 1.7.12.4

2 1

[libvirt] [PATCH] docs: add forward mode='hostdev' example
by Laine Stump 25 Feb '13

25 Feb '13

Also rearrange examples so that all "managed" networks (those with bridges created by libvirt) are together. --- docs/formatnetwork.html.in | 52 +++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4b4c47b..46b7270 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -332,7 +332,7 @@ </p> <pre> ... - <forward mode='passthrough'> + <forward mode='passthrough' managed='yes'> <pf dev='eth0'/> </forward> ... @@ -863,6 +863,27 @@ </ip> </network></pre> + <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> + + <p> + A valid network definition can contain no IPv4 or IPv6 addresses. + Such a definition can be used for a "very private" or "very + isolated" network since it will not be possible to communicate + with the virtualization host via this network. However, this + virtual network interface can be used for communication between + virtual guest systems. This works for IPv4 + and <span class="since">(Since 1.0.1)</span> IPv6. However, + the <code>ipv6</code> attribute must be set to "yes" for + functional guest-to-guest IPv6 communication. + </p> + + <pre> + <network ipv6='yes'> + <name>nogw</name> + <bridge name="virbr2" stp="on" delay="0"/> + </network> + </pre> + <h3><a name="examplesBridge">Using an existing host bridge</a></h3> <p> @@ -916,25 +937,26 @@ </forward> </network></pre> - <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> + <h3><a name="examplesPCIPassthrough">Assigning SR-IOV Virtual Functions via PCI Passthrough</a></h3> <p> - A valid network definition can contain no IPv4 or IPv6 addresses. Such a definition - can be used for a "very private" or "very isolated" network since it will not be - possible to communicate with the virtualization host via this network. However, - this virtual network interface can be used for communication between virtual guest - systems. This works for IPv4 and <span class="since">(Since 1.0.1)</span> IPv6. - However, the new ipv6='yes' must be added for guest-to-guest IPv6 - communication. + <span class="since">Since 0.9.10, requires a host with working + IOMMU</span> This example shows how to use a libvirt network to + assign individual SR-IOV Virtual Functions (VF) to guests using + PCI passthrough. Only the Physical Function (PF) of the SR-IOV + network adapter needs to be listed in the network definition; a + list of all VFs will be automatically derived from that, and VFs + will be allocated to guest domains as requested. </p> <pre> - <network ipv6='yes'> - <name>nogw</name> - <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> - <bridge name="virbr2" stp="on" delay="0" /> - <mac address='00:16:3E:5D:C7:9E'/> - </network></pre> + <network> + <name>passthrough</name> + <forward mode='hostdev' managed='yes'> + <pf dev='eth3'/> + </forward> + </network> + </pre> </body> </html> -- 1.7.11.7

1 0

[libvirt] [PATCH] virsh: add --start option to the define command
by Doug Goldstein 25 Feb '13

25 Feb '13

Adds the --start option to the define command to simplify the often used case of virsh "define dom.xml; start dom" or virsh define dom.xml && virsh start dom. This is just a rebased version of: https://www.redhat.com/archives/libvir-list/2013-January/msg00490.html There's a competing patchset available at: https://www.redhat.com/archives/libvir-list/2013-February/msg01298.html --- tools/virsh-domain.c | 23 +++++++++++++++++++++-- tools/virsh.pod | 5 +++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 96dd4fa..6d62197 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6602,6 +6602,10 @@ static const vshCmdOptDef opts_define[] = { .flags = VSH_OFLAG_REQ, .help = N_("file containing an XML domain description") }, + {.name = "start", + .type = VSH_OT_BOOL, + .help = N("start the domain after definition") + }, {.name = NULL} }; @@ -6612,6 +6616,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) const char *from = NULL; bool ret = true; char *buffer; + bool start = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) return false; @@ -6619,17 +6624,31 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + start = vshCommandOptBool(cmd, "start"); + dom = virDomainDefineXML(ctl->conn, buffer); VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), virDomainGetName(dom), from); - virDomainFree(dom); } else { vshError(ctl, _("Failed to define domain from %s"), from); - ret = false; + return false; } + + /* Start the domain if the user requested it and it was defined */ + if (start) { + if (virDomainCreate(dom) < 0) { + vshError(ctl, _("Failed to start domain %s, which was " + "successfully defined."), virDomainGetName(dom)); + ret = false; + } else { + vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); + } + } + + virDomainFree(dom); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index a5d8fe6..660331c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -555,11 +555,12 @@ B<Example> vi domain.xml (or make changes with your other text editor) virsh create domain.xml -=item B<define> I<FILE> +=item B<define> I<FILE> [I<--start>] Define a domain from an XML <file>. The domain definition is registered but not started. If domain is already running, the changes will take -effect on the next boot. +effect on the next boot. If I<--start> is requested, start the domain +after defining it. =item B<desc> I<domain> [[I<--live>] [I<--config>] | [I<--current>]] [I<--title>] [I<--edit>] [I<--new-desc> -- 1.7.12.4

1 0

[libvirt] [PATCH 0/5] storage: add tests for qemu-img command line
by Ján Tomko 24 Feb '13

24 Feb '13

This series adds tests to check for changes in the generated qemu-img command line and moves the options in front of positional arguments. Ján Tomko (5): storage: move flag setting after declarations storage: separate qemu-img command generation and execution storage: add test for qemu-img command line generation storage: move qemu-img options before positional arguments storage: qemu-img: change INFO to DEBUG src/storage/storage_backend.c | 131 ++++++++------ src/storage/storage_backend.h | 8 + tests/Makefile.am | 9 + tests/storagevolxml2argvdata/pool-dir.xml | 18 ++ tests/storagevolxml2argvdata/qcow2-flag.argv | 1 + .../qcow2-nobacking-convert-flag.argv | 1 + .../qcow2-nobacking-convert-none.argv | 1 + .../qcow2-nobacking-convert-prealloc.argv | 1 + .../qcow2-nobacking-flag.argv | 1 + .../qcow2-nobacking-none.argv | 1 + .../qcow2-nobacking-prealloc.argv | 1 + tests/storagevolxml2argvdata/qcow2-none.argv | 1 + tests/storagevolxml2argvdata/qcow2.argv | 1 + tests/storagevolxml2argvdata/vol-file.xml | 20 +++ .../storagevolxml2argvdata/vol-qcow2-nobacking.xml | 21 +++ tests/storagevolxml2argvdata/vol-qcow2.xml | 31 ++++ tests/storagevolxml2argvtest.c | 189 +++++++++++++++++++++ 17 files changed, 380 insertions(+), 56 deletions(-) create mode 100644 tests/storagevolxml2argvdata/pool-dir.xml create mode 100644 tests/storagevolxml2argvdata/qcow2-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2.argv create mode 100644 tests/storagevolxml2argvdata/vol-file.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-nobacking.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2.xml create mode 100644 tests/storagevolxml2argvtest.c -- 1.7.12.4

2 11

[libvirt] [PATCH 0/2] Support PCI passthrough in libxl driver
by Chunyan Liu 24 Feb '13

24 Feb '13

This patch series is to add PCI passthrough support to libxenlight driver so that it can create VM with managed/non-managed host pci device defined. Chunyan Liu (2): libxl: add APIs to prepare/release host pci device libxl: support pci passthrough po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libxl/libxl_conf.c | 44 ++++ src/libxl/libxl_conf.h | 5 +- src/libxl/libxl_driver.c | 16 ++ src/libxl/libxl_hostdev.c | 600 +++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_hostdev.h | 44 ++++ 7 files changed, 710 insertions(+), 1 deletions(-) create mode 100644 src/libxl/libxl_hostdev.c create mode 100644 src/libxl/libxl_hostdev.h -- 1.7.3.4

6 7

[libvirt] [PATCH] run: license as LGPL
by Eric Blake 23 Feb '13

23 Feb '13

It makes no sense to prohibit reuse of the wrapper in other LGPL projects, since most of libvirt is designed to be LGPL. Of course, when using the wrapper to wrap a GPL program, the combined result is still effectively GPL, but that shouldn't force us to license the wrapper as GPL in isolation. * run.in: Relicense to LGPLv2+. --- Any objections to this? run.in | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/run.in b/run.in index 5063522..5d4a04c 100644 --- a/run.in +++ b/run.in @@ -2,18 +2,19 @@ # libvirt 'run' programs locally script # Copyright (C) 2012-2013 Red Hat, Inc. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. +# You should have received a copy of the GNU Lesser General Public +# License along with this library; If not, see +# <http://www.gnu.org/licenses/>. #---------------------------------------------------------------------- # -- 1.8.1.2

2 3

[libvirt] [PATCH v4 0/9] Rework storage migration
by Michal Privoznik 23 Feb '13

23 Feb '13

Since there are many hidden problems with auto-creating storage for the domain in here, as previous rounds of reviewing the series has shown, I've decided to not do anything about it for now and the auto allocation is dropped completely. So we are back to the assumption we already have - users need to make sure files already exists and have the right size. Hawk. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to v2.1: -nbd cookie reworked -don't rely on disk ordering in the cookie, but use disk target for that -adapt to virPortAllocator -unlink pre-created storage on migration fail -other of Jirka's suggestions worked in "diff" to v3: -just rebase & adapt to new qemu code after dropping QDL (Qemu Driver Lock) diff to v4: -drop storage auto-allocation -include John's and Jirka's reviews Note, that most of the patches has been ACKed already. Michal Privoznik (9): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer() qemu_migration: Introduce qemuMigrationDriveMirror qemu_migration: Stop NBD server at Finish phase qemu_migration: Cancel running jobs on failed migration src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_migration.c | 458 +++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 63 ++++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 102 ++++++++++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 5 + 9 files changed, 631 insertions(+), 17 deletions(-) -- 1.8.1.2

3 21

[libvirt] [PATCH] run: use portable shell
by Eric Blake 23 Feb '13

23 Feb '13

Nothing in run required bash, except for the shebang. On systems where /bin/bash doesn't exist (I hit it on FreeBSD), using /bin/sh instead fixes a 'make check' failure: gmake[3]: Entering directory `/usr/home/dummy/libvirt/python' GEN check-local /usr/local/bin/bash: ../run: /bin/bash: bad interpreter: No such file or directory * run.in: Use /bin/sh, not bash. --- Pushing under the build-breaker rule. run.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.in b/run.in index 845eef5..5063522 100644 --- a/run.in +++ b/run.in @@ -1,6 +1,6 @@ -#!/bin/bash - +#!/bin/sh # libvirt 'run' programs locally script -# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012-2013 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 1.8.1.2

1 0

[libvirt] [PATCH] storage: use f_frsize, not f_bsize, for calculating available space
by Sage Weil 23 Feb '13

23 Feb '13

The bfree and blocks fields are supposed to be in units of frsize. We were calculating capacity correctly using those units, but the available calculation was using bsize instead. Most file systems report these as the same value specifically because many programs are buggy, but that is no reason to rely on that behavior, or to behave inconsistently. This bug has been present since e266ded (2008) and aa296e6c, when the code was originally introduced (the latter via cut and paste). Signed-off-by: Sage Weil <sage(a)newdream.net> --- src/parallels/parallels_storage.c | 2 +- src/storage/storage_backend_fs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 1186296..f696fcb 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -709,7 +709,7 @@ parallelsStoragePoolGetAlloc(virStoragePoolDefPtr def) def->capacity = ((unsigned long long)sb.f_frsize * (unsigned long long)sb.f_blocks); def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_bsize); + (unsigned long long)sb.f_frsize); def->allocation = def->capacity - def->available; return 0; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index a582804..c1684f7 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -910,7 +910,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, pool->def->capacity = ((unsigned long long)sb.f_frsize * (unsigned long long)sb.f_blocks); pool->def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_bsize); + (unsigned long long)sb.f_frsize); pool->def->allocation = pool->def->capacity - pool->def->available; return 0; -- 1.7.2.5

2 1

[libvirt] [PATCH] maint: check all symfiles for sorting
by Eric Blake 22 Feb '13

22 Feb '13

On FreeBSD, I got a 'make check' failure: GEN check-symsorting Symbol block at ./libvirt_atomic.syms:4: viratomic.h not found * src/Makefile.am (SYM_FILES): New define. (check-symsorting): Check on all symfiles, even when not used. * src/libvirt_atomic.syms: Fix offender. --- Pushing under the build-breaker rule. src/Makefile.am | 23 ++++++++++++++++++++++- src/libvirt_atomic.syms | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3ef9a9c..c1659a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -389,7 +389,7 @@ check-symfile: endif check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ - $(srcdir) $(USED_SYM_FILES) + $(srcdir) $(SYM_FILES) EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ @@ -809,6 +809,7 @@ libvirt_driver_la_CFLAGS = \ libvirt_driver_la_LIBADD = \ $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) +SYM_FILES = $(USED_SYM_FILES) USED_SYM_FILES = $(srcdir)/libvirt_private.syms if WITH_TEST @@ -1410,42 +1411,62 @@ check-augeas-lockd: test_libvirt_lockd.aug if WITH_DRIVER_MODULES USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms +else +SYM_FILES += $(srcdir)/libvirt_driver_modules.syms endif if WITH_LINUX USED_SYM_FILES += $(srcdir)/libvirt_linux.syms +else +SYM_FILES += $(srcdir)/libvirt_linux.syms endif if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms +else +SYM_FILES += $(srcdir)/libvirt_esx.syms endif if WITH_LIBVIRTD USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms +else +SYM_FILES += $(srcdir)/libvirt_daemon.syms endif if WITH_OPENVZ USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms +else +SYM_FILES += $(srcdir)/libvirt_openvz.syms endif if WITH_VMX USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms +else +SYM_FILES += $(srcdir)/libvirt_vmx.syms endif if WITH_XENXS USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms +else +SYM_FILES += $(srcdir)/libvirt_xenxs.syms endif if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms +else +SYM_FILES += $(srcdir)/libvirt_sasl.syms endif if WITH_SSH2 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms +else +SYM_FILES += $(srcdir)/libvirt_libssh2.syms endif if WITH_ATOMIC_OPS_PTHREAD USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms +else +SYM_FILES += $(srcdir)/libvirt_atomic.syms endif EXTRA_DIST += \ diff --git a/src/libvirt_atomic.syms b/src/libvirt_atomic.syms index db80ce8..e2c2363 100644 --- a/src/libvirt_atomic.syms +++ b/src/libvirt_atomic.syms @@ -2,7 +2,7 @@ # These symbols are dependent upon !VIR_ATOMIC_OPS_GCC. # -# viratomic.h +# util/viratomic.h virAtomicLock; # Let emacs know we want case-insensitive sorting -- 1.8.1.2

1 0

[libvirt] [RFC PATCH 1/4] libvirt: add VIR_DOMAIN_START_PERSISTENT flag
by Doug Goldstein 22 Feb '13

22 Feb '13

Added a VIR_DOMAIN_START_PERSISTENT flag for virDomainCreateXML() so that the guest remains defined after it is destroyed. The result of using this flag is equivilent to calling virDomainDefineXML() followed by virDomainCreate() or virDomainCreateWithFlags(). --- Not sure if this is the correct place to add "Since 1.0.3 (likely 1.0.4)" --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index ad30cd0..e119215 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -336,6 +336,7 @@ typedef enum { VIR_DOMAIN_START_AUTODESTROY = 1 << 1, /* Automatically kill guest when virConnectPtr is closed */ VIR_DOMAIN_START_BYPASS_CACHE = 1 << 2, /* Avoid file system cache pollution */ VIR_DOMAIN_START_FORCE_BOOT = 1 << 3, /* Boot, discarding any managed save */ + VIR_DOMAIN_START_PERSISTENT = 1 << 4, /* Define guest to exist after it is destroyed */ } virDomainCreateFlags; diff --git a/src/libvirt.c b/src/libvirt.c index 1e78500..abe59cd 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1951,6 +1951,10 @@ virDomainGetConnect(virDomainPtr dom) * is destroyed, or if the host is restarted (see virDomainDefineXML() to * define persistent domains). * + * If the VIR_DOMAIN_START_PERSISTENT flag is set, the guest domain + * will remain defined even after the guest is destroyed. This is + * similar to if you had called virDomainDefineXML() and virDomainCreate(). + * * If the VIR_DOMAIN_START_PAUSED flag is set, the guest domain * will be started, but its CPUs will remain paused. The CPUs * can later be manually started using virDomainResume. -- 1.7.12.4

2 6

[libvirt] [PATCH] Add support for qxl.revision in domain XML
by Christophe Fergeau 22 Feb '13

22 Feb '13

QXL devices have an associated 'revision' which is raised when new features have been introduced which would break migration to older versions. This commit makes it possible to set this revision as QEMU sometimes support newer QXL revisions than what it defaults to. --- docs/formatdomain.html.in | 5 ++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 8 ++++++++ .../qemuxml2argv-graphics-spice-compression.args | 3 ++- .../qemuxml2argv-graphics-spice-compression.xml | 4 ++-- .../qemuxml2argv-graphics-spice-qxl-vga.args | 3 ++- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml | 4 ++-- 11 files changed, 47 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7ad8aea..4b269c8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3569,7 +3569,10 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies the size of the primary bar, while <code>vram</code> specifies the - secondary bar size. If "ram" is not supplied a default value is used. + secondary bar size. If "ram" or "vram" are not supplied a default + value is used. The optional attribute <code>revision</code> (<span + class="since">since 1.0.3</span>) specifies the revision of + the QXL device, newer revisions provides more functionality. </dd> <dt><code>model</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 049f232..fc78e2d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2280,6 +2280,11 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <attribute name="revision"> + <ref name="unsignedInt"/> + </attribute> + </optional> </group> </choice> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5782abb..83be711 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7391,6 +7391,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, char *vram = NULL; char *ram = NULL; char *primary = NULL; + char *revision = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -7406,6 +7407,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, ram = virXMLPropString(cur, "ram"); vram = virXMLPropString(cur, "vram"); heads = virXMLPropString(cur, "heads"); + revision = virXMLPropString(cur, "revision"); if ((primary = virXMLPropString(cur, "primary")) != NULL) if (STREQ(primary, "yes")) @@ -7456,6 +7458,19 @@ virDomainVideoDefParseXML(const xmlNodePtr node, def->vram = virDomainVideoDefaultRAM(dom, def->type); } + if (revision) { + if (def->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("revision attribute only supported for type of qxl")); + goto error; + } + if (virStrToLong_ui(revision, NULL, 10, &def->revision) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse video revision '%s'"), revision); + goto error; + } + } + if (heads) { if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -13406,6 +13421,8 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " heads='%u'", def->heads); if (def->primary) virBufferAddLit(buf, " primary='yes'"); + if (def->revision) + virBufferAsprintf(buf, " revision='%u'", def->revision); if (def->accel) { virBufferAddLit(buf, ">\n"); virDomainVideoAccelDefFormat(buf, def->accel); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9a9e0b1..81925b1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1160,6 +1160,7 @@ struct _virDomainVideoDef { unsigned int ram; /* kibibytes (multiples of 1024) */ unsigned int vram; /* kibibytes (multiples of 1024) */ unsigned int heads; + unsigned int revision; bool primary; virDomainVideoAccelDefPtr accel; virDomainDeviceInfo info; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f6273c1..e45c808 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3598,6 +3598,9 @@ qemuBuildDeviceVideoStr(virDomainVideoDefPtr video, /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); + + if (video->revision != 0) + virBufferAsprintf(&buf, ",revision=%u", video->revision); } if (qemuBuildDeviceAddressStr(&buf, &video->info, caps) < 0) @@ -6631,6 +6634,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgFormat(cmd, "%s.vram_size=%u", dev, vram * 1024); } + if (def->videos[0]->revision) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.revision=%u", + dev, def->videos[0]->revision); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 59f064b..05f5579 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -7,5 +7,6 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter -vga \ qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index a8c4ad8..2dc5776 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -31,10 +31,10 @@ <streaming mode='filter'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index ef499e6..0b08038 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -4,5 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-global qxl-vga.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 563d371..3cd0c42 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -28,10 +28,10 @@ <channel name='inputs' mode='insecure'/> </graphics> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='65536' heads='1'/> + <model type='qxl' ram='65536' vram='65536' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index d7cfae0..082eaf7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -6,5 +6,6 @@ x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-c image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter,disable-copy-paste -vga \ qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 9a36660..e99dbc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -34,10 +34,10 @@ <clipboard copypaste='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> -- 1.8.1

3 6

[libvirt] [PATCHv2] storage: fix uid_t|gid_t handling on 32 bit Linux
by Philipp Hahn 22 Feb '13

22 Feb '13

uid_t and gid_t are opaque types, ranging from s32 to u32 to u64. Unfortunately libvirt uses the value -1 to mean "current process", which on Linux32 gets converted to UINT_MAX := +(2^32-1) = 4294967295. Different libvirt versions used different formatting in the past, which break one or the other parsing function: virXPathLong(): (signed long)-1 != (double)UINT_MAX virXPathULong(): (unsigned long)-1 != (double)-1 Roll our own version of virXPathULong(), which also accepts -1, which is silently converted to UINT_MAX. For output: do the reverse and print -1 instead of UINT_MAX. Allow -1 for owner and group in schema for storage volumes. Change UINT_MAX in one test case to -1 to follow the changes from above. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- [v2] - change schema for storage volume to accept -1 for owner and group - Use UINT_MAX instead of ALLONE - Windows64 uses s64, mention s16 and u16 as well - Fix Sheepdog test case to use -1 instead of UINT_MAX --- docs/schemas/storagevol.rng | 10 +++- src/conf/storage_conf.c | 76 ++++++++++++++++++++++----- tests/storagevolxml2xmlout/vol-sheepdog.xml | 4 +- 3 files changed, 72 insertions(+), 18 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index d4a29c7..ba95c55 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -49,10 +49,16 @@ <ref name='octalMode'/> </element> <element name='owner'> - <ref name='unsignedInt'/> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> </element> <element name='group'> - <ref name='unsignedInt'/> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> </element> <optional> <element name='label'> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9134a22..617b19f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -659,13 +659,14 @@ cleanup: return ret; } + static int virStorageDefParsePerms(xmlXPathContextPtr ctxt, virStoragePermsPtr perms, const char *permxpath, int defaultmode) { char *mode; - long v; + double d; int ret = -1; xmlNodePtr relnode; xmlNodePtr node; @@ -699,26 +700,58 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, VIR_FREE(mode); } + /* uid_t and gid_t are *opaque* types: on Linux they're u32, on Windows64 + * they're s64, on Solaris they were s32 in the past, and u16 and s16 have + * been used as well. + * + * Unfortunately libvirt uses the value -1 to mean "current process", which + * on Linux32 gets converted to UINT_MAX := +(2^32-1). + * + * Different libvirt versions used different formatting in the past, which + * break one or the other parsing function: + * virXPathLong(): (signed long)-1 != (double)UINT_MAX + * virXPathULong(): (unsigned long)-1 != (double)-1 + */ if (virXPathNode("./owner", ctxt) == NULL) { perms->uid = (uid_t) -1; } else { - if (virXPathLong("number(./owner)", ctxt, &v) < 0) { + ret = virXPathNumber("number(./owner)", ctxt, &d); + if (ret == 0) { + if (d == (double) -1) { + perms->uid = (uid_t) -1; + } else { + perms->uid = (uid_t) (unsigned long) d; + if (perms->uid != d) { + ret = -2; + } + } + } + if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed owner element")); goto error; } - perms->uid = (int)v; } if (virXPathNode("./group", ctxt) == NULL) { perms->gid = (gid_t) -1; } else { - if (virXPathLong("number(./group)", ctxt, &v) < 0) { + ret = virXPathNumber("number(./group)", ctxt, &d); + if (ret == 0) { + if (d == (double) -1) { + perms->gid = (gid_t)-1; + } else { + perms->gid = (gid_t) (unsigned long) d; + if (perms->gid != d) { + ret = -2; + } + } + } + if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed group element")); goto error; } - perms->gid = (int)v; } /* NB, we're ignoring missing labels here - they'll simply inherit */ @@ -1060,10 +1093,18 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", def->target.perms.mode); - virBufferAsprintf(&buf," <owner>%d</owner>\n", - (int) def->target.perms.uid); - virBufferAsprintf(&buf," <group>%d</group>\n", - (int) def->target.perms.gid); + if (def->target.perms.uid == (uid_t) -1) { + virBufferAddLit(&buf, " <owner>-1</owner>\n"); + } else { + virBufferAsprintf(&buf, " <owner>%u</owner>\n", + (unsigned int) def->target.perms.uid); + } + if (def->target.perms.gid == (gid_t) -1) { + virBufferAddLit(&buf, " <group>-1</group>\n"); + } else { + virBufferAsprintf(&buf, " <group>%u</group>\n", + (unsigned int) def->target.perms.gid); + } if (def->target.perms.label) virBufferAsprintf(&buf," <label>%s</label>\n", @@ -1313,11 +1354,18 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf," <permissions>\n"); virBufferAsprintf(buf," <mode>0%o</mode>\n", def->perms.mode); - virBufferAsprintf(buf," <owner>%u</owner>\n", - (unsigned int) def->perms.uid); - virBufferAsprintf(buf," <group>%u</group>\n", - (unsigned int) def->perms.gid); - + if (def->perms.uid == (uid_t) -1) { + virBufferAddLit(buf, " <owner>-1</owner>\n"); + } else { + virBufferAsprintf(buf, " <owner>%u</owner>\n", + (unsigned int) def->perms.uid); + } + if (def->perms.gid == (gid_t) -1) { + virBufferAddLit(buf, " <group>-1</group>\n"); + } else { + virBufferAsprintf(buf, " <group>%u</group>\n", + (unsigned int) def->perms.gid); + } if (def->perms.label) virBufferAsprintf(buf," <label>%s</label>\n", diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index 2f19af8..fc04f19 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -10,8 +10,8 @@ <format type='unknown'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> -- 1.7.10.4

1 0

[libvirt] [PATCH 00/14] Add support for XBZRLE migration compression
by Jiri Denemark 22 Feb '13

22 Feb '13

QEMU supports XBZRLE compression of repeatedly transferred pages during live migration and this series makes it usable through libvirt. The first two patches add support for VIR_MIGRATE_COMPRESSED flag that enables XBZRLE compression. Patches 3--9 add an enhanced and extensible version of virDomainGetJobInfo and make various migration statistics available through it. The rest of the patches (10--14) add APIs for querying and changing XBZRLE compression cache size. Jiri Denemark (14): Introduce VIR_MIGRATE_COMPRESSED flag qemu: Add support for compressed migration Introduce virDomainGetJobStats API python: Implement virDomainGetJobStats wrapper remote: Auto-allocate params in remoteDeserializeTypedParameters remote: Implement virDomainGetJobStats virsh: Use virDomainGetJobStats in domjobinfo if available qemu: Parse more fields from query-migrate QMP command qemu: Implement virDomainGetJobStats Introduce virDomainMigrate*CompressionCache APIs python: Implement virDomainMigrateGetCompressionCache wrapper remote: Implement virDomainMigrate*CompressionCache virsh: Add migrate-compcache command qemu: Implement virDomainMigrate*CompressionCache daemon/remote.c | 44 ++++++ include/libvirt/libvirt.h.in | 213 ++++++++++++++++++++++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 70 +++++++++ src/driver.h | 18 +++ src/libvirt.c | 158 +++++++++++++++++++ src/libvirt_public.syms | 3 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 235 ++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 103 ++++++++++--- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 101 ++++++++++-- src/qemu/qemu_monitor.h | 52 ++++++- src/qemu/qemu_monitor_json.c | 331 ++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor_json.h | 15 +- src/qemu/qemu_monitor_text.c | 47 +++--- src/qemu/qemu_monitor_text.h | 5 +- src/remote/remote_driver.c | 138 ++++++++++++----- src/remote/remote_protocol.x | 31 +++- src/remote_protocol-structs | 26 ++++ src/rpc/gendispatch.pl | 2 +- tools/virsh-domain.c | 291 +++++++++++++++++++++++++++++------ tools/virsh.pod | 18 ++- 25 files changed, 1718 insertions(+), 205 deletions(-) -- 1.8.1.2

4 36

[libvirt] [PATCH] qemu: only release SPICE TLS port if it has been allocated
by Ján Tomko 22 Feb '13

22 Feb '13

Silence the error message that happens during shutdown of a domain with spice graphics, autoport enabled if spice_tls is disabled in qemu.conf: error : virPortAllocatorRelease:174 : port 0 must be in range (5900, 65534) --- src/qemu/qemu_process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b560d2e..1e2bcae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4321,8 +4321,10 @@ retry: graphics->data.spice.autoport) { ignore_value(virPortAllocatorRelease(driver->remotePorts, graphics->data.spice.port)); - ignore_value(virPortAllocatorRelease(driver->remotePorts, - graphics->data.spice.tlsPort)); + if (cfg->spiceTLS) { + ignore_value(virPortAllocatorRelease(driver->remotePorts, + graphics->data.spice.tlsPort)); + } } } -- 1.7.12.4

2 1

[libvirt] Libvirt java build problems
by Daniel P. Berrange 22 Feb '13

22 Feb '13

The Fedora build of libvirt-java is currently broken with a strange error: http://kojipkgs.fedoraproject.org//work/tasks/4719/4994719/build.log Buildfile: /builddir/build/BUILD/libvirt-java-0.4.9/build.xml init: [mkdir] Created dir: /builddir/build/BUILD/libvirt-java-0.4.9/target/classes [mkdir] Created dir: /builddir/build/BUILD/libvirt-java-0.4.9/target/testclasses [copy] Copying 1 file to /builddir/build/BUILD/libvirt-java-0.4.9 build: [javac] /builddir/build/BUILD/libvirt-java-0.4.9/build.xml:42: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds [javac] Compiling 63 source files to /builddir/build/BUILD/libvirt-java-0.4.9/target/classes [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virError.java:9: error: virError is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virError extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virConnectAuth.java:9: error: virConnectAuth is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virConnectAuth extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainBlockStats.java:8: error: virDomainBlockStats is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainBlockStats extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainBlockInfo.java:5: error: virDomainBlockInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainBlockInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainInfo.java:9: error: virDomainInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainJobInfo.java:5: error: virDomainJobInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainJobInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virSchedParameter.java:8: error: virSchedParameter is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virSchedParameter extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virVcpuInfo.java:8: error: virVcpuInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virVcpuInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java:8: error: virDomainInterfaceStats is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainInterfaceStats extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virDomainMemoryStats.java:5: error: virDomainMemoryStats is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virDomainMemoryStats extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virNodeInfo.java:9: error: virNodeInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virNodeInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virStoragePoolInfo.java:8: error: virStoragePoolInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virStoragePoolInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virStorageVolInfo.java:8: error: virStorageVolInfo is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virStorageVolInfo extends Structure { [javac] ^ [javac] /builddir/build/BUILD/libvirt-java-0.4.9/src/main/java/org/libvirt/jna/virConnectCredential.java:8: error: virConnectCredential is not abstract and does not override abstract method getFieldOrder() in Structure [javac] public class virConnectCredential extends Structure implements Structure.ByReference { [javac] ^ [javac] 14 errors BUILD FAILED /builddir/build/BUILD/libvirt-java-0.4.9/build.xml:42: Compile failed; see the compiler error output for details. Not sure what we should do to fix this...so suggestions welcome. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 3

[libvirt] [PATCH 0/2] qemu: allow multiple buses in PCI address allocation
by Ján Tomko 22 Feb '13

22 Feb '13

This miniseries converts the functions for reserving PCI addresses to use virDevicePCIAddress which we use in virDeviceInfo for PCI addresses (not to be confused with virPCIDeviceAddress from virpci.h used for host devices which should probably be merged with virDevicePCIAddress in a followup patch) and it makes them accept bus numbers up to 'maxbus', which should be set when creating the address set if multiple buses are allowed. Right now it's initialized to zero and these patches have no effect. Ján Tomko (2): qemu: switch PCI address alocation to use virDevicePCIAddress qemu: allow multiple buses in PCI address alocation src/qemu/qemu_command.c | 288 ++++++++++++++++++++++-------------------------- src/qemu/qemu_command.h | 13 +-- src/qemu/qemu_hotplug.c | 16 +-- 3 files changed, 147 insertions(+), 170 deletions(-) -- 1.7.12.4

2 6

[libvirt] How to connect to console of domain on PowerPC?
by Yin Olivia-R63875 22 Feb '13

22 Feb '13

Hi, I tried to use libvirt to run KVM/QEMU on Freescale PowerPC platforms. So far there's only one serial device (spapr-vty) defined in QEMU to work as console for IBM PSeries platform. There's no serial device support in QEMU for Freescale PowerPC (ePAPR). libvirt/src/qemu/qemu_command.c /* This function generates the correct '-device' string for character * devices of each architecture. */ char * qemuBuildChrDeviceStr(virDomainChrDefPtr serial, virBitmapPtr qemuCaps, char *os_arch, char *machine) { virBuffer cmd = VIR_BUFFER_INITIALIZER; if (STREQ(os_arch, "ppc64") && STREQ(machine, "pseries")) { if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && serial->source.type == VIR_DOMAIN_CHR_TYPE_PTY && serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", serial->info.alias); if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) goto error; } } else virBufferAsprintf(&cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); if (virBufferError(&cmd)) { virReportOOMError(); goto error; } return virBufferContentAndReset(&cmd); error: virBufferFreeAndReset(&cmd); return NULL; } We usually connect guest with telnet. For instance, /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server Then to run 'telnet 10.193.20.xxx 4445' could connect the guest. The temporary workaround is not add '-device' string after '-serial' option. diff -Nur libvirt-0.10.1.orig/src/qemu/qemu_command.c libvirt-0.10.1/src/qemu/qemu_command.c --- libvirt-0.10.1.orig/src/qemu/qemu_command.c 2012-08-30 15:35:18.000000000 +0530 +++ libvirt-0.10.1/src/qemu/qemu_command.c 2012-10-05 17:19:32.060368755 +0530 @@ -5501,13 +5501,15 @@ virCommandAddArg(cmd, devstr); VIR_FREE(devstr); - virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildChrDeviceStr(serial, qemuCaps, + if (!STREQ(def->os.arch, "ppc")) { + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildChrDeviceStr(serial, + qemuCaps, def->os.arch, def->os.machine))) - goto error; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); + goto error; + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + } } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) Applying the above patch to libvirt, all the other domain control commands could work except 'virsh console domain'. # cat >demo.args <<EOF > /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 > -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk > -append "root=/dev/ram rw console=ttyS0,115200" -serial > tcp::4445,server -net nic EOF # vi demo.args /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server -net nic # virsh domxml-from-native qemu-argv demo.args >demo.xml # vi demo.xml <domain type='kvm'> <name>demo</name> <uuid>985d7154-83c8-0763-cbac-ecd159eee8a6</uuid> <memory unit='KiB'>262144</memory> <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc' machine='ppce500v2'>hvm</type> <kernel>/media/ram/uImage</kernel> <initrd>/media/ram/ramdisk</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <serial type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> </domain> # virsh -c qemu:///system define demo.xml # virsh -c qemu:///system start demo But it seemed that can't connect to the console. # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] error: internal error character device (null) is not using a PTY I tried also use '-serial pty' option, /usr/bin/qemu-system-ppc -name test -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial pty Then there's no other output after the below message: # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] It seemed not libvirt group issue. I also tried the LXC. It could connect to the console if <init>/bin/sh/</init> instead of <init>/sbin/init</init> Best Regards, Olivia

2 5

[libvirt] [PATCH 1/2] conf: Don't leak 'primary' video property on error
by Christophe Fergeau 22 Feb '13

22 Feb '13

It's only freed on normal returns from virDomainVideoDefParseXML, but not when erroring out. --- src/conf/domain_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10f361c..258ee93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7662,9 +7662,11 @@ virDomainVideoDefParseXML(const xmlNodePtr node, vram = virXMLPropString(cur, "vram"); heads = virXMLPropString(cur, "heads"); - if ((primary = virXMLPropString(cur, "primary")) != NULL) + if ((primary = virXMLPropString(cur, "primary")) != NULL) { if (STREQ(primary, "yes")) def->primary = 1; + VIR_FREE(primary); + } def->accel = virDomainVideoAccelDefParseXML(cur); } @@ -7728,7 +7730,6 @@ virDomainVideoDefParseXML(const xmlNodePtr node, VIR_FREE(ram); VIR_FREE(vram); VIR_FREE(heads); - VIR_FREE(primary); return def; -- 1.8.1.2

2 4

[libvirt] Reminder about coming freeze for 1.0.3
by Daniel Veillard 22 Feb '13

22 Feb '13

We are supposed to enter the freeze early Monday, so please try to push features today or over the w.e. , if there is something serious pending and that should go in and is in trouble please reply so it gets the required attention and can be processed in time :-) 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/

1 0

[libvirt] [PATCHv2 0/6] interface: udev backend bond support
by Doug Goldstein 22 Feb '13

22 Feb '13

Refactor code, clean up error handling, and finally add bond support. The last patch optionally supports a patch I submitted to the Linux kernel which should go in for 3.9 (it was just accepted for net-next). After this patch when you have a bond device you'll get the following: $ ./tools/virsh iface-dumpxml br0 <interface type='bridge' name='br0'> <mtu size='1500'/> <bridge stp='on' delay='1499'> <interface type='bond' name='bond0'> <mtu size='1500'/> <bond mode='balance-rr'> <interface type='ethernet' name='eth2'> <mac address='d0:67:e5:fa:88:95'/> <mtu size='1500'/> </interface> <interface type='ethernet' name='eth3'> <mac address='d0:67:e5:fa:88:95'/> <mtu size='1500'/> </interface> </bond> </interface>  </bridge> </interface> Doug Goldstein (6): interface: Refactor udev bridge to helper func interface: udev bridge code error handling updates interface: Refactor interface vlan to helper func interface: Improve udev backend device type id interface: add bond support to udev backend interface: dev type support for bond interfaces src/interface/interface_backend_udev.c | 546 +++++++++++++++++++++++++++------ 1 file changed, 451 insertions(+), 95 deletions(-) -- 1.7.12.4

2 13

[libvirt] [PATCH] qemu: check backing chains even when cgroup is omitted
by Eric Blake 21 Feb '13

21 Feb '13

https://bugzilla.redhat.com/show_bug.cgi?id=896685 points out a regression caused by commit 38c4a9c - libvirt only labels the backing chain if the backing chain cache is populated, but the code to populate the cache was only conditionally performed if cgroup labeling was necessary. * src/qemu/qemu_cgroup.c (qemuSetupCgroup): Hoist cache setup... * src/qemu/qemu_process.c (qemuProcessStart): ...earlier into caller, where it is now unconditional. --- src/qemu/qemu_cgroup.c | 4 +--- src/qemu/qemu_process.c | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 4fde1af..e65b486 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -234,9 +234,7 @@ int qemuSetupCgroup(virQEMUDriverPtr driver, } for (i = 0; i < vm->def->ndisks ; i++) { - if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], - false) < 0 || - qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0) + if (qemuSetupDiskCgroup(vm, cgroup, vm->def->disks[i]) < 0) goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 476e3ed..af8222b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3706,6 +3706,11 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); + for (i = 0; i < vm->def->ndisks ; i++) { + if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], + false) < 0) + goto cleanup; + } if (qemuDomainCheckDiskPresence(driver, vm, flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; -- 1.8.1.2

2 2

[libvirt] [PATCH] virsh: add --start option to the define command
by Doug Goldstein 21 Feb '13

21 Feb '13

I often find myself doing virsh "define blah.xml; start blah". I figured adding this would be a easier^Hlazier way to do it. --- tools/virsh-domain.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e91939c..1a3af34 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5597,6 +5597,7 @@ static const vshCmdInfo info_define[] = { static const vshCmdOptDef opts_define[] = { {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")}, + {"start", VSH_OT_BOOL, 0, N_("start the domain after creation")}, {NULL, 0, 0, NULL} }; @@ -5607,6 +5608,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) const char *from = NULL; bool ret = true; char *buffer; + bool start; if (vshCommandOptString(cmd, "file", &from) <= 0) return false; @@ -5614,17 +5616,31 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + start = vshCommandOptBool(cmd, "start"); + dom = virDomainDefineXML(ctl->conn, buffer); VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), virDomainGetName(dom), from); - virDomainFree(dom); } else { vshError(ctl, _("Failed to define domain from %s"), from); - ret = false; + return false; } + + /* Start the domain if the user requested it and it was defined */ + if (start) { + if (virDomainCreate(dom) < 0) { + vshError(ctl, _("Failed to start domain %s, which was " + "successfully defined."), virDomainGetName(dom)); + ret = false; + } else { + vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); + } + } + + virDomainFree(dom); return ret; } -- 1.7.8.6

7 10

[libvirt] [PATCH] Update arch names in RNG schema to match virarch.c
by Daniel P. Berrange 21 Feb '13

21 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When the virarch.c file was introduced to formalize the arch list, we forgot to update the RNG schema with the new arches. --- docs/schemas/basictypes.rng | 34 ++++++++++++++++++++++++++++++++++ docs/schemas/capability.rng | 17 ----------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 2d2f442..cfc8208 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -231,4 +231,38 @@ </data> </define> + <define name='archnames'> + <choice> + <value>alpha</value> + <value>armv7l</value> + <value>cris</value> + <value>i686</value> + <value>ia64</value> + <value>lm32</value> + <value>m68k</value> + <value>microblaze</value> + <value>microblazeel</value> + <value>mips</value> + <value>mipsel</value> + <value>mips64</value> + <value>mips64el</value> + <value>openrisc</value> + <value>parisc</value> + <value>parisc64</value> + <value>ppc</value> + <value>ppc64</value> + <value>ppcemb</value> + <value>s390</value> + <value>s390x</value> + <value>sh4</value> + <value>sh4eb</value> + <value>sparc</value> + <value>sparc64</value> + <value>unicore32</value> + <value>x86_64</value> + <value>xtensa</value> + <value>xtensaeb</value> + </choice> + </define> + </grammar> diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 53fb04a..8f3fbd9 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -367,23 +367,6 @@ </attribute> </define> - <define name='archnames'> - <choice> - <value>arm</value> - <value>i686</value> - <value>ia64</value> - <value>microblaze</value> - <value>microblazeel</value> - <value>mips</value> - <value>mipsel</value> - <value>ppc64</value> - <value>ppc</value> - <value>s390</value> - <value>sparc</value> - <value>x86_64</value> - </choice> - </define> - <define name='featureName'> <data type='string'> <param name='pattern'>[a-zA-Z0-9\-_]+</param> -- 1.8.1

2 1

[libvirt] [PATCH V8 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 21 Feb '13

21 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

1 3

[libvirt] [PATCH] docs: Add missing 'vram' in QXL video device doc
by Christophe Fergeau 21 Feb '13

21 Feb '13

--- Pushed under the trivial rule. docs/formatdomain.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ffcc33e..a9003d7 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3583,7 +3583,8 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies the size of the primary bar, while <code>vram</code> specifies the - secondary bar size. If "ram" is not supplied a default value is used. + secondary bar size. If "ram" or "vram" are not supplied a default + value is used. </dd> <dt><code>model</code></dt> -- 1.8.1.2

1 0

[libvirt] [test-API][PATCH v2] Add 2 host node memory API cases
by Wayne Sun 21 Feb '13

21 Feb '13

v1: add 2 host node memory cases and update conf - node_mem_param: tuning host node memory parameters - node_memory: get host node memory info, including host free memory, node free memory and node memory stats - numa_param conf is updated with the 2 new cases v2: node_mem_param: polish codes with better readability node_memory: direct fetch info in /sys/devices/system/node/node* other than using command 'numastat' Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/numa_param.conf | 8 ++++ repos/numa/node_mem_param.py | 81 ++++++++++++++++++++++++++++++++ repos/numa/node_memory.py | 107 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+) create mode 100644 repos/numa/node_mem_param.py create mode 100644 repos/numa/node_memory.py diff --git a/cases/numa_param.conf b/cases/numa_param.conf index 64268a3..515fb1f 100644 --- a/cases/numa_param.conf +++ b/cases/numa_param.conf @@ -1,3 +1,11 @@ +numa:node_memory + +numa:node_mem_param + shm_pages_to_scan + 200 + shm_sleep_millisecs + 20 + domain:install_linux_cdrom guestname $defaultname diff --git a/repos/numa/node_mem_param.py b/repos/numa/node_mem_param.py new file mode 100644 index 0000000..86242b1 --- /dev/null +++ b/repos/numa/node_mem_param.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# Test tuning host node memory parameters + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = {"shm_pages_to_scan": 100, + "shm_sleep_millisecs": 20, + "shm_merge_across_nodes": 1 + } + +KSM_PATH = "/sys/kernel/mm/ksm/" + +def node_mem_param(params): + """test set host node memory parameters + """ + logger = params['logger'] + shm_pages_to_scan = params.get('shm_pages_to_scan') + shm_sleep_millisecs = params.get('shm_sleep_millisecs') + shm_merge_across_nodes = params.get('shm_merge_across_nodes') + + if not shm_pages_to_scan \ + and not shm_sleep_millisecs \ + and not shm_merge_across_nodes: + logger.error("given param is none") + return 1 + + param_dict = {} + for i in optional_params.keys(): + if eval(i): + param_dict[i] = int(eval(i)) + + logger.info("the given param dict is: %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + logger.info("get host node memory parameters") + mem_pre = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pre) + + logger.info("set host node memory parameters with given param %s" % + param_dict) + conn.setMemoryParameters(param_dict, 0) + logger.info("set host node memory parameters done") + + logger.info("get host node memory parameters") + mem_pos = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pos) + + for i in param_dict.keys(): + if not mem_pos[i] == param_dict[i]: + logger.error("%s is not set as expected" % i) + + logger.info("node memory parameters is set as expected") + + logger.info("check tuning detail under %s" % KSM_PATH) + + ksm_dict = {} + for i in param_dict.keys(): + path = "%s%s" % (KSM_PATH, i[4:]) + f = open(path) + ret = int(f.read().split('\n')[0]) + f.close() + logger.info("%s value is: %s" % (path, ret)) + ksm_dict[i] = ret + + if ksm_dict == param_dict: + logger.info("tuning detail under %s is expected" % KSM_PATH) + else: + logger.error("check with tuning detail under %s failed" % KSM_PATH) + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/numa/node_memory.py b/repos/numa/node_memory.py new file mode 100644 index 0000000..0241f3c --- /dev/null +++ b/repos/numa/node_memory.py @@ -0,0 +1,107 @@ +#!/usr/bin/env python +# Test get host node memory info, including host free +# memory, node free memory and node memory stats. + +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = () +optional_params = {} + +NODE_MEMINFO_PATH = "/sys/devices/system/node/node*/meminfo" + +def node_memory(params): + """test get host node memory info + """ + logger = params['logger'] + + cmd = "lscpu|grep 'NUMA node(s)'" + ret, output = utils.exec_cmd(cmd, shell=True) + node_num = int(output[0].split(' ')[-1]) + logger.info("host total nodes number is: %s" % node_num) + + conn = sharedmod.libvirtobj['conn'] + + cmd = "grep 'MemFree' %s" % NODE_MEMINFO_PATH + node_mem = [] + free_total = 0 + ret, out = utils.exec_cmd(cmd, shell=True) + for i in range(node_num): + mem_free = int(out[i].split()[-2]) + node_mem.append(mem_free) + free_total += mem_free + + try: + logger.info("get host total free memory") + mem = conn.getFreeMemory()/1024 + logger.info("host free memory total is: %s KiB" % mem) + logger.info("free memory collected in %s is: %s KiB" % + (NODE_MEMINFO_PATH, free_total)) + + if math.fabs(mem - free_total) > 1024: + logger.error("free memory mismatch with info collected in %s" % + NODE_MEMINFO_PATH) + return 1 + else: + logger.info("get host free memory succeed") + + logger.info("get free memory of nodes") + ret = conn.getCellsFreeMemory(0, node_num) + mem_list = [i/1024 for i in ret] + logger.info("node free memory list is: %s" % mem_list) + logger.info("node free memory list collected in %s is: %s" % + (NODE_MEMINFO_PATH, node_mem)) + + for i in range(node_num): + if math.fabs(mem_list[i] - node_mem[i]) > 1024: + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + logger.error("node %s free memory mismatch with collected in %s" + % (i, path)) + return 1 + + logger.info("get node free memory succeed") + + logger.info("get node memory stats") + node_dict = {} + for i in range(node_num): + ret = conn.getMemoryStats(i, 0) + node_dict[i] = ret + logger.info("node %s memory stats is: %s" % (i, node_dict[i])) + + node_tmp = {} + cmd_new = "grep 'MemTotal' %s" % NODE_MEMINFO_PATH + ret, out_free = utils.exec_cmd(cmd, shell=True) + ret, out_total = utils.exec_cmd(cmd_new, shell=True) + for i in range(node_num): + dict_tmp = {} + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + dict_tmp['free'] = int(out_free[i].split()[-2]) + dict_tmp['total'] = int(out_total[i].split()[-2]) + node_tmp[i] = dict_tmp + logger.info("node %s memory stats collected in %s is: %s" % + (i, path, node_tmp[i])) + + for i in range(node_num): + path = NODE_MEMINFO_PATH.replace('*', '%s') % i + if math.fabs(node_tmp[i]['total'] - node_dict[i]['total']) > 1024: + logger.error("node %s total memory is mismatch with %s" % + (i, path)) + return 1 + + if math.fabs(node_tmp[i]['free'] - node_dict[i]['free']) > 1024: + logger.error("node %s free memory is mismatch with %s" % + (i, path)) + return 1 + + logger.info("get node memory stats succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

1 0

[libvirt] libvirt maint branches
by Doug Goldstein 21 Feb '13

21 Feb '13

Instead of hijacking another thread I figured I'd start a new one. I tried to push the branch I had made as requested by Jiri, but I don't appear to have access. $ git push origin v1.0.2-maint Counting objects: 30, done. Delta compression using up to 4 threads. Compressing objects: 100% (18/18), done. Writing objects: 100% (22/22), 3.44 KiB, done. Total 22 (delta 16), reused 5 (delta 4)remote: *** Creating a branch is not allowed in this repository remote: error: hook declined to update refs/heads/v1.0.2-maint To ssh://libvirt.org/git/libvirt.git ! [remote rejected] v1.0.2-maint -> v1.0.2-maint (hook declined) error: failed to push some refs to 'ssh://libvirt.org/git/libvirt.git' How do we want to go about actually creating these branches? I make one everytime I have to backport a fix due to a regression from a previous release. I'll typically only keep them "maintained" until the next official release. I wouldn't consider them stable like what Cole maintains but more like someone ran into an issue and it needed a fix. So there might be other issues in them that go undiscovered or unsolved. I just say this because I don't want to clutter the repo with a lot of useless branches, but again if people think they'd be useful I'm happy to push them. -- Doug Goldstein

2 1

[libvirt] [PATCH 0/2] qemu: Fix deadlocks in autodestroy
by Jiri Denemark 21 Feb '13

21 Feb '13

After the recent removal of qemu driver locks, implicit driver locks were introduced in places that previously relied on being called from functions that alread had the driver locked. Thus calling anything complex (such as close callbacks) must not be called when the driver is locked... Jiri Denemark (2): qemu: Turn closeCallbacks into virObjectLockable qemu: Avoid deadlock in autodestroy src/qemu/qemu_conf.c | 172 ++++++++++++++++++++++++++++------------------ src/qemu/qemu_conf.h | 43 ++++++------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 12 ++-- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_process.c | 20 ++++-- 6 files changed, 153 insertions(+), 101 deletions(-) -- 1.8.1.2

4 10

[libvirt] [PATCH] docs: Fix HTML errors
by Jiri Denemark 21 Feb '13

21 Feb '13

<pre> is forbidden inside <p> --- Pushed as trivial. docs/formatnetwork.html.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index adb5bb9..f7c483d 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -143,6 +143,7 @@ The address range is set with the <code><address></code> subelements and <code>start</code> and <code>stop</code> attributes: + </p> <pre> ... <forward mode='nat'> @@ -150,8 +151,8 @@ <address start='1.2.3.4' end='1.2.3.10'/> </nat> </forward> -... - </pre> +...</pre> + <p> An singe IPv4 address can be set by setting <code>start</code> and <code>end</code> attributes to the same value. @@ -159,6 +160,7 @@ <p> The port range to be used for the <code><nat></code> can be set via the subelement <code><port></code>: + </p> <pre> ... <forward mode='nat'> @@ -166,9 +168,7 @@ <port start='500' end='1000'/> </nat> </forward> -... - </pre> - </p> +...</pre> </dd> <dt><code>route</code></dt> -- 1.8.1.2

1 0

[libvirt] [PATCH 0/6] VirtIO RNG device support
by Peter Krempa 21 Feb '13

21 Feb '13

This patchset adds VirtIO RNG device support to libvirt and it's qemu driver. Both ("random" and "egd") qemu backends are supported. This series is techincally a v2 but the changes to the previous version are substantial so I'm not marking it as such. Peter Krempa (6): doc: schema: Add basic documentation for the virtual RNG device support conf: Add support for RNG device configuration in XML conf: Add RNG device ABI compatibility check qemu: Implement support for the RNG device and the random backend qemu: Implement support for EGD backend for virtio-rng tests: Add tests for virtio-rng device handling docs/formatdomain.html.in | 69 +++++++ docs/schemas/domaincommon.rng | 32 +++ src/conf/domain_conf.c | 229 ++++++++++++++++++++- src/conf/domain_conf.h | 37 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 116 +++++++++++ .../qemuxml2argv-virtio-rng-egd.args | 1 + .../qemuxml2argv-virtio-rng-egd.xml | 26 +++ .../qemuxml2argv-virtio-rng-random.args | 1 + .../qemuxml2argv-virtio-rng-random.xml | 23 +++ tests/qemuxml2argvtest.c | 5 + tests/qemuxml2xmltest.c | 3 + 14 files changed, 553 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml -- 1.8.1.1

2 19

[libvirt] building libvirt 1.0.2 without quite a few features - undefined reference to `curl_global_init'
by Thierry Parmentelat 21 Feb '13

21 Feb '13

Hi there I'm trying to rebuild libvirt 1.0.2 on various targets - mostyl f16 and f18 for now I've started from the specfile that I found in this source rpm here http://libvirt.org/sources/libvirt-1.0.2-1.fc17.src.rpm in which I've mostly added without clauses : %define _without_storage_disk true %define _without_storage_iscsi true %define _without_storage_fs true %define _without_storage_lvm true %define _without_polkit true %define _without_sasl true %define _without_audit true %define _without_netcf true %define _without_avahi true %define _without_sanlock true %define _without_xen true %define _without_qemu true %define _without_hyperv true %define _without_phyp true %define _without_esx true %define _without_libxl true when building with these settings though, I'm facing this undefined error below; this happened on both f16 and f18 I take it there must be something slightly broken in the specfile logic, if anybody had a hint on how to address this is would be much appreciated For one thing I don't know how to get the real sentence behind this 'CCLD' thing, so I could check if libcurl (which I believe should provide that symbol) is mentioned or not.. CCLD libvirtd /longbuildroot/BUILD/libvirt-1.0.2/src/.libs/libvirt.so: undefined reference to `curl_global_init' many thanks in anticipation -- Thierry

4 11

[libvirt] [test-API][PATCH] Add 2 host node memory API cases
by Wayne Sun 21 Feb '13

21 Feb '13

add 2 host node memory cases and update conf - node_mem_param: tuning host node memory parameters. - node_memory: get host node memory info, including host free memory, node free memory and node memory stats. - numa_param conf is updated with the 2 new cases Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/numa_param.conf | 8 ++++ repos/numa/node_mem_param.py | 86 ++++++++++++++++++++++++++++++++++++ repos/numa/node_memory.py | 101 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 repos/numa/node_mem_param.py create mode 100644 repos/numa/node_memory.py diff --git a/cases/numa_param.conf b/cases/numa_param.conf index 64268a3..515fb1f 100644 --- a/cases/numa_param.conf +++ b/cases/numa_param.conf @@ -1,3 +1,11 @@ +numa:node_memory + +numa:node_mem_param + shm_pages_to_scan + 200 + shm_sleep_millisecs + 20 + domain:install_linux_cdrom guestname $defaultname diff --git a/repos/numa/node_mem_param.py b/repos/numa/node_mem_param.py new file mode 100644 index 0000000..ba6f8f4 --- /dev/null +++ b/repos/numa/node_mem_param.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# Test tuning host node memory parameters + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = {"shm_pages_to_scan": 100, + "shm_sleep_millisecs": 20, + "shm_merge_across_nodes": 1 + } + +KSM_PATH = "/sys/kernel/mm/ksm/" + +def node_mem_param(params): + """test set host node memory parameters + """ + logger = params['logger'] + shm_pages_to_scan = params.get('shm_pages_to_scan') + shm_sleep_millisecs = params.get('shm_sleep_millisecs') + shm_merge_across_nodes = params.get('shm_merge_across_nodes') + + if not shm_pages_to_scan \ + and not shm_sleep_millisecs \ + and not shm_merge_across_nodes: + logger.error("given param is none") + return 1 + + param_dict = {} + tmp = ('shm_pages_to_scan', 'shm_sleep_millisecs', 'shm_merge_across_nodes') + tmp1 = ('pages_to_scan', 'sleep_millisecs', 'merge_across_nodes') + for i in tmp: + if eval(i): + param_dict[i] = int(eval(i)) + + logger.info("the given param dict is: %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + logger.info("get host node memory parameters") + mem_pre = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pre) + + logger.info("set host node memory parameters with given param %s" % + param_dict) + conn.setMemoryParameters(param_dict, 0) + logger.info("set host node memory parameters done") + + logger.info("get host node memory parameters") + mem_pos = conn.getMemoryParameters(0) + logger.info("host node memory parameters is: %s" % mem_pos) + + for i in tmp: + if eval(i): + if not mem_pos[i] == param_dict[i]: + logger.error("%s is not set as expected" % i) + + logger.info("node memory parameters is set as expected") + + logger.info("check tuning detail under %s" % KSM_PATH) + + mem_tmp = {} + for i in tmp1: + str_tmp = 'shm_%s' % i + if eval(str_tmp): + path = "%s%s" % (KSM_PATH, i) + f = open(path) + ret = int(f.read().split('\n')[0]) + f.close() + logger.info("%s value is: %s" % (path, ret)) + mem_tmp[str_tmp] = ret + + if mem_tmp == param_dict: + logger.info("tuning detail under %s is expected" % KSM_PATH) + else: + logger.error("check with tuning detail under %s failed" % KSM_PATH) + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/numa/node_memory.py b/repos/numa/node_memory.py new file mode 100644 index 0000000..47d3b4a --- /dev/null +++ b/repos/numa/node_memory.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python +# Test get host node memory info, including host free +# memory, node free memory and node memory stats. + +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = () +optional_params = {} + +CMD = "numastat -m" + +def node_memory(params): + """test get host node memory info + """ + logger = params['logger'] + + cmd = "lscpu|grep 'NUMA node(s)'" + ret, output = utils.exec_cmd(cmd, shell=True) + node_num = int(output[0].split(' ')[-1]) + logger.info("host total nodes number is: %s" % node_num) + + conn = sharedmod.libvirtobj['conn'] + + try: + logger.info("get host total free memory") + mem = conn.getFreeMemory()/1048576 + logger.info("host free memory total is: %s KiB" % mem) + ret, out = utils.exec_cmd(CMD, shell=True) + mem_total = " ".join(out[5].split()).split()[-1] + mem_total = int(eval(mem_total)) + logger.info("output of '%s' is: %s KiB" % (CMD, mem_total)) + + if math.fabs(mem - mem_total) > 1: + logger.error("free memory mismatch with result of '%s'" % CMD) + return 1 + else: + logger.info("get host free memory succeed") + + logger.info("get free memory of nodes") + ret = conn.getCellsFreeMemory(0, node_num) + mem = [i/1048576 for i in ret] + logger.info("nodes free memory list is: %s" % mem) + + ret, out = utils.exec_cmd(CMD, shell=True) + mem_tmp = " ".join(out[5].split()).split()[1:-1] + node_mem = [int(eval(i)) for i in mem_tmp] + logger.info("output of '%s' is: %s" % (CMD, node_mem)) + + for i in range(node_num): + if math.fabs(mem[i] - node_mem[i]) > 1: + logger.error("node %s free memory mismatch with command '%s'" + % CMD) + return 1 + + logger.info("get node free memory succeed") + + logger.info("get node memory stats") + node_dict = {} + for i in range(node_num): + ret = conn.getMemoryStats(i, 0) + for j in ret.keys(): + ret[j] = ret[j]/1024 + node_dict[i] = ret + logger.info("node %s memory stats is: %s" % (i, node_dict[i])) + + node_tmp = {} + logger.info("get node memory stats with '%s'" % CMD) + ret, out = utils.exec_cmd(CMD, shell=True) + mem_total_tmp = " ".join(out[4].split()).split()[1:-1] + mem_free_tmp = " ".join(out[5].split()).split()[1:-1] + for i in range(node_num): + dict_tmp = {} + dict_tmp['total'] = int(eval(mem_total_tmp[i])) + dict_tmp['free'] = int(eval(mem_free_tmp[i])) + node_tmp[i] = dict_tmp + logger.info("node %s memory stats is: %s" % (i, node_tmp[i])) + + for i in range(node_num): + if math.fabs(node_tmp[i]['total'] - node_dict[i]['total']) > 1: + logger.error("node %s total memory is mismatch with of '%s'" % + (i, CMD)) + return 1 + + if math.fabs(node_tmp[i]['free'] - node_dict[i]['free']) > 1: + logger.error("node %s free memory is mismatch with of '%s'" % + (i, CMD)) + return 1 + + logger.info("get node memory stats succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

2 1

[libvirt] libvirt testing with autotest
by Cole Robinson 21 Feb '13

21 Feb '13

Recently I've been playing with virt autotest, which provides a number of qemu and libvirt functional tests. Here's some notes on how to get it running: The super short version of running the libvirt smoke tests on Fedora 18: yum install autotest-framework git clone git://github.com/autotest/virt-test.git autotest-virt-tests cd autotest-virt-tests ./libvirt/get_started.py ./run --type libvirt For me the default tests take under a minute. Output looks like: SETUP: PASS (1.00 s) DATA DIR: /home/crobinso/virt_test DEBUG LOG: /home/crobinso/src/autotest-virt-tests/logs/run-2013-02-11-14.21.47/debug.log TESTS: 28 (1/28) unattended_install.import.import: PASS (23.31 s) (2/28) virsh_domname.vm_state.vm_running.with_valid_option.domid: PASS (1.59 s) (3/28) virsh_domname.vm_state.vm_running.with_valid_option.uuid: PASS (0.47 s) ... (27/28) virsh_domname.with_libvirtd_stop.with_valid_option.uuid: PASS (0.55 s) (28/28) remove_guest.without_disk: PASS (6.77 s) TOTAL TIME: 42.30 s TESTS PASSED: 28 TESTS FAILED: 0 SUCCESS RATE: 100.00 % Now with a bit more detail. The first 4 steps are one time setup, though you will want to update autotest-virt-tests every now and then. The default set of libvirt tests import a VM with virt-install, verify that we can SSH in, run a bunch of virsh domname validation, and remove the guest. Logs are dumped into the autotest-virt-tests/logs directory. autotest-framework is just the client side piece. autotest also has a server component which has web UI, handles job scheduling, and tracks results in a database, but not needed for casual developer usage. virt-test.git is the repo that actually contains all the qemu and libvirt test cases. There are also tests for virt-v2v, libguestfs, ovirt, and openvswitch, but qemu and libvirt have the most tests by far. libvirt has 600 test cases, but many of these are just parameter validation matrices. libvirt TCK likely has more functional tests. All the code is in python. The libvirt test cases actually use virsh and not the python bindings. This was a deliberate choice to get better virsh coverage. The code is pretty nice so impl wise dealing with virsh isn't hard at all. ./libvirt/get_started.py is an interactive script that ensures needed dependencies are installed, and pulls down a pre made Fedora 17 jeos (just enough operating system) image. All the tests run against that image by default. ./run is how you'll interact with everything. The important invocations: # List all libvirt tests ./run --type libvirt --list-tests # Show all test debugging and stdout to the console ./run --verbose ... # Run only specific tests. The default libvirt set looks like ./run --type libvirt --tests "unattended_install.import.import virsh_domname remove_guest.without_disk" # See all options ./run --help Autotest has useful and simple infrastructure for logging in to virtual machines and running commands in there. So for doing end to end tests like verifying hotplug succeeded or verifying snapshots actually worked it seems quite handy. It can also assemble a video based on screenshots of the guest, so you can rewatch an install failure or similar. A few misc things: - The default libvirt tests seem to work fine as non-root, though every libvirt test is marked as 'root only'. I'm not sure what the practical effect of that is. - If you interrupt the tests, you'll have to destroy and undefine the 'autotest-vm1' VM, or next run will fail. If the test suite completes, it will clean up after itself. All this should be fixed. - There are migration tests for libvirt, but I haven't looked at them. - All the tests run against system installed libvirt. You can probably get around this by sticking /path/to/libvirt.git/tools in PATH, but some tests want to restart libvirtd so it isn't that simple. - Running the tests creates ~/virt_test and moves the F17 image there. If you move other media there they can be used for various install tests. You can override this with VIRT_TEST_DATA_DIR or ./run --data-dir, but IMO there should be a ~/.autotestconfig or something. - qemu also has a basic set of smoke tests that test migration, no extra config required. A custom qemu binary can be used with ./run --qemu-bin. Probably useful even for libvirt devs that are tracking upstream qemu, if you suspect qemu.git may be currently be broken. The virt-test wiki also has much more useful info: https://github.com/autotest/virt-test/wiki Thanks, Cole

2 1

[libvirt] [PATCH] qemu: fix an off-by-one error in qemuDomainGetPercpuStats
by Guannan Ren 21 Feb '13

21 Feb '13

The max value of number of cpus to compute(id) should not be equal or greater than max cpu number. The bug ocurrs when id value is equal to max cpu number which leads to the off-by-one error in the following for loop. # virsh cpu-stats guest --start 1 error: Failed to virDomainGetCPUStats() error: internal error cpuacct parse error --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc35b91..54a6d35 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14259,9 +14259,9 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, param_idx = 0; /* number of cpus to compute */ - id = max_id; - - if (max_id - start_cpu > ncpus - 1) + if ((start_cpu + ncpus) >= max_id) + id = max_id - 1; + else id = start_cpu + ncpus - 1; for (i = 0; i <= id; i++) { -- 1.7.11.2

2 2

[libvirt] [PATCH] qemu: Fix the memory leak
by Osier Yang 21 Feb '13

21 Feb '13

Found by John Ferlan (coverity script) --- Assuming an ACK from John, and it's trivial, so pushed --- src/qemu/qemu_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 8299b79..33fd67d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1042,6 +1042,7 @@ qemuAddSharedDisk(virQEMUDriverPtr driver, if ((VIR_ALLOC(entry) < 0) || (VIR_ALLOC_N(entry->domains, 1) < 0) || !(entry->domains[0] = strdup(name))) { + qemuSharedDiskEntryFree(entry, NULL); virReportOOMError(); goto cleanup; } -- 1.7.7.6

1 0

[libvirt] [PATCH] keepalive: Guard against integer overflow
by John Ferlan 20 Feb '13

20 Feb '13

Don't allow interval to be > MAX_INT/1000 in virKeepAliveStart() Guard against possible overflow in virKeepAliveTimeout() by setting the timeout to be MAX_INT/1000 since the math following will multiply it by 1000. This is a follow-up of sorts from a Coverity change made last month: https://www.redhat.com/archives/libvir-list/2013-January/msg02267.html where it was noted that the timeout value math needed overflow protection. --- src/rpc/virkeepalive.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index d1fa642..6d69559 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -252,6 +252,12 @@ virKeepAliveStart(virKeepAlivePtr ka, _("keepalive interval already set")); goto cleanup; } + /* Guard against overflow */ + if (interval > INT_MAX / 1000) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("keepalive interval too large")); + goto cleanup; + } ka->interval = interval; ka->count = count; ka->countToDeath = count; @@ -323,6 +329,9 @@ virKeepAliveTimeout(virKeepAlivePtr ka) timeout = ka->interval - (time(NULL) - ka->intervalStart); if (timeout < 0) timeout = 0; + /* Guard against overflow */ + if (timeout > INT_MAX / 1000) + timeout = INT_MAX / 1000; } virObjectUnlock(ka); -- 1.7.11.7

2 3

[libvirt] [PATCH] libxl: Fix setting of disk backend
by Jim Fehlig 20 Feb '13

20 Feb '13

The libxl driver was setting the backend field of libxl_device_disk structure to LIBXL_DISK_BACKEND_TAP when the driver element of disk configuration was not specified. This needlessly forces the use of blktap driver, which may not be loaded in dom0 https://bugzilla.redhat.com/show_bug.cgi?id=912488 Ian Campbell suggested that LIBXL_DISK_BACKEND_UNKNOWN is a better default in this case https://www.redhat.com/archives/libvir-list/2013-February/msg01126.html --- src/libxl/libxl_conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 43fb8b1..4ce5dec 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -525,9 +525,13 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) return -1; } } else { - /* No driverName - default to raw/tap?? */ + /* + * If driverName is not specified, default to raw as per + * xl-disk-configuration.txt in the xen documentation and let + * libxl pick a suitable backend. + */ x_disk->format = LIBXL_DISK_FORMAT_RAW; - x_disk->backend = LIBXL_DISK_BACKEND_TAP; + x_disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } /* XXX is this right? */ -- 1.8.0.1

2 2

[libvirt] [PATCH] Remove a couple of misplaced VIR_FREE
by John Ferlan 20 Feb '13

20 Feb '13

While working on the hellolibvirt example code, I stumbled across a couple extraneous VIR_FREE()'s in qemuStop(). I was looking at all callers of virConnectListAllDomains()... --- src/qemu/qemu_driver.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be01ec6..45bd341 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -920,9 +920,6 @@ qemuStop(void) { if (virDomainManagedSave(domains[i], flags[i]) < 0) ret = -1; - VIR_FREE(domains); - VIR_FREE(flags); - cleanup: for (i = 0 ; i < numDomains ; i++) virDomainFree(domains[i]); -- 1.7.11.7

2 2

[libvirt] libvirt-libxl driver defaulting to tap disk and not working (on Fedora 18 and rawhide)
by Dario Faggioli 20 Feb '13

20 Feb '13

Hi Jim, Everyone, I'm having some issues when trying out libvirt-libxl driver on my Fedora, bot on Fedora 18 and Fedorra rawhide (the former seems to be running 0.10.2.3, the later 1.0.2). Here's what happen: [root@localhost ~]# systemctl status xend.service xend.service - Xend - interface between hypervisor and some applications Loaded: loaded (/usr/lib/systemd/system/xend.service; disabled) Active: inactive (dead) [root@localhost ~]# virt-install -l http://fedora.mirror.constant.com/linux/releases/18/Fedora/x86_64/os/ --ram 1024 --disk /dev/vms/F18_x64 --name F18_x64 Starting install... Retrieving file .treeinfo... | 2.2 kB 00:00 !!! Retrieving file vmlinuz... | 9.3 MB 00:06 !!! Retrieving file initrd.img... | 53 MB 00:33 !!! ERROR internal error libxenlight failed to create new domain 'F18_x64' Domain installation does not appear to have been successful. If it was, you can restart your domain by running: virsh --connect xen:/// start F18_x64 otherwise, please restart your installation. [root@localhost ~]# cat /var/log/libvirt/libxl/libxl.log ... libxl: verbose: libxl_create.c:158:libxl__domain_build_info_setdefault: qemu-xen is unavailable, use qemu-xen-traditional instead: No such file or directory libxl: debug: libxl_create.c:1174:do_domain_create: ao 0x7f566c008d90: create: how=(nil) callback=(nil) poller=0x7f566c009030 libxl: debug: libxl_device.c:229:libxl__device_disk_set_backend: Disk vdev=xvda spec.backend=tap libxl: debug: libxl_device.c:184:disk_try_backend: Disk vdev=xvda, backend tap unsuitable because blktap not available libxl: error: libxl_device.c:269:libxl__device_disk_set_backend: no suitable backend for disk xvda libxl: debug: libxl_event.c:1499:libxl__ao_complete: ao 0x7f566c008d90: complete, rc=-3 libxl: debug: libxl_create.c:1187:do_domain_create: ao 0x7f566c008d90: inprogress: poller=0x7f566c009030, flags=ic libxl: debug: libxl_event.c:1471:libxl__ao__destroy: ao 0x7f566c008d90: destroy So, it looks like it tries to use blktap, even if I'm using an LVM volume, and fails. If I go for this: [root@localhost ~]# virt-install -l http://fedora.mirror.constant.com/linux/releases/18/Fedora/x86_64/os/ --ram 1024 --disk /dev/vms/F18_x64,driver_name=phy --name F18_x64 --bridge virbr0 it works, but only because (or at least so it looks to me) I'm manually providing ",driver_name=phy". Also (as it could have been expected, I guess) there is no way I can get it to work with a file backed VHD. Is all this supposed to happen? I haven't had the chance to try out the code from git yet, do you think it would make any difference? FYI, I've also opened this Fedora bugreport, about this very same issue: https://bugzilla.redhat.com/show_bug.cgi?id=912488 Thanks and Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

3 5

[libvirt] libvirt-client leaks memory, Ubuntu and Debian-specific
by Igor Lukyanov 20 Feb '13

20 Feb '13

Hello. We faced a very strange leak while using libvirt library in long-running server application for cluster orchestration. Leak does not directly related to libvirt code and exposed only on specific build options (?) and/or system environment (?). Here are the key points: 1. Libvirt client leaks memory while making (RPC) calls to a server. I mean that RSS memory usage shown by ps, top, etc. indefinitely grows (plz check an attachment ps.log). Test app attached. 2. Leak detected on Debian and Ubuntu and absent on Mac OS and Gentoo, so it's exactly an environment or build problem. 3. Valgrind does not see the leak. From valgrind's point of view from start to finish application constantly consumes 110kb of memory (while ps shows multiple megabytes) and does not contain any leaks. 4. Logging activity of virMalloc, virRealloc, etc. functions does not show anything: as expected, all allocated memory is correctly freed, so it's definitely not a bug of code (we tested that before recognized that problem is distrib/platform specific). Some useful logs and test code attached. I think digging build options and legoing system libraries will help us to beat the problem but it would be nice if someone already had a working solution. Thank you for help.

3 5

[libvirt] [PATCH 0/6 v3] Shared disk table related fixes/improvements
by Osier Yang 20 Feb '13

20 Feb '13

Inspires by the crash when using CD-ROM or Floppy with empty source, except the fixes for the crashes, this also enrichs the hash table with a list of names of domain which use the shared disk. And to keep the hash table to be in consistent state, this also fixes the problems on adding/removing the hash entry when updateing/ejecting media of CD-ROM or Floppy. And updates the hash table when reconnecting domain process. v2 - v3: * Rebase on the top * Small changes after more testing. Osier Yang (6): qemu: Add checking in helpers for sgio setting qemu: Merge qemuCheckSharedDisk into qemuAddSharedDisk qemu: Record names of domain which uses the shared disk in hash table qemu: Update shared disk table when reconnecting qemu process qemu: Move the shared disk adding and sgio setting prior to attaching qemu: Remove the shared disk entry if the operation is ejecting or updating src/conf/domain_conf.c | 20 ++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_conf.c | 243 ++++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_conf.h | 26 ++++- src/qemu/qemu_driver.c | 108 ++++++++++++++++----- src/qemu/qemu_hotplug.c | 19 +---- src/qemu/qemu_hotplug.h | 1 + src/qemu/qemu_process.c | 81 ++++------------ src/qemu/qemu_process.h | 3 - 10 files changed, 377 insertions(+), 128 deletions(-) -- 1.7.7.6

3 19

[libvirt] [PATCH] maint: enforce private symbol section sorting
by Eric Blake 20 Feb '13

20 Feb '13

Automating a sorting check is the only way to ensure we don't regress. Suggested by Dan Berrange. * src/check-symsorting.pl (check_sorting): Add a parameter, validate that groups are in order, and that files exist. * src/Makefile.am (check-symsorting): Adjust caller. * src/libvirt_private.syms: Fix typo. * src/libvirt_linux.syms: Fix file name. * src/libvirt_vmx.syms: Likewise. * src/libvirt_xenxs.syms: Likewise. * src/libvirt_sasl.syms: Likewise. * src/libvirt_libssh2.syms: Likewise. * src/libvirt_esx.syms: Mention file name. * src/libvirt_openvz.syms: Likewise. --- While I can manage in perl, I probably don't have the best usage patterns; suggestions for improving this patch are quite welcome. src/Makefile.am | 3 ++- src/check-symsorting.pl | 35 +++++++++++++++++++++++++++++------ src/libvirt_esx.syms | 1 + src/libvirt_libssh2.syms | 3 +-- src/libvirt_linux.syms | 2 +- src/libvirt_openvz.syms | 2 ++ src/libvirt_private.syms | 2 +- src/libvirt_sasl.syms | 8 ++++---- src/libvirt_vmx.syms | 2 +- src/libvirt_xenxs.syms | 4 ++-- 10 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 780cd52..3ef9a9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -388,7 +388,8 @@ else check-symfile: endif check-symsorting: - $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl $(USED_SYM_FILES) + $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ + $(srcdir) $(USED_SYM_FILES) EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ diff --git a/src/check-symsorting.pl b/src/check-symsorting.pl index 9c62246..cbcb737 100755 --- a/src/check-symsorting.pl +++ b/src/check-symsorting.pl @@ -3,22 +3,27 @@ use strict; use warnings; -die "syntax: $0 SYMFILE..." unless int(@ARGV) >= 1; +die "syntax: $0 SRCDIR SYMFILE..." unless int(@ARGV) >= 2; my $ret = 0; +my $srcdir = shift; +my $lastgroup = undef; foreach my $symfile (@ARGV) { open SYMFILE, $symfile or die "cannot read $symfile: $!"; my $line; + my $groupfile; my @group; while (<SYMFILE>) { chomp; - next if /^#/; - if (/^\s*$/) { + if (/^#/) { + $_ =~ s/^# //; + $groupfile = $_; + } elsif (/^\s*$/) { if (@group) { - &check_sorting(\@group, $symfile, $line); + &check_sorting(\@group, $symfile, $line, $groupfile); } @group = (); $line = $.; @@ -30,20 +35,38 @@ foreach my $symfile (@ARGV) { close SYMFILE; if (@group) { - &check_sorting(\@group, $symfile, $line); + &check_sorting(\@group, $symfile, $line, $groupfile); } + $lastgroup = undef; } sub check_sorting { my $group = shift; my $symfile = shift; my $line = shift; + my $groupfile = shift; my @group = @{$group}; my @sorted = sort { lc $a cmp lc $b } @group; my $sorted = 1; my $first; my $last; + + # Check that groups are in order and groupfile exists + if (defined $lastgroup && lc $lastgroup ge lc $groupfile) { + print "Symbol block at $symfile:$line: block not sorted\n"; + print "Move $groupfile block before $lastgroup block\n"; + print "\n"; + $ret = 1; + } + if (! -e "$srcdir/$groupfile") { + print "Symbol block at $symfile:$line: $groupfile not found\n"; + print "\n"; + $ret = 1; + } + $lastgroup = $groupfile; + + # Check that symbols within a group are in order for (my $i = 0 ; $i <= $#sorted ; $i++) { if ($sorted[$i] ne $group[$i]) { $first = $i unless defined $first; @@ -54,7 +77,7 @@ sub check_sorting { if (!$sorted) { @group = splice @group, $first, ($last-$first+1); @sorted = splice @sorted, $first, ($last-$first+1); - print "Symbol block at $symfile:$line symbols not sorted\n"; + print "Symbol block at $symfile:$line: symbols not sorted\n"; print map { " " . $_ . "\n" } @group; print "Correct ordering\n"; print map { " " . $_ . "\n" } @sorted; diff --git a/src/libvirt_esx.syms b/src/libvirt_esx.syms index ad3d60a..3c14b94 100644 --- a/src/libvirt_esx.syms +++ b/src/libvirt_esx.syms @@ -2,6 +2,7 @@ # These symbols are dependent upon --with-esx via WITH_ESX # +# esx/esx_util.h esxUtil_EscapeDatastoreItem; esxUtil_ParseDatastorePath; esxVI_DateTime_ConvertToCalendarTime; diff --git a/src/libvirt_libssh2.syms b/src/libvirt_libssh2.syms index 815195b..55022b5 100644 --- a/src/libvirt_libssh2.syms +++ b/src/libvirt_libssh2.syms @@ -2,8 +2,7 @@ # ssh session - specific symbols # -# virnetsshsession.h -# +# rpc/virnetsshsession.h virNetSSHChannelRead; virNetSSHChannelWrite; virNetSSHSessionAuthAddAgentAuth; diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index b5f7ee2..3500898 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -5,7 +5,7 @@ # nodeinfo.h linuxNodeInfoCPUPopulate; -# stats_linux.h +# util/virstatslinux.h linuxDomainInterfaceStats; # Let emacs know we want case-insensitive sorting diff --git a/src/libvirt_openvz.syms b/src/libvirt_openvz.syms index 58b93ae..ac0ed0d 100644 --- a/src/libvirt_openvz.syms +++ b/src/libvirt_openvz.syms @@ -1,6 +1,8 @@ # # These symbols are dependent upon --with-openvz via WITH_OPENVZ # + +# openvz/openvz_conf.h openvzLocateConfFile; openvzReadConfigParam; openvzReadNetworkConf; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1686bb8..3c44cc3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -420,7 +420,7 @@ virNetDevVlanFormat; virNetDevVlanParse; -# conf/netdev_vportprofile_conf.h +# conf/netdev_vport_profile_conf.h virNetDevVPortProfileFormat; virNetDevVPortProfileParse; virNetDevVPortTypeFromString; diff --git a/src/libvirt_sasl.syms b/src/libvirt_sasl.syms index 099f48a..beb8825 100644 --- a/src/libvirt_sasl.syms +++ b/src/libvirt_sasl.syms @@ -2,10 +2,10 @@ # SASL-specific symbols # -# virnetclient.h +# rpc/virnetclient.h virNetClientSetSASLSession; -# virnetsaslcontext.h +# rpc/virnetsaslcontext.h virNetSASLContextCheckIdentity; virNetSASLContextNewClient; virNetSASLContextNewServer; @@ -25,11 +25,11 @@ virNetSASLSessionServerStart; virNetSASLSessionServerStep; -# virnetserverclient.h +# rpc/virnetserverclient.h virNetServerClientSetSASLSession; -# virnetsocket.h +# rpc/virnetsocket.h virNetSocketSetSASLSession; # Let emacs know we want case-insensitive sorting diff --git a/src/libvirt_vmx.syms b/src/libvirt_vmx.syms index 99fe590..0b15f49 100644 --- a/src/libvirt_vmx.syms +++ b/src/libvirt_vmx.syms @@ -2,7 +2,7 @@ # These symbols are dependent upon --with-esx via WITH_ESX or --with-vmware via WITH_VMWARE. # -# vmx.h +# vmx/vmx.h virVMXConvertToUTF8; virVMXEscapeHex; virVMXFormatCDROM; diff --git a/src/libvirt_xenxs.syms b/src/libvirt_xenxs.syms index 75d5322..04b35c4 100644 --- a/src/libvirt_xenxs.syms +++ b/src/libvirt_xenxs.syms @@ -2,7 +2,7 @@ # These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL. # -# xen_sxpr.h +# xenxs/xen_sxpr.h xenFormatSxpr; xenFormatSxprChr; xenFormatSxprDisk; @@ -16,7 +16,7 @@ xenParseSxprChar; xenParseSxprSound; xenParseSxprString; -# xen_xm.h +# xenxs/xen_xm.h xenFormatXM; xenParseXM; -- 1.8.1.2

2 2

[libvirt] [PATCH] qemu: Do not ignore mandatory features in migration cookie
by Jiri Denemark 20 Feb '13

20 Feb '13

Due to "feature"/"features" nasty typo, any features marked as mandatory by one side of a migration are silently considered optional by the other side. The following is the code that formats mandatory features in migration cookie: for (i = 0 ; i < QEMU_MIGRATION_COOKIE_FLAG_LAST ; i++) { if (mig->flagsMandatory & (1 << i)) virBufferAsprintf(buf, " <feature name='%s'/>\n", qemuMigrationCookieFlagTypeToString(i)); } --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 82c3f97..17c1714 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -863,7 +863,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, /* Check to ensure all mandatory features from XML are also * present in 'flags' */ - if ((n = virXPathNodeSet("./features", ctxt, &nodes)) < 0) + if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) < 0) goto error; for (i = 0 ; i < n ; i++) { -- 1.8.1.2

2 2

[libvirt] [PATCH v2] qemu: Run lzop with '--ignore-warn'
by Michal Privoznik 20 Feb '13

20 Feb '13

Currently, if lzop decompression binary produces a warning, it doesn't exit with zero status but 2 instead. Terrifying, but true. However, warnings may be ignored using '--ignore-warn' command line argument. Moreover, in which case, the exit status will be zero. --- src/qemu/qemu_driver.c | 62 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc35b91..a0a1f04 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2507,6 +2507,34 @@ qemuCompressProgramName(int compress) qemuSaveCompressionTypeToString(compress)); } +static virCommandPtr +qemuCompressGetCommand(virQEMUSaveFormat compression) +{ + virCommandPtr ret = NULL; + const char *prog = qemuSaveCompressionTypeToString(compression); + + if (!prog) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid compressed save format %d"), + compression); + return NULL; + } + + ret = virCommandNew(prog); + virCommandAddArg(ret, "-dc"); + + switch (compression) { + case QEMU_SAVE_FORMAT_LZOP: + virCommandAddArg(ret, "--ignore-warn"); + break; + default: + /* Ain't no valid compressed save format */ + break; + } + + return ret; +} + /* Internal function to properly create or open existing files, with * ownership affected by qemu driver setup. */ static int @@ -4775,32 +4803,22 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (header->version == 2) { - const char *prog = qemuSaveCompressionTypeToString(header->compressed); - if (prog == NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Invalid compressed save format %d"), - header->compressed); + if ((header->version == 2) && + (header->compressed != QEMU_SAVE_FORMAT_RAW)) { + if (!(cmd = qemuCompressGetCommand(header->compressed))) goto cleanup; - } - if (header->compressed != QEMU_SAVE_FORMAT_RAW) { - cmd = virCommandNewArgList(prog, "-dc", NULL); - intermediatefd = *fd; - *fd = -1; + intermediatefd = *fd; + *fd = -1; - virCommandSetInputFD(cmd, intermediatefd); - virCommandSetOutputFD(cmd, fd); - virCommandSetErrorBuffer(cmd, &errbuf); - virCommandDoAsyncIO(cmd); + virCommandSetInputFD(cmd, intermediatefd); + virCommandSetOutputFD(cmd, fd); + virCommandSetErrorBuffer(cmd, &errbuf); + virCommandDoAsyncIO(cmd); - if (virCommandRunAsync(cmd, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to start decompression binary %s"), - prog); - *fd = intermediatefd; - goto cleanup; - } + if (virCommandRunAsync(cmd, NULL) < 0) { + *fd = intermediatefd; + goto cleanup; } } -- 1.8.1.2

2 1

[libvirt] [PATCH v3 RESEND 00/12] Rework storage migration
by Michal Privoznik 20 Feb '13

20 Feb '13

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk target='vda' size='15032385536'/> <disk target='vdb' size='11534336'/> <disk target='vdc' size='13631488'/> </nbd> The source is telling the destination it supports the NBD feature. Moreover, which disks are to be transferred and what are their sizes. That's because disks needs to be fully allocated (even qcow) for successful transfer. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='5901'/> The destination is confirming it does support NBD as well. All disks were pre-created and NBD server is listening on given port (5901 in this case). If either src or dst doesn't support NBD, it is not used and whole process falls back to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to v2.1: -nbd cookie reworked -don't rely on disk ordering in the cookie, but use disk target for that -adapt to virPortAllocator -unlink pre-created storage on migration fail -other of Jirka's suggestions worked in "diff" to v3: -just rebase & adapt to new qemu code after dropping QDL (Qemu Driver Lock) Michal Privoznik (12): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer() qemu_migration: Introduce qemuMigrationDriveMirror qemu_domain: Introduce qemuDomainGetDiskBlockInfo qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase qemu_migration: Cancel running jobs on failed migration qemu_migration: Unlink pre-created storage on error src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 157 ++++++++- src/qemu/qemu_domain.h | 7 + src/qemu/qemu_driver.c | 124 +------ src/qemu/qemu_migration.c | 767 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 63 ++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 102 ++++++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 13 + 11 files changed, 1116 insertions(+), 136 deletions(-) -- 1.8.0.2

2 25

[libvirt] [PATCHv2] qemu: enable direct migration over IPv6
by Ján Tomko 20 Feb '13

20 Feb '13

Use virURIParse in qemuMigrationPrepareDirect to allow parsing IPv6 addresses, which would cause an 'incorrect :port' error message before. To be able to migrate over IPv6, QEMU needs to listen on [::] instead of 0.0.0.0. This patch adds a call to getaddrinfo and sets the listen address based on the result. This will break migration if a hostname that can only be resolved on the source machine is passed in the migration URI, or if it does not resolve to the same address family on both sides. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=846013 --- Diff to V1: * initialize uri_str * reuse STRSKIP("tcp:") result instead of doing strlen on it * print a warning instead of failing when the hostname can't be resolved src/qemu/qemu_migration.c | 64 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 36e55d2..62e9260 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -22,7 +22,10 @@ #include <config.h> +#include <netdb.h> +#include <sys/socket.h> #include <sys/time.h> +#include <sys/types.h> #ifdef WITH_GNUTLS # include <gnutls/gnutls.h> # include <gnutls/x509.h> @@ -1836,7 +1839,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, char *hostname = NULL; char migrateFrom [64]; const char *p; + char *uri_str = NULL; int ret = -1; + bool ipv6 = false; + struct addrinfo *info; + virURIPtr uri; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -1885,16 +1892,39 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * URI when passing it to the qemu monitor, so bad * characters in hostname part don't matter. */ - if (!STRPREFIX(uri_in, "tcp:")) { + if (!(p = STRSKIP(uri_in, "tcp:"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("only tcp URIs are supported for KVM/QEMU" " migrations")); goto cleanup; } - /* Get the port number. */ - p = strrchr(uri_in, ':'); - if (p == strchr(uri_in, ':')) { + /* Convert uri_in to well-formed URI with // after tcp: */ + if (!(STRPREFIX(uri_in, "tcp://"))) { + if (virAsprintf(&uri_str, "tcp://%s", p) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + uri = virURIParse(uri_str ? uri_str : uri_in); + VIR_FREE(uri_str); + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("missing host in migration" + " URI: %s"), uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { /* Generate a port */ this_port = QEMUD_MIGRATION_FIRST_PORT + port++; if (port == QEMUD_MIGRATION_NUM_PORTS) @@ -1907,21 +1937,29 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, } } else { - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber(&p); - if (this_port == -1 || p-uri_in != strlen(uri_in)) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("URI ended with incorrect ':port'")); - goto cleanup; - } + this_port = uri->port; } } + if (getaddrinfo(hostname, NULL, NULL, &info)) { + VIR_WARN("unable to get address info for %s, defaulting to IPv4", + hostname); + } else { + ipv6 = info->ai_family == AF_INET6; + } + if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); - /* QEMU will be started with -incoming tcp:0.0.0.0:port */ - snprintf(migrateFrom, sizeof(migrateFrom), "tcp:0.0.0.0:%d", this_port); + /* QEMU will be started with -incoming tcp:0.0.0.0:port + * or -incoming tcp:[::]:port for IPv6 */ + if (ipv6) { + snprintf(migrateFrom, sizeof(migrateFrom), + "tcp:[::]:%d", this_port); + } else { + snprintf(migrateFrom, sizeof(migrateFrom), + "tcp:0.0.0.0:%d", this_port); + } ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, -- 1.7.12.4

2 3

[libvirt] [PATCH v2 RESEND 0/2] cgroup refactor
by Hu Tao 20 Feb '13

20 Feb '13

This series is for early review. This series refactors cgroup code to: - provide lazy creation of cgroup directories, despite of what level they are. - remove cgroup directories if no one is using the corresponding virCgroup. changes from v2: - rebase to latest tree. - squash patches 2-5 in v2 into one. Hu Tao (2): refactor virCgroupDetectMounts and virCgroupDetectPlacement cgroup: refactor virCgroup src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 7 +- src/lxc/lxc_cgroup.c | 40 +- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_controller.c | 31 +- src/lxc/lxc_driver.c | 177 +++---- src/lxc/lxc_process.c | 19 +- src/qemu/qemu_cgroup.c | 162 +++--- src/qemu/qemu_cgroup.h | 3 +- src/qemu/qemu_driver.c | 350 +++++-------- src/qemu/qemu_hotplug.c | 21 +- src/qemu/qemu_migration.c | 20 +- src/qemu/qemu_process.c | 7 +- src/util/vircgroup.c | 1263 +++++++++++++++++++++------------------------ src/util/vircgroup.h | 19 +- 15 files changed, 920 insertions(+), 1206 deletions(-) -- 1.8.0.1.240.ge8a1f5a

1 3

[libvirt] [PATCH] virsh: distinguish errors between missing argument and wrong option
by Guannan Ren 20 Feb '13

20 Feb '13

Specifying ':' to suppress the error messages printed by getopt(). Then, distinguish the two types of errors. Before: virsh: option requires an argument -- 'c' error: unsupported option '-?'. See --help. After: error: option '-c' requires an argument error: unsupported option '-x'. See --help. --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f5a01b3..c0e62eb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2919,7 +2919,7 @@ 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, NULL)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { @@ -2973,8 +2973,14 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) exit(EXIT_FAILURE); } break; + case ':': + vshError(ctl, _("option '-%c' requires an argument"), optopt); + exit(EXIT_FAILURE); + case '?': + vshError(ctl, _("unsupported option '-%c'. See --help."), optopt); + exit(EXIT_FAILURE); default: - vshError(ctl, _("unsupported option '-%c'. See --help."), arg); + vshError(ctl, _("unknown option")); exit(EXIT_FAILURE); } } -- 1.7.11.2

2 3

[libvirt] [PATCH 0/2] re-sort libvirt_private.syms
by Eric Blake 19 Feb '13

19 Feb '13

After Dan's recent round of file renames, our symbols file was not up-to-date. This fixes it. It looks big, but the second patch is mechanical (took me about 2 minutes); most of my time was spent on the first patch getting ready for the sort. Eric Blake (2): maint: fix header file owners of private symbols maint: sort private syms to reflect recent header renames src/libvirt_private.syms | 2046 +++++++++++++++++++++++----------------------- 1 file changed, 1025 insertions(+), 1021 deletions(-) -- 1.8.1.2

2 4

[libvirt] [PATCH v5 0/3] net: support set source address(es) and ports for NAT
by Natanael Copa 19 Feb '13

19 Feb '13

Fixes the commented nitpicks[1]. I also provide an optional 3rd patch, that uses structs for address and port ranges. There was a struct for DHCP address range that could be used after a rename. I put the structs in virsocketaddr.h so they are accessible from util/viriptables. I don't think it is worth its own headerfile and sockaddr was what I thought was most relevant. Skip the third patch if unsure. Please CC me as i don't subscribe to the list. Changes v5: - Remove unused "longdef" leftover from rebase - UseCamelCaseVariableNames - Use virAsprintf instead of snprintf and avoid strings on stack - Add an optional 3rd patch that uses structs for addr and port ranges. Natanael Copa (3): net: support set public ip range for forward mode nat net: add support for specifying port range for forward mode nat net: use structs for address and port ranges docs/formatnetwork.html.in | 33 +++++++ src/conf/network_conf.c | 206 +++++++++++++++++++++++++++++++++++++++++--- src/conf/network_conf.h | 13 ++- src/network/bridge_driver.c | 16 ++++ src/util/viriptables.c | 83 ++++++++++++++++-- src/util/viriptables.h | 4 + src/util/virsocketaddr.h | 14 +++ 7 files changed, 341 insertions(+), 28 deletions(-) [1] http://www.redhat.com/archives/libvir-list/2013-February/msg00817.html -- 1.8.1.3

2 6

[libvirt] Online resize of virtio-blk device does not emit udev event
by Milos Vyletel 19 Feb '13

19 Feb '13

Hi, I hope this is the right list to ask. If not please tell me what will be more appropriate place to ask this question. I'm doing some work with online resizing of guest's block device on LVM. What I do is call lvresize to expand logical volume itself and virsh blockresize to notify guest about this change. Besides the fact that I needed to patch kernel to get this working on mounted partitions(BZ 906050) everything works just fine. Now that I've had this part successfully tested I wanted to make a script that will be triggered by udev whenever particular device is changed. I assumed that after capacity change virtio_blk driver would emit udev event but that's not the case. I'm able to see one on host but not on guest. [root@host ~]# lvresize -f -L +100M /dev/vgguests/evd2 && \ > virsh blockresize resize vdb 1 Rounding size to boundary between physical extents: 128.00 MiB Extending logical volume evd2 to 15.00 GiB Logical volume evd2 successfully resized Block device 'vdb' is resized [root@host ~]# udevadm monitor ... KERNEL[1361292279.619233] change /devices/virtual/block/dm-9 (block) UDEV [1361292279.736012] change /devices/virtual/block/dm-9 (block) ... I was looking at the virtblk_config_changed_work function in RHEL6.3 kernel's drivers/block/virtio_blk.c which I believe is the function handling blockresize and it does not look like it tries to emit any kobject uevent. Before I jump into patching kernel my question is whether it makes sense to have such uevent? I surely can use a way how to detect capacity change from userspace. Thanks, Milos

2 2

[libvirt] [PATCH] qemu: Use atomic ops for driver->nactive
by Jiri Denemark 19 Feb '13

19 Feb '13

--- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_process.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index b5a3281..a6bd527 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -168,7 +168,7 @@ struct _virQEMUDriver { virCgroupPtr cgroup; /* Atomic inc/dec only */ - size_t nactive; + unsigned int nactive; /* Immutable pointers. Caller must provide locking */ virStateInhibitCallback inhibitCallback; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 74406a6..b612d72 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -69,6 +69,7 @@ #include "virtime.h" #include "virnetdevtap.h" #include "virbitmap.h" +#include "viratomic.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -3300,9 +3301,8 @@ qemuProcessReconnect(void *opaque) goto error; } - if (!driver->nactive && driver->inhibitCallback) + if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); - driver->nactive++; endjob: if (!qemuDomainObjEndJob(driver, obj)) @@ -3589,9 +3589,8 @@ int qemuProcessStart(virConnectPtr conn, qemuDomainSetFakeReboot(driver, vm, false); virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); - if (!driver->nactive && driver->inhibitCallback) + if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); - driver->nactive++; /* Run an early hook to set-up missing devices */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { @@ -4188,8 +4187,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, */ vm->def->id = -1; - driver->nactive--; - if (!driver->nactive && driver->inhibitCallback) + if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); if ((logfile = qemuDomainCreateLog(driver, vm, true)) < 0) { @@ -4443,9 +4441,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, vm->def->id = qemuDriverAllocateID(driver); - if (!driver->nactive && driver->inhibitCallback) + if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); - driver->nactive++; if (virFileMakePath(cfg->logDir) < 0) { virReportSystemError(errno, -- 1.8.1.2

3 4

[libvirt] [PATCH] rpc: Avoid deadlock when closing client connection
by Jiri Denemark 19 Feb '13

19 Feb '13

We need to drop the server lock before calling virObjectUnlock(client) since in case we had the last reference to the client, its dispose callback would be called and that could possibly try to lock the server and cause a deadlock. This is exactly what happens when there is only one QEMU domain running and it is marked to be autodestroyed when the connection dies. This results in qemuProcessAutoDestroy -> qemuProcessStop -> virNetServerRemoveShutdownInhibition call sequence, where the last function locks the server. --- src/rpc/virnetserver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 95333d0..e536cc3 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1120,7 +1120,7 @@ void virNetServerRun(virNetServerPtr srv) if (virNetServerClientWantClose(srv->clients[i])) virNetServerClientClose(srv->clients[i]); if (virNetServerClientIsClosed(srv->clients[i])) { - virObjectUnref(srv->clients[i]); + virNetServerClientPtr client = srv->clients[i]; if (srv->nclients > 1) { memmove(srv->clients + i, srv->clients + i + 1, @@ -1131,6 +1131,10 @@ void virNetServerRun(virNetServerPtr srv) srv->nclients = 0; } + virObjectUnlock(srv); + virObjectUnref(client); + virObjectLock(srv); + goto reprocess; } } -- 1.8.1.2

2 2

[libvirt] [PATCH] Avoid resetting errors in virTypedParamsFree
by Jiri Denemark 19 Feb '13

19 Feb '13

The function does not report any errors so there should be no need too reset an existing error first. Moreover, virTypedParamsFree is mostly called in cleanup phase where it has the potential to reset any useful reported earlier. --- src/util/virtypedparam.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index ae2855a..c196321 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -1026,7 +1026,6 @@ void virTypedParamsFree(virTypedParameterPtr params, int nparams) { - virResetLastError(); virTypedParamsClear(params, nparams); VIR_FREE(params); } -- 1.8.1.2

2 2

[libvirt] [PATCH] virsh: Always print capacity unit
by Jiri Denemark 19 Feb '13

19 Feb '13

It doesn't make sense to print the unit (B) only with Ki, Mi, ... prefixes. Even those poor bytes under 1 KiB are still bytes :-) --- tools/virsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index f5a01b3..d64e539 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -148,7 +148,7 @@ double vshPrettyCapacity(unsigned long long val, const char **unit) { if (val < 1024) { - *unit = ""; + *unit = "B"; return (double)val; } else if (val < (1024.0l * 1024.0l)) { *unit = "KiB"; -- 1.8.1.2

2 2

[libvirt] [PATCH] qemu: Run lzop with '--ignore-warn'
by Michal Privoznik 19 Feb '13

19 Feb '13

Currently, if lzop decompression binary produces a warning, it doesn't exit with zero status but 2 instead. Terrifying, but true. However, warnings may be ignored using '--ignore-warn' command line argument. Moreover, in which case, the exit status will be zero. --- src/qemu/qemu_driver.c | 68 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc35b91..41c6168 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2507,6 +2507,36 @@ qemuCompressProgramName(int compress) qemuSaveCompressionTypeToString(compress)); } +static virCommandPtr +qemuCompressGetCommand(virQEMUSaveFormat compression) +{ + virCommandPtr ret = NULL; + const char *prog = qemuSaveCompressionTypeToString(compression); + + if (!prog) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid compressed save format %d"), + compression); + return NULL; + } + + if (!(ret = virCommandNew(prog))) { + virReportOOMError(); + return NULL; + } + + switch (compression) { + case QEMU_SAVE_FORMAT_LZOP: + virCommandAddArg(ret, "--ignore-warn"); + break; + default: + /* Don't add nothing for now */ + break; + } + + return ret; +} + /* Internal function to properly create or open existing files, with * ownership affected by qemu driver setup. */ static int @@ -4775,32 +4805,26 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (header->version == 2) { - const char *prog = qemuSaveCompressionTypeToString(header->compressed); - if (prog == NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Invalid compressed save format %d"), - header->compressed); + if ((header->version == 2) && + (header->compressed != QEMU_SAVE_FORMAT_RAW)) { + if (!(cmd = qemuCompressGetCommand(header->compressed))) goto cleanup; - } - if (header->compressed != QEMU_SAVE_FORMAT_RAW) { - cmd = virCommandNewArgList(prog, "-dc", NULL); - intermediatefd = *fd; - *fd = -1; + intermediatefd = *fd; + *fd = -1; - virCommandSetInputFD(cmd, intermediatefd); - virCommandSetOutputFD(cmd, fd); - virCommandSetErrorBuffer(cmd, &errbuf); - virCommandDoAsyncIO(cmd); + virCommandAddArg(cmd, "-dc"); + virCommandSetInputFD(cmd, intermediatefd); + virCommandSetOutputFD(cmd, fd); + virCommandSetErrorBuffer(cmd, &errbuf); + virCommandDoAsyncIO(cmd); - if (virCommandRunAsync(cmd, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to start decompression binary %s"), - prog); - *fd = intermediatefd; - goto cleanup; - } + if (virCommandRunAsync(cmd, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to start decompression binary %s"), + qemuCompressProgramName(header->compressed)); + *fd = intermediatefd; + goto cleanup; } } -- 1.8.1.2

2 1

[libvirt] [PATCH 0/4] Finish QEMU locking refactoring
by Daniel P. Berrange 19 Feb '13

19 Feb '13

This is the last set of patches for the QEMU driver locking refactor. The interesting one here is the last patch which actually deletes the QEMU driver lock usage from almost everywhere, except a few helper APIs in qemu_conf.c And there was much rejoicing (and hopefully no race conditions and crashes) across the world ;-P

4 11

[libvirt] libvirt support for LXC
by Kunal Kushwaha 19 Feb '13

19 Feb '13

Hi, I am new to this community and am not much aware of current status libvirt work for LXC. Currently I am evaluating LXC with libvirt. and I found still many features like checkpoint/restore/live migration , Attach storage device etc are not implemented. Is there any work going on these feature? or any plan or Roadmap? Following is a table showing libvirt functionality support for LXC. Please feel free to comment in case, I am wrong or tested not propely the libvirt and marked some working feature as not working for LXC. Sr. No. Command Name Description (brief) Status (working or not) 01 autostart Enable and disable the automatic starting of a guest domain when the libvirt daemon starts. ₒ 02 Console connect to the virtual serial console for the guest. ₒ 03 create creates a guest domain from an xml file # does not work. gives error. - 04 Define defines but doesnt start a guest domain from an xml file ○ 05 destroy immediately terminates a running guest domain and releases any resources in use by it. Not to be used lightly ○ 06 attach-disk / detach-disk attach or detach a disk device Note : Doesnt work. maybe i am doing something wrong. - 07 domjobinfo info about running guest domain jobs - 08 domjobabort aborts current running guest domain job - 09 Dump Core dump a guest domain - 10 managedsave / managedsave-remove Save and destroy a running guest domain, so it can be restarted from the same state at a later time. When the virsh start command is next run for the guest domain, it will automatically be started from this saved state - 11 Migrate ** migrates a guest domain to another host 12 Reboot Runs a reboot in the guest domain - 13 Restore restores a guest domain - 14 Resume resumes a guest domain ○ 15 Save saves the running state of a guest domain to a file. - 16 shutdown runs shutdown in a guest domain - 17 Start starts a guest domain either form a last managedsave or via a fresh boot if no managed save is present ○ 18 Update-device update device from an XML file - 19 virt-viewer display a vnc type interface to running domain ○ 20 maxvcpus show maximum number of virtual CPUs for guest domains on this connection - 21 memtune gets or sets the current memory parameters for a guest domain ○ 22 schedinfo show or set scheduler parameters ○ 23 setmaxmem change the maximum memory allocation limit in the guest domain ○ 24 setmem change the current memory allocation in the guest domain ○ 25 setvcpus change the number of virtual cpus in the guest domain - 26 vcpuinfo returns basic info about the guest domains virtual CPU's - 27 dominfo displays some basic information about the domain specified ○ 28 dommemstat displays info about the memory statistics of the domain - 29 domblkinfo gets the block device size or a guest domain ○ 30 domblkstat gets device block stats for a running guest domain ○ 31 domifstat gets network interface stat for a running guest domain ○ 32 dominfo gets basic information about a guest domain ○ 33 dommemstat gets memory statistics for a running guest domain ○ 34 domstate returns the state of a guest domain i.e. whether running etc ○ 35 list returns a list of guest domains ○ 36 Capabilities returns the capabilities of the host and guest in xml format ○ 37 freecell Display available free memory for a NUMA cell ○ 38 hostname Display the name of the hypervisor host ○ 39 nodeinfo Returns basic information about the node ○ 40 iface-define define a physical host network interface. The file expected is of the type xml. We have an example of how it is executed. ○ 41 iface-destroy shutsdown and siables a physical host network device ○ 42 iface-dumpxml Output information for a physical host network interface, as an XML dump to stdout ○ 43 iface-list Returns a list of physical host network interfaces ○ 44 iface-start Enables and starts a physical host network interface ○ 45 iface-undefine Removes the configuration information for a physical host network interface ○ 46 net-autostart Enable or disable the automatic starting of a virtual network, when the libvirt daemon starts ○ 47 net-define Adds a new permanent virtual network from an XML file, without starting it ○ 48 net-dumpxml Displays the XML configuration for a virtual network (to stdout) ○ 49 net-edit opens the network config xml for editing by user. ○ 50 net-info displays basic information about a network ○ 51 net-start starts a network ○ 52 net-undefine undefines a network from the configuration file. ○ 53 Domain snapshot commands (multiple) Does not work with LXC. - Thanks & Regards, Kunal Kushwaha

3 4

[libvirt] [PATCHv3 0/3] S390: Finish support for native CCW bus
by Viktor Mihajlovski 19 Feb '13

19 Feb '13

Originally, QEMU did not implement a native I/O bus for s390. The initial implementation had a machine type 's390-virtio' featuring a fully paravirtualized I/O system with an artificial bus type 'virtio-s390'. This bus had a number of short-comings, like the need for a non-standard device discovery mechanism, a limited number of devices, limited hotplugging capabilites and the lack of persistent device addresses. To resolve these issues a new machine type 's390-ccw-virtio' has been recently added to QEMU which implementa the native s390 CCW I/O bus. Guests with arch='s390x' and machine='s390-ccw-virtio' can now be defined with up to 262144 virtio devices. This series adds the support for the s390-ccw-virtio machine type and the CCW bus to libvirt. V2 Changes - use an attribute triple cssid, ssid, schid instead of devno to better represent the libvirt CCW address structure - rebase to current upstream, mainly address qemuCapsXXX rename V3 Changes - skip already acked patches 1/5 and 2/5 - revert machine-based capabilities - use machine definition from domain object J.B. Joret (1): S390: Add hotplug support for s390 virtio devices Viktor Mihajlovski (2): S390: QEMU driver support for CCW addresses S390: Testcases for virtio-ccw machines src/qemu/qemu_capabilities.c | 7 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 280 ++++++++++++++++++-- src/qemu/qemu_command.h | 6 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 154 +++++++---- src/qemu/qemu_hotplug.h | 14 +- src/qemu/qemu_process.c | 3 + .../qemuxml2argv-console-virtio-ccw.args | 10 + .../qemuxml2argv-console-virtio-ccw.xml | 27 ++ .../qemuxml2argv-console-virtio-s390.args | 4 +- .../qemuxml2argv-console-virtio-s390.xml | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 12 + .../qemuxml2argv-disk-virtio-ccw-many.xml | 40 +++ .../qemuxml2argv-disk-virtio-ccw.args | 8 + .../qemuxml2argv-disk-virtio-ccw.xml | 30 +++ .../qemuxml2argv-net-virtio-ccw.args | 8 + .../qemuxml2argv-net-virtio-ccw.xml | 30 +++ tests/qemuxml2argvtest.c | 12 +- tests/testutilsqemu.c | 3 +- 22 files changed, 578 insertions(+), 83 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.xml -- 1.7.9.5

1 4

[libvirt] [test-API][PATCH v2] Add 7 memory API related cases
by Wayne Sun 19 Feb '13

19 Feb '13

v1: add 7 new cases using domain memory related API add 1 conf for domain memory testing v2: fix the file not close problem and a typo 7 new cases are: memory_params_config: test set memory params with config flag memory_params_live: test set memory params with live flag memory_peek: test memory peek memory_stats: test get memory stats set_maxmem_config: test set maximum memory with config flag set_memory_config: test set current memory with config flag set_memory_live: test set current memory with live flag memory hotplug is not supported yet, so live set max memory case is not added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/domain_memory_test.conf | 99 +++++++++++++++++++++++++++++++ repos/domain/memory_params_config.py | 96 ++++++++++++++++++++++++++++++ repos/domain/memory_params_live.py | 112 +++++++++++++++++++++++++++++++++++ repos/domain/memory_peek.py | 48 +++++++++++++++ repos/domain/memory_stats.py | 65 ++++++++++++++++++++ repos/domain/set_maxmem_config.py | 59 ++++++++++++++++++ repos/domain/set_memory_config.py | 94 +++++++++++++++++++++++++++++ repos/domain/set_memory_live.py | 86 +++++++++++++++++++++++++++ 8 files changed, 659 insertions(+) create mode 100644 cases/domain_memory_test.conf create mode 100644 repos/domain/memory_params_config.py create mode 100644 repos/domain/memory_params_live.py create mode 100644 repos/domain/memory_peek.py create mode 100644 repos/domain/memory_stats.py create mode 100644 repos/domain/set_maxmem_config.py create mode 100644 repos/domain/set_memory_config.py create mode 100644 repos/domain/set_memory_live.py diff --git a/cases/domain_memory_test.conf b/cases/domain_memory_test.conf new file mode 100644 index 0000000..90879ab --- /dev/null +++ b/cases/domain_memory_test.conf @@ -0,0 +1,99 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + macaddr + 54:52:00:4a:c1:22 + +domain:balloon_memory + guestname + $defaultname + memorypair + 1024,2048 + +domain:destroy + guestname + $defaultname + +domain:memory_params_config + guestname + $defaultname + hard_limit + 0 + soft_limit + 9007199254740991 + swap_hard_limit + -1 + +domain:set_maxmem_config + guestname + $defaultname + memory + 16777216 + +domain:set_memory_config + guestname + $defaultname + memory + 1048576 + maxmem + 4194304 + +domain:start + guestname + $defaultname + +domain:memory_stats + guestname + $defaultname + +domain:memory_peek + guestname + $defaultname + +domain:memory_params_live + guestname + $defaultname + hard_limit + 25417224 + soft_limit + 9007199254740900 + swap_hard_limit + -1 + +domain:set_memory_live + guestname + $defaultname + memory + 2097152 + username + $username + password + $password + +domain:set_memory_config + guestname + $defaultname + memory + 4194304 + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/domain/memory_params_config.py b/repos/domain/memory_params_config.py new file mode 100644 index 0000000..af9781b --- /dev/null +++ b/repos/domain/memory_params_config.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_CONFIG + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 + +def get_memory_config(domobj, param_dict): + """get domain config memory parameters + """ + new_dict = {} + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + logger.info("get domain memory parameters in config xml") + for i in param_dict.keys(): + if xml.getElementsByTagName(i): + limit_element = xml.getElementsByTagName(i)[0] + limit = int(limit_element.childNodes[0].data) + logger.info("%s in config xml is: %s" % (i, limit)) + new_dict[i] = limit + else: + logger.info("%s is not in config xml" % i) + new_dict[i] = 0 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return new_dict + +def memory_params_config(params): + """set domain memory parameters with config flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret)) + + if ret == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + ret = get_memory_config(domobj, param_dict) + if ret == param_dict: + logger.info("memory parameters is as expected in config xml") + else: + logger.error("memory parameters is not as expected in config xml") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_params_live.py b/repos/domain/memory_params_live.py new file mode 100644 index 0000000..44fb8b4 --- /dev/null +++ b/repos/domain/memory_params_live.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_LIVE + +import os +import math +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 +CGROUP_PATH = "/cgroup/memory/libvirt/qemu" + +def get_cgroup_setting(guestname): + """get domain memory parameters in cgroup + """ + if os.path.exists(CGROUP_PATH): + cgroup_path = "%s/%s" % (CGROUP_PATH, guestname) + else: + cgroup_path = "/sys/fs%s/%s" % (CGROUP_PATH, guestname) + + f = open("%s/memory.limit_in_bytes" % cgroup_path) + hard = int(f.read()) + logger.info("memory.limit_in_bytes value is %s" % hard) + f.close() + + f = open("%s/memory.soft_limit_in_bytes" % cgroup_path) + soft = int(f.read()) + logger.info("memory.soft_limit_in_bytes value is %s" % soft) + f.close() + + f = open("%s/memory.memsw.limit_in_bytes" % cgroup_path) + swap = int(f.read()) + logger.info("memory.memsw.limit_in_bytes value is %s" % swap) + f.close() + + new_dict = {'hard_limit': hard/1024, + 'soft_limit': soft/1024, + 'swap_hard_limit': swap/1024 + } + logger.debug("memory parameters dict get from cgroup is %s" % new_dict) + + return new_dict + +def memory_params_live(params): + """set domain memory parameters with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_LIVE + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pre = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pre)) + + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pos = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pos)) + + if ret_pos == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + logger.info("check memory parameters in cgroup") + ret = get_cgroup_setting(guestname) + for i in param_dict.keys(): + if math.fabs(param_dict[i] - ret[i]) > 1: + logger.error("%s value not match with cgroup setting" % i) + return 1 + + logger.info("memory parameters is as expected in cgroup setting") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_peek.py b/repos/domain/memory_peek.py new file mode 100644 index 0000000..de1ff87 --- /dev/null +++ b/repos/domain/memory_peek.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# Test domain memory peek + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {} + +def memory_peek(params): + """domain memory peek + """ + logger = params['logger'] + guestname = params['guestname'] + + flag_dict = {'1':"VIR_MEMORY_VIRTUAL", '2':"VIR_MEMORY_PHYSICAL"} + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("test memory peek API") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 0, int(flag)) + if mem: + return 1 + logger.info("memory peek API works fine with flag: %s" % + flag_dict[flag]) + + logger.info("peek 8 bytes from domain memory") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 8, int(flag)) + if not mem: + return 1 + logger.info("8 bytes start with 0 with flag %s is: %s" % + (flag_dict[flag], mem)) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_stats.py b/repos/domain/memory_stats.py new file mode 100644 index 0000000..a82adad --- /dev/null +++ b/repos/domain/memory_stats.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python +# Test get domain memory stats + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', ) +optional_params = {} + +VIRSH = "virsh qemu-monitor-command" + +def get_memory_actual(guestname): + """get memory stats with virsh commands + """ + qmp_actual = -1 + cmd ="%s %s '{ \"execute\": \"query-balloon\" }'" % (VIRSH, guestname) + logger.info("check memory stats with virsh command: %s" % cmd) + ret, out = utils.exec_cmd(cmd, shell=True) + out_dict = eval(out[0]) + if out_dict.has_key('return'): + if out_dict['return'].has_key('actual'): + qmp_actual = out_dict['return']['actual'] + else: + return False + + if qmp_actual == -1: + return False + + logger.info("the memory actual is: %s" % qmp_actual) + return qmp_actual + +def memory_stats(params): + """get domain memory stats + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + mem = domobj.memoryStats() + logger.info("%s memory stats is: %s" % (guestname, mem)) + ret = get_memory_actual(guestname) + if not ret: + logger.error("get memory actual with qmp command failed") + return 1 + + if ret == mem['actual']*1024: + logger.info("actual memory is equal to output of qmp command") + else: + logger.error("actual memory is not equal to output of qmp command") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_maxmem_config.py b/repos/domain/set_maxmem_config.py new file mode 100644 index 0000000..262d7b1 --- /dev/null +++ b/repos/domain/set_maxmem_config.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# Test set domain max memory with API setMaxMemory. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'memory', ) +optional_params = {} + +def set_maxmem_config(params): + """set domain max memory, check with config xml and + maxMemory API + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = int(params['memory']) + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given max memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain max memory as %s" % memory) + domobj.setMaxMemory(memory) + + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(guestname, guestxml)) + xml = minidom.parseString(guestxml) + mem = xml.getElementsByTagName('memory')[0] + maxmem = int(mem.childNodes[0].data) + logger.info("domain max memory in config xml is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory in domain config xml is equal to set") + else: + logger.error("set max memory failed") + return 1 + + maxmem = domobj.maxMemory() + logger.info("max memory got by maxMemory API is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory got by maxMemory API is equal to set") + else: + logger.error("set max memory failed") + return 1 + + logger.info("set max memory succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_config.py b/repos/domain/set_memory_config.py new file mode 100644 index 0000000..c8ef6c3 --- /dev/null +++ b/repos/domain/set_memory_config.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_CONFIG +# or VIR_DOMAIN_VCPU_MAXIMUM, depend on which optional param is +# given. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {'memory': 1048576, + 'maxmem': 4194304, + } +def get_memory_config(domobj): + """get domain config current memory and max memory + """ + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + + logger.info("get domain memory info in config xml") + mem = xml.getElementsByTagName('currentMemory')[0] + current = int(mem.childNodes[0].data) + logger.info("current memory in config xml is: %s" % current) + + mem = xml.getElementsByTagName('memory')[0] + max_memory = int(mem.childNodes[0].data) + logger.info("max memory in config xml is: %s" % max_memory) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return current, max_memory + +def set_memory_config(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = params.get('memory', None) + maxmem = params.get('maxmem', None) + + logger.info("the name of virtual machine is %s" % guestname) + if memory == None and maxmem == None: + logger.error("at least one of memory or maxmem should be provided") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + if memory: + memory = int(memory) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set domain memory as %s with flag: %s" % + (memory, flags)) + domobj.setMemoryFlags(memory, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[0] == memory: + logger.info("set current memory succeed") + else: + logger.error("set current memory failed") + return 1 + + if maxmem: + maxmem = int(maxmem) + flags = libvirt.VIR_DOMAIN_MEM_MAXIMUM + logger.info("set domain max memory as %s with flag: %s" % + (maxmem, flags)) + domobj.setMemoryFlags(maxmem, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[1] == maxmem: + logger.info("set max memory succeed") + else: + logger.error("set max memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_live.py b/repos/domain/set_memory_live.py new file mode 100644 index 0000000..f7c77f9 --- /dev/null +++ b/repos/domain/set_memory_live.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_LIVE. +# Check domain info and inside domain to get current memory value. +# The live flag only work on running domain, so test on shutoff +# domain will fail. + +import time +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'memory', 'username', 'password', ) +optional_params = {} + +def compare_memory(expect_memory, actual_memory): + """ comparing expected memory size with actual memory size """ + + logger.info("expected memory size is %s" % expect_memory) + logger.info("actual memory size is %s" % actual_memory) + diff = int(expect_memory) - int(actual_memory) + + if math.fabs(diff)/expect_memory < 0.05: + return 0 + else: + return 1 + +def get_current_memory(guestname, username, password): + """get domain current memory inside domain + """ + logger.debug("get the mac address of vm %s" % guestname) + mac = utils.get_dom_mac_addr(guestname) + logger.debug("the mac address of vm %s is %s" % (guestname, mac)) + ip = utils.mac_to_ip(mac, 180) + current = utils.get_remote_memory(ip, username, password) + + return current + +def set_memory_live(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + memory = int(params['memory']) + username = params['username'] + password = params['password'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain memory as %s with flag: %s" % + (memory, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.setMemoryFlags(memory, libvirt.VIR_DOMAIN_AFFECT_LIVE) + logger.info("get domain current memory") + time.sleep(3) + dominfo = domobj.info() + logger.debug("domain info list is: %s" % dominfo) + logger.info("domain current memory value is: %s KiB" % dominfo[2]) + if memory == dominfo[2]: + logger.info("set memory match with domain info") + else: + logger.error("set memory not match with domain info") + return 1 + + logger.info("check domain memory inside domain") + ret = get_current_memory(guestname, username, password) + if not compare_memory(memory, ret): + logger.info("set domain memory succeed") + else: + logger.error("set domain memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

2 1

[libvirt] [PATCH v4] add pci-bridge support
by liguang 19 Feb '13

19 Feb '13

Now, it's impossible to arrange devices into multi-pci-bus, for example: <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x1' slot='0x02' function='0x0'/> </video> libvirt will complain about "bus != 0", fortunately, qemu supports pci-to-pci bridge, if we want to use multi-pci-bus, we can define 2 pci bridge controllers, then attach 1 to the other as a subordinate pci-bus, so, 2 pci-buses appear. for example: <controller type='pci-bridge' index='0'/> <controller type='pci-bridge' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> src/conf/domain_conf.c | 98 ++++- src/conf/domain_conf.h | 1 + docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 ++++++++++++++++++++----- 6 files changed, 126 insertions(+), 22 deletions(-)

1 4

[libvirt] [PATCH 0/6 v2] Fix problems on shared disk management
by Osier Yang 19 Feb '13

19 Feb '13

This fixes problems on shared disk management, inspired by the crash when changing the media of cdrom and floppy disk, and the source of cdrom and floppy disk is empty. v1 - v2: * v1 uses a bitmap to record whether the disk is added into the table when do qemuProcessStart. v2 added a array to the hash entry to record the names of domain which uses the shared disk. * Update the shared disk table when reconnecting qemu process. Osier Yang (6): qemu: Add checking in helpers for sgio setting qemu: Merge qemuCheckSharedDisk into qemuAddSharedDisk qemu: Record names of domain which uses the shared disk in hash table qemu: Update shared disk table when reconnecting qemu process qemu: Move the shared disk adding and sgio setting prior to attaching qemu: Remove the shared disk entry if the operation is ejecting src/qemu/qemu_conf.c | 187 ++++++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_conf.h | 22 +++++- src/qemu/qemu_driver.c | 84 ++++++++++++++------- src/qemu/qemu_hotplug.c | 10 ++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_process.c | 81 +++++--------------- src/qemu/qemu_process.h | 3 - 7 files changed, 276 insertions(+), 114 deletions(-) -- 1.7.7.6

2 12

[libvirt] Fwd: There seems a deadlock in libvirt
by Chun-Hung Chen 18 Feb '13

18 Feb '13

Hi, all, We were running OpenStack with Ubuntu and libvirt 0.9.10. We found that libvirt monitor command not working well. There were a lot of error in libvirtd.log like this 2013-02-07 06:07:39.000+0000: 18112: error : qemuDomainObjBeginJobInternal:773 : Timed out during operation: cannot acquire state change lock We dig into libvirtd by strace and find one of the thread only have the following command futex(0x7f69ac0ec0ec, FUTEX_WAIT_PRIVATE, 2717, NULL It seems this thread waiting for reply but nothing came back thus other threads would wait for it. We also saw there is a function called virCondWaitUntil(). Is it safe for us to modify the code from virCondWait() to virCondWaitUntil() to prevent such deadlock scenario? Thanks. Following is the gdb -p 'libvirt.pid' and 'thread id' and 'bt full' #0 0x00007f69c8c1dd84 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib/x86_64-linux-gnu/libpthread.so.0 No symbol table info available. #1 0x00007f69c9ee884a in virCondWait (c=<optimized out>, m=<optimized out>) at util/threads-pthread.c:117 ret = <optimized out> #2 0x000000000049c749 in qemuMonitorSend (mon=0x7f69ac0ec0c0, msg=<optimized out>) at qemu/qemu_monitor.c:826 ret = -1 __func__ = "qemuMonitorSend" __FUNCTION__ = "qemuMonitorSend" #3 0x00000000004ac8ed in qemuMonitorJSONCommandWithFd (mon=0x7f69ac0ec0c0, cmd=0x7f6998028280, scm_fd=-1, reply=0x7f69c57829f8) at qemu/qemu_monitor_json.c:230 ret = -1 msg = {txFD = -1, txBuffer = 0x7f69980e9b00 "{\"execute\":\"query-balloon\",\"id\":\"libvirt-1359\"}\r\n", txOffset = 49, txLength = 49, rxBuffer = 0x0, rxLength = 0, rxObject = 0x0, finished = false, passwordHandler = 0, passwordOpaque = 0x0} cmdstr = 0x7f69980ef2f0 "{\"execute\":\"query-balloon\",\"id\":\"libvirt-1359\"}" id = 0x7f69980b0a20 "libvirt-1359" exe = <optimized out> __FUNCTION__ = "qemuMonitorJSONCommandWithFd" __func__ = "qemuMonitorJSONCommandWithFd" #4 0x00000000004ae794 in qemuMonitorJSONGetBalloonInfo (mon=0x7f69ac0ec0c0, currmem=0x7f69c5782a48) at qemu/qemu_monitor_json.c:1190 ret = <optimized out> cmd = 0x7f6998028280 reply = 0x0 __FUNCTION__ = "qemuMonitorJSONGetBalloonInfo" #5 0x0000000000457451 in qemudDomainGetInfo (dom=<optimized out>, info=0x7f69c5782b50) at qemu/qemu_driver.c:2181 priv = 0x7f69a0093b00 driver = 0x7f69b80ca8e0 vm = 0x7f69a0093370 ret = -1 err = <optimized out> balloon = <optimized out> __FUNCTION__ = "qemudDomainGetInfo" #6 0x00007f69c9f63eda in virDomainGetInfo (domain=0x7f69980e3650, info=0x7f69c5782b50) at libvirt.c:4230 ret = <optimized out> conn = <optimized out> __func__ = "virDomainGetInfo" __FUNCTION__ = "virDomainGetInfo" #7 0x0000000000439bca in remoteDispatchDomainGetInfo (ret=0x7f6998000c20, args=<optimized out>, rerr=0x7f69c5782c50, client=0x157e730, server=<optimized out>, msg=<optimized out>) at remote_dispatch.h:1640 rv = -1 tmp = {state = 1 '\001', maxMem = 2097152, memory = 0, nrVirtCpu = 0, cpuTime = 5981880000000} dom = 0x7f69980e3650 priv = <optimized out> #8 remoteDispatchDomainGetInfoHelper (server=<optimized out>, client=0x157e730, msg=<optimized out>, rerr=0x7f69c5782c50, args=<optimized out>, ret=0x7f6998000c20) at remote_dispatch.h:1616 __func__ = "remoteDispatchDomainGetInfoHelper" #9 0x00007f69c9fbb915 in virNetServerProgramDispatchCall (msg=0x1689cc0, client=0x157e730, server=0x1577c90, prog=0x15825d0) at rpc/virnetserverprogram.c:416 ret = 0x7f6998000c20 "" rv = -1 i = <optimized out> arg = 0x7f6998027950 "\360e\n\230i\177" dispatcher = 0x73de40 rerr = {code = 0, domain = 0, message = 0x0, level = 0, dom = 0x0, str1 = 0x0, str2 = 0x0, str3 = 0x0, int1 = 0, int2 = 0, net = 0x0} #10 virNetServerProgramDispatch (prog=0x15825d0, server=0x1577c90, client=0x157e730, msg=0x1689cc0) at rpc/virnetserverprogram.c:289 ret = -1 rerr = {code = 0, domain = 0, message = 0x0, level = 0, dom = 0x0, str1 = 0x0, str2 = 0x0, str3 = 0x0, int1 = 0, int2 = 0, net = 0x0} __func__ = "virNetServerProgramDispatch" __FUNCTION__ = "virNetServerProgramDispatch" #11 0x00007f69c9fb6461 in virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x1577c90) at rpc/virnetserver.c:164 srv = 0x1577c90 job = 0x155dfa0 __func__ = "virNetServerHandleJob" #12 0x00007f69c9ee8e3e in virThreadPoolWorker (opaque=<optimized out>) at util/threadpool.c:144 data = 0x0 pool = 0x1577d80 cond = 0x1577de0 priority = false job = 0x162dd20 #13 0x00007f69c9ee84e6 in virThreadHelper (data=<optimized out>) at util/threads-pthread.c:161 args = 0x0 local = {func = 0x7f69c9ee8d00 <virThreadPoolWorker>, opaque = 0x1559f90} #14 0x00007f69c8c19e9a in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 No symbol table info available. #15 0x00007f69c89474bd in clone () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #16 0x0000000000000000 in ?? () No symbol table info available. Regards, Chun-Hung

2 1

[libvirt] [PATCH V6 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 18 Feb '13

18 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

3 15

[libvirt] [PATCH] build: force correct gcc syntax for attribute_nonnull
by Eric Blake 18 Feb '13

18 Feb '13

Gcc lets you do: int ATTRIBUTE_NONNULL(1) foo(void *param); int foo(void *param) ATTRIBUTE_NONNULL(1); int ATTRIBUTE_NONNULL(1) foo(void *param) { ... } but chokes on: int foo(void *param) ATTRIBUTE_NONNULL(1) { ... } However, since commit eefb881, we have intentionally been disabling ATTRIBUTE_NONNULL because of lame gcc handling of the attribute (that is, gcc doesn't do decent warning reporting, then compiles code that mysteriously fails if you break the contract of the attribute, which is surprisingly easy to do), leaving it on only for Coverity (which does a much better job of improved static analysis when the attribute is present). But completely eliding the macro makes it too easy to write code that uses the fourth syntax option, if you aren't using Coverity. So this patch forces us to avoid syntax errors, even when not using the attribute under gcc. It also documents WHY we disable the warning under gcc, rather than forcing you to find the commit log. * src/internal.h (ATTRIBUTE_NONNULL): Expand to empty attribute, rather than nothing, when on gcc. --- src/internal.h | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/internal.h b/src/internal.h index ebc91c7..2cf4731 100644 --- a/src/internal.h +++ b/src/internal.h @@ -181,9 +181,22 @@ # endif # endif +/* gcc's handling of attribute nonnull is less than stellar - it does + * NOT improve diagnostics, and merely allows gcc to optimize away + * null code checks even when the caller manages to pass null in spite + * of the attribute, leading to weird crashes. Coverity, on the other + * hand, knows how to do better static analysis based on knowing + * whether a parameter is nonnull. Make this attribute conditional + * based on whether we are compiling for real or for analysis, while + * still requiring correct gcc syntax when it is turned off. See also + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17308 */ # ifndef ATTRIBUTE_NONNULL -# if __GNUC_PREREQ (3, 3) && STATIC_ANALYSIS -# define ATTRIBUTE_NONNULL(m) __attribute__((__nonnull__(m))) +# if __GNUC_PREREQ (3, 3) +# if STATIC_ANALYSIS +# define ATTRIBUTE_NONNULL(m) __attribute__((__nonnull__(m))) +# else +# define ATTRIBUTE_NONNULL(m) __attribute__(()) +# endif # else # define ATTRIBUTE_NONNULL(m) # endif -- 1.7.1

2 2

[libvirt] [PATCH 0/4] interface: udev backend bond support
by Doug Goldstein 18 Feb '13

18 Feb '13

This patchset primarily aims to add support for bond devices which was lacking from the exiting code. This closes out support for all interface device types. The patchset also refactors to code to make it a bit easier to follow hopefully. Doug Goldstein (4): interface: Refactor udev bridge to helper func interface: Refactor interface vlan to helper func interface: Refactor udev backend device type id interface: add bond support to udev backend src/interface/interface_backend_udev.c | 456 ++++++++++++++++++++++++++------- 1 file changed, 359 insertions(+), 97 deletions(-) -- 1.7.12.4

2 8

[libvirt] [PATCH] qemu: pass "-1" as uid/gid for unprivileged qemu
by Guido Günther 18 Feb '13

18 Feb '13

so we don't try to change uid/git to 0 when probing capabilities. --- On Fri, Feb 15, 2013 at 11:20:17PM -0600, Doug Goldstein wrote: > The following error bisect's down to this commit when running out of > my local checkout for testing. > > 2013-02-16 05:16:55.102+0000: 29992: error : virCommandWait:2270 : > internal error Child process (LC_ALL=C > LD_LIBRARY_PATH=/home/cardoe/work/libvirt/src/.libs > PATH=/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/games/bin > HOME=/home/cardoe USER=cardoe LOGNAME=cardoe /usr/bin/qemu-kvm -help) > unexpected exit status 1: libvir: error : internal error cannot apply > process capabilities -1 This is due to: debug : virExec:641 : Setting child uid:gid to 0:0 with caps 0 We're trying to change capabilities even on qemu:///session. This unbreaks the libvirt-tck jenkins test suite as well. src/qemu/qemu_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 23499ef..dc35b91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -556,6 +556,8 @@ qemuStartup(bool privileged, char *membase = NULL; char *mempath = NULL; virQEMUDriverConfigPtr cfg; + uid_t run_uid = -1; + gid_t run_gid = -1; if (VIR_ALLOC(qemu_driver) < 0) return -1; @@ -707,11 +709,13 @@ qemuStartup(bool privileged, cfg->snapshotDir, cfg->user, cfg->group); goto error; } + run_uid = cfg->user; + run_gid = cfg->group; } qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir, - cfg->user, - cfg->group); + run_uid, + run_gid); if (!qemu_driver->qemuCapsCache) goto error; -- 1.7.10.4

2 2

[libvirt] [PATCH] Add capabilities bit for -no-kvm-pit-reinjection
by Doug Goldstein 18 Feb '13

18 Feb '13

The conversion to qemuCaps dropped the ability with qemu{,-kvm} 1.2 and newer to set the lost tick policy for the PIT. While the -no-kvm-pit-reinjection option is depreacated, it is still supported at least through 1.4, it is better to not lose the functionality. --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 51fc9dc..af52bbf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2284,6 +2284,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } -- 1.7.12.4

3 4

[libvirt] Questions about the schemas
by Gene Czarcinski 18 Feb '13

18 Feb '13

This is not in any way critical but simply trying to get a better idea of the purposes of docs/schemas/* I recently submitted a patch which needed me to look at and modify some of the schema files [adding a client-id specification to dhcp/host]. As I looked them over I wondered what the purpose was of the schemas. If you ran virt-xml-validate (which uses xmllint) and the result is that your file is not validated, then there is a problem but it is not clear just what the problem is. On the other hand, if you run virt-xml-validate and it says the your file is OK (validated), that only means that it did not find a problem but not that the file is OK. For example, the schema says it is valid to specify an IPv6 address in an IPv4 definition. The implementing software if kick it out but the schema says it is OK. Another example is the (host) name under the dhcp/host definition. The current schema says this is required but dnsmasq does not require a host-name specification [I submitted a trivial patch to make it optional]. So, if the purpose is to kick out obvious errors, this it is OK as is. If the purpose to to be definitiive, then more work needs to be done. My opinion is that the current situation is "good enough" as long as valid elements/specifications are not treated as errors. Gene

2 2

[libvirt] [PATCHv2 00/15] Permit setting capabilities for uid!=0 processes
by Laine Stump 18 Feb '13

18 Feb '13

(and also properly clear capabilities bounding set for child processes) This replaces the earlier version of the same patches: https://www.redhat.com/archives/libvir-list/2013-February/msg00446.html Many of these patches were already ACKed in the first version. If I haven't modified them (other than rebasing) I note that in the subject. Other patches have been modified based on Dan and Eric's reviews of V1. Also, since I first posted the series, we've had a talk with some kernel people who are amenable to modify the semantics of CAP_COMPROMISE_KERNEL such that it's only checked on open(), not on read or write. If this is done, we will (thankfully!) no longer need to set CAP_COMPROMISE_KERNEL for the qemu process. However, the first 14 patches in this series are still useful. Two big changes are: 1) it allows setting CAP_SYS_RAWIO when needed for generic scsi command passthrough, and 2) the bounding set of child processes will now be properly cleared (it previously wasn't, even though the code looked like it *should* have been doing so). Here is the blurb from V1's intro: There are a bunch of patches here, but each is small and single-purpose to make reviewing easier (and also so that any potential regressions can be easily bisected). The original purpose of the patches was to permit setting CAP_COMPROMISE_KERNEL for non-root qemu processes, since Fedora 18 now requires that in order for generic PCI passthrough to work (the alternative was to always run qemu as root). Although we may not actually want to do that part (if we can convince kernel people to implement CAP_COMPROMISE_KERNEL such that it's only required when *opening* the necessary sysfs file (done by libvirt), rather than for every read/write (done by qemu), then we will not need CAP_COMPROMISE_KERNEL for qemu), but that is just a couple lines in the final patch, and the rest of the series is still useful, as it make dropping/keeping caps truly work for non-root child processes - this has never before been the case. (for example, CAP_SYS_RAWIO is needed for generic scsi passthrough to work, and until now the only way to have that was to run *all* qemus as root). A bit higher level description of what I've done with all the patches: 1) remove the programmable "hook" from virExecWithHook(), since that function was only called from one place, and always with the same hook function. Rename virExecWithHook() to virExec(), and replace the call to that hook with inline code. 2) give virCommand an API to set the intended uid/gid of the command that's going to be run, and use that instead of a "user hook" where appropriate (in the process completely eliminating two hook functions). 3) Also add an API to virCommand to do the final "set the process label" step for selinux/apparmor. 4) Add a new API to the security driver (and use it from qemu) called virSecurityManagerSetChildProcessLabel() which a) is called prior to virCommandRun() rather than from a command "hook" function, b) takes a virCommand, and c) rather than immediately performing the operation (as virSecurityManagerSetProcessLabel() did), merely stores the necessary information in the virCommand so that virExec can perform the operation (setting selinux label, setuid/gid, etc) 5) make a new function combining the setting of uid/gid and maintaining of capabilities, because that is the only way you can set uid!=0 and still maintain capabilities. Use this in virExec() 6) *Finally* set the CAP_COMPROMISE_KERNEL capability unconditionally for all qemu processes. (If we really do have to do this, we may want to consider making it a qemu.conf setting). Laine Stump (15): util: eliminate generic hook from virExecWithHook util: eliminate extra args from virExec util: refactor virCommandHook into virExec and virCommandHandshakeChild util: add virCommandSetUID and virCommandSetGID util: make virSetUIDGID a NOP only when uid or gid is -1 qemu: replace exec hook with virCommandSetUID/GID in qemuCaps* qemu: replace exec hook with virCommandSetUID/GID in storage_backend build: define SECDRIVER_LIBS in Makefile.am util: add security label setting to virCommand security: add new virSecurityManagerSetChildProcessLabel API qemu: let virCommand set child process security labels/uid/gid util: drop capabilities immediately after changing uid/gid of child util: virSetUIDGIDWithCaps - change uid while keeping caps util: maintain caps when running command with uid != 0 qemu: set CAP_COMPROMISE_KERNEL so that pci passthrough works src/Makefile.am | 36 ++- src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 64 ++--- src/qemu/qemu_process.c | 23 +- src/security/security_apparmor.c | 42 +++- src/security/security_dac.c | 24 +- src/security/security_driver.h | 6 +- src/security/security_manager.c | 13 +- src/security/security_manager.h | 6 +- src/security/security_nop.c | 10 +- src/security/security_selinux.c | 32 +++ src/security/security_stack.c | 20 +- src/storage/storage_backend.c | 28 +-- src/util/vircommand.c | 523 ++++++++++++++++++++------------------- src/util/vircommand.h | 12 +- src/util/virutil.c | 115 ++++++++- src/util/virutil.h | 1 + 17 files changed, 595 insertions(+), 366 deletions(-) -- 1.8.1

6 36

[libvirt] [PATCH v3 00/12] Rework storage migration
by Michal Privoznik 18 Feb '13

18 Feb '13

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk target='vda' size='15032385536'/> <disk target='vdb' size='11534336'/> <disk target='vdc' size='13631488'/> </nbd> The source is telling the destination it supports the NBD feature. Moreover, which disks are to be transferred and what are their sizes. That's because disks needs to be fully allocated (even qcow) for successful transfer. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='5901'/> The destination is confirming it does support NBD as well. All disks were pre-created and NBD server is listening on given port (5901 in this case). If either src or dst doesn't support NBD, it is not used and whole process falls back to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to v2.1: -nbd cookie reworked -don't rely on disk ordering in the cookie, but use disk target for that -adapt to virPortAllocator -unlink pre-created storage on migration fail -other of Jirka's suggestions worked in Michal Privoznik (12): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer() qemu_migration: Introduce qemuMigrationDriveMirror qemu_domain: Introduce qemuDomainGetDiskBlockInfo qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase qemu_migration: Cancel running jobs on failed migration qemu_migration: Unlink pre-created storage on error src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 157 ++++++++- src/qemu/qemu_domain.h | 7 + src/qemu/qemu_driver.c | 124 +------ src/qemu/qemu_migration.c | 769 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 63 ++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 102 ++++++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 13 + 11 files changed, 1118 insertions(+), 136 deletions(-) -- 1.8.0.2

2 18

[libvirt] [test-API][PATCH] Add 7 memory API related cases
by Wayne Sun 18 Feb '13

18 Feb '13

add 7 new cases using domain memory related API add 1 conf for domain memory testing 7 new cases are: memory_params_config: test set memory params with config flag memory_params_live: test set memory params with live flag memory_peek: test memory peek memory_stats: test get memory stats set_maxmem_config: test set maximum memory with config flag set_memory_config: test set current memory with config flag set_memory_live: test set current memory with live flag memory hotplug is not supported yet, so live set max memory case is not added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/domain_memory_test.conf | 99 +++++++++++++++++++++++++++++++ repos/domain/memory_params_config.py | 96 ++++++++++++++++++++++++++++++ repos/domain/memory_params_live.py | 109 +++++++++++++++++++++++++++++++++++ repos/domain/memory_peek.py | 48 +++++++++++++++ repos/domain/memory_stats.py | 65 +++++++++++++++++++++ repos/domain/set_maxmem_config.py | 59 +++++++++++++++++++ repos/domain/set_memory_config.py | 94 ++++++++++++++++++++++++++++++ repos/domain/set_memory_live.py | 86 +++++++++++++++++++++++++++ 8 files changed, 656 insertions(+) create mode 100644 cases/domain_memory_test.conf create mode 100644 repos/domain/memory_params_config.py create mode 100644 repos/domain/memory_params_live.py create mode 100644 repos/domain/memory_peek.py create mode 100644 repos/domain/memory_stats.py create mode 100644 repos/domain/set_maxmem_config.py create mode 100644 repos/domain/set_memory_config.py create mode 100644 repos/domain/set_memory_live.py diff --git a/cases/domain_memory_test.conf b/cases/domain_memory_test.conf new file mode 100644 index 0000000..90879ab --- /dev/null +++ b/cases/domain_memory_test.conf @@ -0,0 +1,99 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + macaddr + 54:52:00:4a:c1:22 + +domain:balloon_memory + guestname + $defaultname + memorypair + 1024,2048 + +domain:destroy + guestname + $defaultname + +domain:memory_params_config + guestname + $defaultname + hard_limit + 0 + soft_limit + 9007199254740991 + swap_hard_limit + -1 + +domain:set_maxmem_config + guestname + $defaultname + memory + 16777216 + +domain:set_memory_config + guestname + $defaultname + memory + 1048576 + maxmem + 4194304 + +domain:start + guestname + $defaultname + +domain:memory_stats + guestname + $defaultname + +domain:memory_peek + guestname + $defaultname + +domain:memory_params_live + guestname + $defaultname + hard_limit + 25417224 + soft_limit + 9007199254740900 + swap_hard_limit + -1 + +domain:set_memory_live + guestname + $defaultname + memory + 2097152 + username + $username + password + $password + +domain:set_memory_config + guestname + $defaultname + memory + 4194304 + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/domain/memory_params_config.py b/repos/domain/memory_params_config.py new file mode 100644 index 0000000..af9781b --- /dev/null +++ b/repos/domain/memory_params_config.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_CONFIG + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 + +def get_memory_config(domobj, param_dict): + """get domain config memory parameters + """ + new_dict = {} + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + logger.info("get domain memory parameters in config xml") + for i in param_dict.keys(): + if xml.getElementsByTagName(i): + limit_element = xml.getElementsByTagName(i)[0] + limit = int(limit_element.childNodes[0].data) + logger.info("%s in config xml is: %s" % (i, limit)) + new_dict[i] = limit + else: + logger.info("%s is not in config xml" % i) + new_dict[i] = 0 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return new_dict + +def memory_params_config(params): + """set domain memory parameters with config flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret)) + + if ret == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + ret = get_memory_config(domobj, param_dict) + if ret == param_dict: + logger.info("memory parameters is as expected in config xml") + else: + logger.error("memory parameters is not as expected in config xml") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_params_live.py b/repos/domain/memory_params_live.py new file mode 100644 index 0000000..68a71b2 --- /dev/null +++ b/repos/domain/memory_params_live.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python +# Test set domain memory parameters with flag +# VIR_DOMAIN_AFFECT_LIVE + +import os +import math +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'hard_limit', 'soft_limit', 'swap_hard_limit', ) +optional_params = {} + +UNLIMITED = 9007199254740991 +CGROUP_PATH = "/cgroup/memory/libvirt/qemu" + +def get_cgroup_setting(guestname): + """get domain memory parameters in cgroup + """ + if os.path.exists(CGROUP_PATH): + cgroup_path = "%s/%s" % (CGROUP_PATH, guestname) + else: + cgroup_path = "/sys/fs%s/%s" % (CGROUP_PATH, guestname) + + f = open("%s/memory.limit_in_bytes" % cgroup_path) + hard = int(f.read()) + logger.info("memory.limit_in_bytes value is %s" % hard) + + f = open("%s/memory.soft_limit_in_bytes" % cgroup_path) + soft = int(f.read()) + logger.info("memory.soft_limit_in_bytes value is %s" % soft) + + f = open("%s/memory.memsw.limit_in_bytes" % cgroup_path) + swap = int(f.read()) + logger.info("memory.memsw.limit_in_bytes value is %s" % swap) + + new_dict = {'hard_limit': hard/1024, + 'soft_limit': soft/1024, + 'swap_hard_limit': swap/1024 + } + logger.debug("memory parameters dict get from cgroup is %s" % new_dict) + + return new_dict + +def memory_params_live(params): + """set domain memory parameters with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + hard_limit = int(params['hard_limit']) + soft_limit = int(params['soft_limit']) + swap_hard_limit = int(params['swap_hard_limit']) + + logger.info("the name of virtual machine is %s" % guestname) + param_dict = {'hard_limit': hard_limit, + 'soft_limit': soft_limit, + 'swap_hard_limit': swap_hard_limit + } + + for i in param_dict.keys(): + if param_dict[i] == -1: + param_dict[i] = UNLIMITED + + logger.info("the param dict for setting is %s" % param_dict) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + flags = libvirt.VIR_DOMAIN_AFFECT_LIVE + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pre = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pre)) + + logger.info("set %s memory parameters with flag: %s" % + (guestname, flags)) + domobj.setMemoryParameters(param_dict, flags) + logger.info("set memory parameters done") + + logger.info("get %s memory parameters with flag: %s" % + (guestname, flags)) + ret_pos = domobj.memoryParameters(flags) + logger.info("%s memory parameters is %s" % (guestname, ret_pos)) + + if ret_pos == param_dict: + logger.info("memory parameters is as expected") + else: + logger.error("memory parameters is not as expected") + return 1 + + logger.info("check memory parameters in cgroup") + ret = get_cgroup_setting(guestname) + for i in param_dict.keys(): + if math.fabs(param_dict[i] - ret[i]) > 1: + logger.error("%s value not match with cgroup setting" % i) + return 1 + + logger.info("memory parameters is as expected in cgroup setting") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_peek.py b/repos/domain/memory_peek.py new file mode 100644 index 0000000..de1ff87 --- /dev/null +++ b/repos/domain/memory_peek.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# Test domain memory peek + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {} + +def memory_peek(params): + """domain memory peek + """ + logger = params['logger'] + guestname = params['guestname'] + + flag_dict = {'1':"VIR_MEMORY_VIRTUAL", '2':"VIR_MEMORY_PHYSICAL"} + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("test memory peek API") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 0, int(flag)) + if mem: + return 1 + logger.info("memory peek API works fine with flag: %s" % + flag_dict[flag]) + + logger.info("peek 8 bytes from domain memory") + for flag in flag_dict.keys(): + logger.info("using flag: %s" % flag_dict[flag]) + mem = domobj.memoryPeek(0, 8, int(flag)) + if not mem: + return 1 + logger.info("8 bytes start with 0 with flag %s is: %s" % + (flag_dict[flag], mem)) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/memory_stats.py b/repos/domain/memory_stats.py new file mode 100644 index 0000000..5de4028 --- /dev/null +++ b/repos/domain/memory_stats.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python +# Test get domain memory stats + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', ) +optional_params = {} + +VIRSH = "virsh qemu-monitor-command" + +def get_memory_actual(guestname): + """get memory stats with virsh commands + """ + qmp_actual = -1 + cmd ="%s %s '{ \"execute\": \"query-balloon\" }'" % (VIRSH, guestname) + logger.info("check memory stats with virsh command: %s" % cmd) + ret, out = utils.exec_cmd(cmd, shell=True) + out_dict = eval(out[0]) + if out_dict.has_key('return'): + if out_dict['return'].has_key('actual'): + qmp_actual = out_dict['return']['actual'] + else: + return False + + if qmp_actual == -1: + return False + + logger.info("the memory actal is: %s" % qmp_actual) + return qmp_actual + +def memory_stats(params): + """get domain memory stats + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + + logger.info("the name of virtual machine is %s" % guestname) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + mem = domobj.memoryStats() + logger.info("%s memory stats is: %s" % (guestname, mem)) + ret = get_memory_actual(guestname) + if not ret: + logger.error("get memory actual with qmp command failed") + return 1 + + if ret == mem['actual']*1024: + logger.info("actual memory is equal to output of qmp command") + else: + logger.error("actual memory is not equal to output of qmp command") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_maxmem_config.py b/repos/domain/set_maxmem_config.py new file mode 100644 index 0000000..262d7b1 --- /dev/null +++ b/repos/domain/set_maxmem_config.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# Test set domain max memory with API setMaxMemory. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', 'memory', ) +optional_params = {} + +def set_maxmem_config(params): + """set domain max memory, check with config xml and + maxMemory API + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = int(params['memory']) + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given max memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain max memory as %s" % memory) + domobj.setMaxMemory(memory) + + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(guestname, guestxml)) + xml = minidom.parseString(guestxml) + mem = xml.getElementsByTagName('memory')[0] + maxmem = int(mem.childNodes[0].data) + logger.info("domain max memory in config xml is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory in domain config xml is equal to set") + else: + logger.error("set max memory failed") + return 1 + + maxmem = domobj.maxMemory() + logger.info("max memory got by maxMemory API is: %s" % maxmem) + if maxmem == memory: + logger.info("max memory got by maxMemory API is equal to set") + else: + logger.error("set max memory failed") + return 1 + + logger.info("set max memory succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_config.py b/repos/domain/set_memory_config.py new file mode 100644 index 0000000..c8ef6c3 --- /dev/null +++ b/repos/domain/set_memory_config.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_CONFIG +# or VIR_DOMAIN_VCPU_MAXIMUM, depend on which optional param is +# given. + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('guestname', ) +optional_params = {'memory': 1048576, + 'maxmem': 4194304, + } +def get_memory_config(domobj): + """get domain config current memory and max memory + """ + try: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + + logger.info("get domain memory info in config xml") + mem = xml.getElementsByTagName('currentMemory')[0] + current = int(mem.childNodes[0].data) + logger.info("current memory in config xml is: %s" % current) + + mem = xml.getElementsByTagName('memory')[0] + max_memory = int(mem.childNodes[0].data) + logger.info("max memory in config xml is: %s" % max_memory) + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return False + + return current, max_memory + +def set_memory_config(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + guestname = params['guestname'] + memory = params.get('memory', None) + maxmem = params.get('maxmem', None) + + logger.info("the name of virtual machine is %s" % guestname) + if memory == None and maxmem == None: + logger.error("at least one of memory or maxmem should be provided") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + if memory: + memory = int(memory) + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG + logger.info("set domain memory as %s with flag: %s" % + (memory, flags)) + domobj.setMemoryFlags(memory, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[0] == memory: + logger.info("set current memory succeed") + else: + logger.error("set current memory failed") + return 1 + + if maxmem: + maxmem = int(maxmem) + flags = libvirt.VIR_DOMAIN_MEM_MAXIMUM + logger.info("set domain max memory as %s with flag: %s" % + (maxmem, flags)) + domobj.setMemoryFlags(maxmem, flags) + ret = get_memory_config(domobj) + if not ret: + return 1 + + if ret[1] == maxmem: + logger.info("set max memory succeed") + else: + logger.error("set max memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/domain/set_memory_live.py b/repos/domain/set_memory_live.py new file mode 100644 index 0000000..f7c77f9 --- /dev/null +++ b/repos/domain/set_memory_live.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# Test set domain balloon memory with flag VIR_DOMAIN_AFFECT_LIVE. +# Check domain info and inside domain to get current memory value. +# The live flag only work on running domain, so test on shutoff +# domain will fail. + +import time +import math + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'memory', 'username', 'password', ) +optional_params = {} + +def compare_memory(expect_memory, actual_memory): + """ comparing expected memory size with actual memory size """ + + logger.info("expected memory size is %s" % expect_memory) + logger.info("actual memory size is %s" % actual_memory) + diff = int(expect_memory) - int(actual_memory) + + if math.fabs(diff)/expect_memory < 0.05: + return 0 + else: + return 1 + +def get_current_memory(guestname, username, password): + """get domain current memory inside domain + """ + logger.debug("get the mac address of vm %s" % guestname) + mac = utils.get_dom_mac_addr(guestname) + logger.debug("the mac address of vm %s is %s" % (guestname, mac)) + ip = utils.mac_to_ip(mac, 180) + current = utils.get_remote_memory(ip, username, password) + + return current + +def set_memory_live(params): + """set domain memory with live flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + memory = int(params['memory']) + username = params['username'] + password = params['password'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given memory value is %s" % memory) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain memory as %s with flag: %s" % + (memory, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.setMemoryFlags(memory, libvirt.VIR_DOMAIN_AFFECT_LIVE) + logger.info("get domain current memory") + time.sleep(3) + dominfo = domobj.info() + logger.debug("domain info list is: %s" % dominfo) + logger.info("domain current memory value is: %s KiB" % dominfo[2]) + if memory == dominfo[2]: + logger.info("set memory match with domain info") + else: + logger.error("set memory not match with domain info") + return 1 + + logger.info("check domain memory inside domain") + ret = get_current_memory(guestname, username, password) + if not compare_memory(memory, ret): + logger.info("set domain memory succeed") + else: + logger.error("set domain memory failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.8.1

2 1

[libvirt] [PATCH] interface: fix udev backend use after free
by Doug Goldstein 18 Feb '13

18 Feb '13

udevIfaceListAllInterface() used the udev_device after it had its ref count decremented which results in a use after free issue. --- src/interface/interface_backend_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 92c35d9..2c41bde 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -359,7 +359,6 @@ udevIfaceListAllInterfaces(virConnectPtr conn, name = udev_device_get_sysname(dev); macaddr = udev_device_get_sysattr_value(dev, "address"); status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); - udev_device_unref(dev); /* Filter the results */ if (status && (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) @@ -375,6 +374,7 @@ udevIfaceListAllInterfaces(virConnectPtr conn, } count++; } + udev_device_unref(dev); } /* Drop our refcounts */ -- 1.7.12.4

2 2

[libvirt] [PATCH] Add autogenerated lxc_protocol.[ch] to gitignore
by Doug Goldstein 18 Feb '13

18 Feb '13

/src/lxc/lxc_protocol.[ch] is autogenerated so add it to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 23fdc91..16ac708 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ /COPYING /ChangeLog /GNUmakefile +/HACKING /INSTALL /NEWS /aclocal.m4 @@ -121,6 +122,7 @@ /src/lxc/lxc_monitor_dispatch.h /src/lxc/lxc_monitor_protocol.c /src/lxc/lxc_monitor_protocol.h +/src/lxc/lxc_protocol.[ch] /src/lxc/test_libvirtd_lxc.aug /src/qemu/test_libvirtd_qemu.aug /src/remote/*_client_bodies.h -- 1.7.12.4

3 4

[libvirt] [PATCH 0/5] Clean up after recent Coverity scan
by John Ferlan 18 Feb '13

18 Feb '13

This is the last round of cleanup with a few Coverity errors from the tests trees and a couple that just showed up in my recent scans within security and virsh. The commandtest still has Valgrind errors, but errors are not new to this change. After this round of Coverity changes, the only remaining Coverity warnings reported are within the gnulib tree. A few have been there all along within vasnprintf.c, while others are new with the recent gnulib update (regexec.c, regex_internal.c, and regcomp.c). Once these are submitted I will have a baseline from which I can make periodic comparisons. Since Coverity will sometimes "find" issues unrelated to recent changes, using git bisect to point the fickle finger of fate at a recent submission may not be possible. John Ferlan (5): drivermodule: Ignore coverity warning about leaked_storage commandtest: Resolve some coverity resource leaks vircommand: Remove unnecessary sa_assert virsh: Resolve possible NULL dereference security: Remove unnecessary checks for mgr == NULL src/security/security_dac.c | 6 ------ src/security/security_selinux.c | 6 ------ src/util/vircommand.c | 3 --- tests/commandtest.c | 17 ++++++++++++----- tests/virdrivermoduletest.c | 2 ++ tools/virsh.c | 4 ++-- 6 files changed, 16 insertions(+), 22 deletions(-) -- 1.7.11.7

3 20

[libvirt] [PATCH 0/2] Restore DAC labels
by Michal Privoznik 18 Feb '13

18 Feb '13

If libvirt is doing labeling on a domain startup, the original owner of files is not remembered. So later, when the domain is shutting down and re-labelling is done, we have no other option, just to fall back to 0:0. These patches are solving this issue for DAC driver. I am sending them just to know if the path I wen through is right so I don't bother with selinux if it is not. Michal Privoznik (2): conf: Add oldlabel field to virSecurityDeviceLabelDef security driver: Remember the original DAC label src/conf/domain_conf.c | 20 ++- src/conf/domain_conf.h | 1 + src/security/security_dac.c | 340 +++++++++++++++++++++++++++++++------------- 3 files changed, 260 insertions(+), 101 deletions(-) -- 1.8.0.2

3 4

[libvirt] libvirt compilation error, libvirt.so: undefined reference to `xmlParseFile'
by nasb＠ruedesrancy.org 18 Feb '13

18 Feb '13

Hi, I'm currently trying to compile libvirt 1.0.2 on my custom x86_64/uClibc environnement. Configuration goes well (./configure --prefix=/usr --without-pyton), but during make I get the following error message : CCLD libvirtd /lslbuild/svn/trunk/packages/virtualization/libvirt/libvirt-1.0.2/src/.libs/libvirt.so: undefined reference to `xmlParseFile' collect2: error: ld returned 1 exit status Looks like a -lxml2 flag missing, but configure found the correct flags according to the Makefile which contains : LIBXML_CFLAGS = -I/usr/include/libxml2 LIBXML_LIBS = -lxml2 Does anyone have an idea on what's going wrong? What other informations should I provide? Thanks, -- Eric LECAT

1 1

[libvirt] Plan for the next release
by Daniel Veillard 18 Feb '13

18 Feb '13

February is short, but we are already at more then 180 commits since 1.0.2 release, and well we ought to fix the python bindings problems of 1.0.2 in an official release, so I think this makes sense to push a new release at the end of the month. I suggest to enter freeze in a week, targetting a 1.0.3 release on the 28th or March 1st, 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/

1 0

[libvirt] How to catch libvirtd logs
by harryxiyou 18 Feb '13

18 Feb '13

Hi all, I start a VM with command "virsh create hlfs.xml", which fork a child process. But i am not sure how to catch this child process's logs? Could anyone give me some suggestions? Thanks in advance. -- Thanks Harry Wei

2 1

[libvirt] [PATCH] Add support for <option> tag in network config
by Pieter Hollants 18 Feb '13

18 Feb '13

This patch adds support for a new <option>-Tag in the <dhcp> block of network configs, based on a subset of the fifth proposal by Laine Stump in the mailing list discussion at https://www.redhat.com/archives/libvir-list/2012-November/msg01054.html. Any such defined option will result in a dhcp-option=<number>,"<value>" statement in the generated dnsmasq configuration file. Currently, DHCP options can be specified by number only and there is no whitelisting or blacklisting of option numbers, which should probably be added. Signed-off-by: Pieter Hollants <pieter(a)hollants.com> --- AUTHORS.in | 1 + docs/schemas/network.rng | 6 +++ docs/schemas/networkcommon.rng | 6 +++ src/conf/network_conf.c | 54 +++++++++++++++++++++ src/conf/network_conf.h | 10 ++++ src/network/bridge_driver.c | 10 ++++ tests/networkxml2xmlin/netboot-network.xml | 1 + tests/networkxml2xmlin/netboot-proxy-network.xml | 1 + tests/networkxml2xmlout/netboot-network.xml | 1 + tests/networkxml2xmlout/netboot-proxy-network.xml | 1 + 10 Dateien geändert, 91 Zeilen hinzugefügt(+) diff --git a/AUTHORS.in b/AUTHORS.in index 39fe68d..074185e 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -74,6 +74,7 @@ Michel Ponceau <michel.ponceau(a)bull.net> Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> Pete Vetere <pvetere(a)redhat.com> Philippe Berthault <philippe.berthault(a)Bull.net> +Pieter Hollants <pieter(a)hollants.com> Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 09d7c73..a2ce1c9 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -293,6 +293,12 @@ </optional> </element> </optional> + <zeroOrMore> + <element name="option"> + <attribute name="number"><ref name="unsignedByte"/></attribute> + <attribute name="value"><text/></attribute> + </element> + </zeroOrMore> </element> </optional> </element> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 51ff759..3510928 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -173,6 +173,12 @@ </data> </define> + <define name='unsignedByte'> + <data type='integer'> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + </define> <define name='unsignedShort'> <data type='integer'> <param name="minInclusive">0</param> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 3604ff7..9d84c7e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -777,6 +777,45 @@ cleanup: } static int +virNetworkDHCPOptionDefParseXML(const char *networkName, + xmlNodePtr node, + virNetworkDHCPOptionDefPtr option) +{ + char *number = NULL; + int ret = -1; + + if (!(number = virXMLPropString(node, "number"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Option definition in IPv4 network '%s' " + "must have number attribute"), + networkName); + goto cleanup; + } + if (number && + virStrToLong_ui(number, NULL, 10, &option->number) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <option> 'number' attribute")); + goto cleanup; + } + /* TODO: either whitelist numbers or blacklist numbers already occupied + * by other XML statements (eg. submask) */ + if (!(option->value = virXMLPropString(node, "value"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Option definition in IPv4 network '%s' " + "must have value attribute"), + networkName); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(number); + return ret; +} + + +static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, virNetworkIpDefPtr def) @@ -837,6 +876,17 @@ virNetworkDHCPDefParseXML(const char *networkName, def->bootfile = file; def->bootserver = inaddr; VIR_FREE(server); + } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "option")) { + if (VIR_REALLOC_N(def->options, def->noptions + 1) < 0) { + virReportOOMError(); + return -1; + } + if (virNetworkDHCPOptionDefParseXML(networkName, cur, + &def->options[def->noptions])) { + return -1; + } + def->noptions++; } cur = cur->next; @@ -2045,6 +2095,10 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } + for (ii = 0 ; ii < def->noptions ; ii++) { + virBufferAsprintf(buf, "<option number='%u' value='%s' />\n", + def->options[ii].number, def->options[ii].value); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</dhcp>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 4c634ed..14f852a 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -77,6 +77,13 @@ struct _virNetworkDHCPHostDef { virSocketAddr ip; }; +typedef struct _virNetworkDHCPOptionDef virNetworkDHCPOptionDef; +typedef virNetworkDHCPOptionDef *virNetworkDHCPOptionDefPtr; +struct _virNetworkDHCPOptionDef { + unsigned int number; + char *value; +}; + typedef struct _virNetworkDNSTxtDef virNetworkDNSTxtDef; typedef virNetworkDNSTxtDef *virNetworkDNSTxtDefPtr; struct _virNetworkDNSTxtDef { @@ -139,6 +146,9 @@ struct _virNetworkIpDef { char *tftproot; char *bootfile; virSocketAddr bootserver; + + size_t noptions; /* Zero or more additional dhcp options */ + virNetworkDHCPOptionDefPtr options; }; typedef struct _virNetworkForwardIfDef virNetworkForwardIfDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c834f83..c7c0a9e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -926,6 +926,15 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "dhcp-boot=%s\n", ipdef->bootfile); } } + + /* Any additional DHCP options? */ + if (ipdef->noptions > 0) { + for (r = 0 ; r < ipdef->noptions ; r++) { + virBufferAsprintf(&configbuf, "dhcp-option=%u,\"%s\"\n", + ipdef->options[r].number, + ipdef->options[r].value); + } + } } ipdef = (ipdef == ipv6def) ? NULL : ipv6def; } @@ -959,6 +968,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "addn-hosts=%s\n", dctx->addnhostsfile->path); + /* Are we doing RA instead of radvd? */ if (DNSMASQ_RA_SUPPORT(caps)) { if (ipv6def) diff --git a/tests/networkxml2xmlin/netboot-network.xml b/tests/networkxml2xmlin/netboot-network.xml index ed75663..4de8976 100644 --- a/tests/networkxml2xmlin/netboot-network.xml +++ b/tests/networkxml2xmlin/netboot-network.xml @@ -9,6 +9,7 @@ <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <bootp file="pxeboot.img" /> + <option number="252" value="\n" /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/networkxml2xmlin/netboot-proxy-network.xml index ecb6738..4c5c480 100644 --- a/tests/networkxml2xmlin/netboot-proxy-network.xml +++ b/tests/networkxml2xmlin/netboot-proxy-network.xml @@ -8,6 +8,7 @@ <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <bootp file="pxeboot.img" server="10.20.30.40" /> + <option number="252" value="\n" /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlout/netboot-network.xml b/tests/networkxml2xmlout/netboot-network.xml index b8a4d99..c3ea95a 100644 --- a/tests/networkxml2xmlout/netboot-network.xml +++ b/tests/networkxml2xmlout/netboot-network.xml @@ -9,6 +9,7 @@ <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> <bootp file='pxeboot.img' /> + <option number='252' value='\n' /> </dhcp> </ip> </network> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml index e11c50b..f5f2c0d 100644 --- a/tests/networkxml2xmlout/netboot-proxy-network.xml +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -8,6 +8,7 @@ <dhcp> <range start='192.168.122.2' end='192.168.122.254' /> <bootp file='pxeboot.img' server='10.20.30.40' /> + <option number='252' value='\n' /> </dhcp> </ip> </network> -- 1.7.10.4

1 0

[libvirt] [PATCH] build: fix vircommand build on mingw
by Eric Blake 16 Feb '13

16 Feb '13

CC libvirt_util_la-vircommand.lo ../../src/util/vircommand.c:2358:1: error: 'virCommandHandshakeChild' defined but not used [-Werror=unused-function] * src/util/vircommand.c (virCommandHandshakeChild): Hoist earlier, so that win32 build doesn't hit an unused forward declaration. --- Pushing under the build-breaker rule. src/util/vircommand.c | 98 +++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 5837fee..ee1b510 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -118,8 +118,6 @@ struct _virCommand { #endif }; -static int virCommandHandshakeChild(virCommandPtr cmd); - /* * virCommandFDIsSet: * @fd: FD to test @@ -332,6 +330,54 @@ prepareStdFd(int fd, int std) return 0; } +/* virCommandHandshakeChild: + * + * child side of handshake - called by child process in virExec() to + * indicate to parent that the child process has successfully + * completed its pre-exec initialization. + */ +static int +virCommandHandshakeChild(virCommandPtr cmd) +{ + char c = '1'; + int rv; + + if (!cmd->handshake) + return true; + + VIR_DEBUG("Notifying parent for handshake start on %d", + cmd->handshakeWait[1]); + if (safewrite(cmd->handshakeWait[1], &c, sizeof(c)) != sizeof(c)) { + virReportSystemError(errno, "%s", + _("Unable to notify parent process")); + return -1; + } + + VIR_DEBUG("Waiting on parent for handshake complete on %d", + cmd->handshakeNotify[0]); + if ((rv = saferead(cmd->handshakeNotify[0], &c, + sizeof(c))) != sizeof(c)) { + if (rv < 0) + virReportSystemError(errno, "%s", + _("Unable to wait on parent process")); + else + virReportSystemError(EIO, "%s", + _("libvirtd quit during handshake")); + return -1; + } + if (c != '1') { + virReportSystemError(EINVAL, + _("Unexpected confirm code '%c' from parent"), + c); + return -1; + } + VIR_FORCE_CLOSE(cmd->handshakeWait[1]); + VIR_FORCE_CLOSE(cmd->handshakeNotify[0]); + + VIR_DEBUG("Handshake with parent is done"); + return 0; +} + /* * virExec: * @cmd virCommandPtr containing all information about the program to @@ -2348,54 +2394,6 @@ void virCommandRequireHandshake(virCommandPtr cmd) cmd->handshake = true; } -/* virCommandHandshakeChild: - * - * child side of handshake - called by child process in virExec() to - * indicate to parent that the child process has successfully - * completed its pre-exec initialization. - */ -static int -virCommandHandshakeChild(virCommandPtr cmd) -{ - char c = '1'; - int rv; - - if (!cmd->handshake) - return true; - - VIR_DEBUG("Notifying parent for handshake start on %d", - cmd->handshakeWait[1]); - if (safewrite(cmd->handshakeWait[1], &c, sizeof(c)) != sizeof(c)) { - virReportSystemError(errno, "%s", - _("Unable to notify parent process")); - return -1; - } - - VIR_DEBUG("Waiting on parent for handshake complete on %d", - cmd->handshakeNotify[0]); - if ((rv = saferead(cmd->handshakeNotify[0], &c, - sizeof(c))) != sizeof(c)) { - if (rv < 0) - virReportSystemError(errno, "%s", - _("Unable to wait on parent process")); - else - virReportSystemError(EIO, "%s", - _("libvirtd quit during handshake")); - return -1; - } - if (c != '1') { - virReportSystemError(EINVAL, - _("Unexpected confirm code '%c' from parent"), - c); - return -1; - } - VIR_FORCE_CLOSE(cmd->handshakeWait[1]); - VIR_FORCE_CLOSE(cmd->handshakeNotify[0]); - - VIR_DEBUG("Handshake with parent is done"); - return 0; -} - /** * virCommandHandshakeWait: * @cmd: command to wait on -- 1.8.1.2

2 1

[libvirt] [PATCH] conf: Generate agent socket path if missing
by Michal Privoznik 16 Feb '13

16 Feb '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/$domain.agent --- This makes the qemu agent to be generated at domain startup phase. So until that, we generate XML without any path, e.g.: <channel type='unix'> <source mode='connect'/> <target type='virtio' name='org.qemu.guest_agent.0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> The other possibility is to generate path during XML parse phase, however this expose something we are lacking for years - callbacks to fill in default values for not configured ones. The aim so to make libvirt accept this snippet as valid qemu agent config: <channel type='unix'> <target type='virtio' name='org.qemu.guest_agent.0'/> </channel> src/conf/domain_conf.c | 37 ++++++++++++++++++++----------------- src/qemu/qemu_process.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7a2b012..6245fec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6038,7 +6038,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (path == NULL) { + /* path is not required in special case of qemu guest agent */ + if (path == NULL && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + STRNEQ(chr_def->target.name, "org.qemu.guest_agent.0")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); goto error; @@ -6135,7 +6138,6 @@ virDomainChrDefParseXML(virCapsPtr caps, char *type = NULL; const char *nodeName; virDomainChrDefPtr def; - int remaining; bool seenTarget = false; if (!(def = virDomainChrDefNew())) @@ -6159,29 +6161,28 @@ virDomainChrDefParseXML(virCapsPtr caps, } 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(caps, vmdef, 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(caps, vmdef, def, cur) < 0) { + goto error; } + break; } - cur = cur->next; } + cur = cur->next; } if (!seenTarget && ((def->targetType = virDomainChrDefaultTargetType(caps, vmdef, 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", @@ -13307,10 +13308,12 @@ virDomainChrSourceDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_CHR_TYPE_UNIX: + virBufferAsprintf(buf, " <source mode='%s'", def->data.nix.listen ? "bind" : "connect"); - virBufferEscapeString(buf, " path='%s'/>\n", + virBufferEscapeString(buf, " path='%s'", def->data.nix.path); + virBufferAddLit(buf, "/>\n"); break; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4251c34..90f072d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2788,6 +2788,31 @@ qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, return 0; } +static int +qemuProcessPrepareAgentChr(virQEMUDriverConfigPtr cfg, + virDomainObjPtr vm) +{ + virDomainChrSourceDefPtr config = qemuFindAgentConfig(vm->def); + virDomainChrSourceDefPtr newConfing = qemuFindAgentConfig(vm->newDef); + + if (!config) + return 0; + + /* if user hasn't supplied any agent socket path, generate one, + * and store it in inactive config as well */ + if ((config->type == VIR_DOMAIN_CHR_TYPE_UNIX) && + !config->data.nix.path) { + if ((virAsprintf(&config->data.nix.path, "%s/%s.agent", + cfg->libDir, vm->def->name) < 0) || + !(newConfing->data.nix.path = strdup(config->data.nix.path))) { + virReportOOMError(); + return -1; + } + newConfing->data.nix.listen = config->data.nix.listen = true; + } + + return 0; +} /* * Precondition: vm must be locked, and a job must be active. @@ -3772,8 +3797,9 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } - VIR_DEBUG("Preparing monitor state"); - if (qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0) + VIR_DEBUG("Preparing monitor and agent state"); + if ((qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0) || + (qemuProcessPrepareAgentChr(cfg, vm) < 0)) goto cleanup; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) -- 1.8.0.2

5 6

[libvirt] [PATCH V7 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 16 Feb '13

16 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

1 3

[libvirt] [hyperv]: Connection failure
by Ata Bohra 15 Feb '13

15 Feb '13

Hi Everyone, I installed a HyperV server and trying to connect to it using libvirt. As suggested by libvirt driver wiki (http://libvirt.org/drvhyperv.html) I've enabled Basic authentication on the server (and also enabled HTTP connection request for debugging purpose). Even after all this configuration, on connection I get error as: ---------------Enter Administrator's password for 10.y.y.y: xxxxxx 2013-02-14 00:02:25.122+0000: 6825: info : libvirt version: 1.0.2 2013-02-14 00:02:25.122+0000: 6825: error : hypervDebugHandler:1444 : openwsman error: NULL response libvir: Hyper-V Driver error : internal error Transport error during enumeration: Could not connect (7) Failed to open connection libvir: error : invalid connection pointer in virConnectGetHostname Host name: (null) libvir: error : invalid connection pointer in virConnectClose ------------------------------ Hyper-V server configuration looks like:xxx> winrm get winrm/config/serviceServiceROOTSDDL = <long string>MaxConnectionOperations = 4294967295MaxConnectionOperationsPerUser = 1500MaxConnectionTimeoutms = 240000MaxConnections = 300MaxPacketRetrievalTimeSeconds = 120AllowUnencrypted = trueAuth Basic = true ........AllowRemoteAccess = true ------------------------------ I'm have libvirt on ubuntu (3.2.0-37-generic) and openwsman is 2.2.3-oubuntu4 version. Also, I'm using "Administrator" credentials to connect to HyperV server. Please suggest what is missing from my setup. Thanks!Ata

1 1

[libvirt] [PATCH v4 0/2] net: support set source address(es) and ports for NAT
by Natanael Copa 15 Feb '13

15 Feb '13

Changes v4: - barf if 'end' attribute is missing in <address> - update doc to tell how to properly set single address Natanael Copa (2): net: support set public ip range for forward mode nat net: add support for specifying port range for forward mode nat docs/formatnetwork.html.in | 33 ++++++++ src/conf/network_conf.c | 195 ++++++++++++++++++++++++++++++++++++++++++-- src/conf/network_conf.h | 4 + src/network/bridge_driver.c | 32 ++++++++ src/util/viriptables.c | 77 +++++++++++++++-- src/util/viriptables.h | 8 ++ 6 files changed, 335 insertions(+), 14 deletions(-) -- 1.8.1.2

2 6

[libvirt] [PATCHv2 0/5] fix regression in symlink'd qcow2 backing files
by Eric Blake 15 Feb '13

15 Feb '13

See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for more gory details. This fixes a regression introduced in commit 8250783. V1 was here: https://www.redhat.com/archives/libvir-list/2013-February/msg00340.html changes since then: rebase to latest, add a testsuite, split one patch into two for easier review, and push already-acked changes. Eric Blake (5): storage: rearrange functions storage: prepare for refactoring storage: refactor metadata lookup storage: don't follow backing chain symlinks too eagerly storage: test backing chain traversal .gitignore | 1 + src/util/virstoragefile.c | 314 +++++++++++++------------- src/util/virstoragefile.h | 1 + tests/Makefile.am | 6 + tests/virstoragetest.c | 546 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 720 insertions(+), 148 deletions(-) create mode 100644 tests/virstoragetest.c -- 1.8.1.2

2 13

[libvirt] [PATCH] build: more mingw fixes
by Eric Blake 15 Feb '13

15 Feb '13

More mingw build failures: CCLD libvirt-lxc.la /usr/lib64/gcc/i686-w64-mingw32/4.7.2/../../../../i686-w64-mingw32/bin/ld: cannot find libvirt_lxc.def: No such file or directory CC virportallocatortest-virportallocatortest.o ../../tests/virportallocatortest.c: In function 'main': ../../tests/virportallocatortest.c:195:1: error: implicit declaration of function 'setenv' [-Werror=implicit-function-declaration] * src/Makefile.am (GENERATED_SYM_FILES): Also generate libvirt_lxc.def. * bootstrap.conf (gnulib_modules): Import setenv. --- Pushing under the build-breaker rule. bootstrap.conf | 1 + src/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index 4b45a4f..6e03757 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -92,6 +92,7 @@ regex random_r sched send +setenv setsockopt sigaction sigpipe diff --git a/src/Makefile.am b/src/Makefile.am index 0d2f2f8..780cd52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1462,7 +1462,8 @@ EXTRA_DIST += \ libvirt_xenxs.syms \ libvirt_libssh2.syms -GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def +GENERATED_SYM_FILES = \ + libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def BUILT_SOURCES += $(GENERATED_SYM_FILES) -- 1.8.1.2

1 0

[libvirt] [PATCH] build: fix mingw build
by Eric Blake 15 Feb '13

15 Feb '13

Commits 2025356 and ba72cb12 introduced typos. * src/util/virpci.c (virPCIIsVirtualFunction) [!__linux__]: Fix function name. * src/util/virutil.c (virGetDeviceID): Fix attribute spelling. --- Another push under the build-breaker rule. src/util/virpci.c | 4 ++-- src/util/virutil.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index d1881e5..4bb82aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1,7 +1,7 @@ /* * virpci.c: helper APIs for managing host PCI devices * - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2239,7 +2239,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path ATTRIBUTE_UNUSED, } int -virPCIDeviceIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED) +virPCIIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; diff --git a/src/util/virutil.c b/src/util/virutil.c index 55e1b52..7acda77 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3270,9 +3270,9 @@ virGetDeviceID(const char *path, int *maj, int *min) } #else int -virGetDeviceID(const char *path ATRRIBUTE_UNUSED, - int *maj ATRRIBUTE_UNUSED, - int *min ATRRIBUTE_UNUSED) +virGetDeviceID(const char *path ATTRIBUTE_UNUSED, + int *maj ATTRIBUTE_UNUSED, + int *min ATTRIBUTE_UNUSED) { return -ENOSYS; -- 1.8.1.2

1 0

[libvirt] [PATCH] regex: gnulib guarantees that we have regex support
by Eric Blake 15 Feb '13

15 Feb '13

No need to use HAVE_REGEX_H - our use of gnulib guarantees that the header exists and works, regardless of platform. Similarly, we can unconditionally assume a compiling <sys/wait.h> (although the mingw version of this header is not full-featured). * src/storage/storage_backend.c: Drop useless conditional. * tests/testutils.c: Likewise. --- I noticed this while trying to clean up a VPATH test failure. src/storage/storage_backend.c | 6 ++---- tests/testutils.c | 18 +++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index cab72c6..bdddddf 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -25,9 +25,7 @@ #include <string.h> #include <stdio.h> -#if HAVE_REGEX_H -# include <regex.h> -#endif +#include <regex.h> #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> diff --git a/tests/testutils.c b/tests/testutils.c index 9c8f365..7b2ea51 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1,7 +1,7 @@ /* * testutils.c: basic test utils * - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,12 +27,8 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> -#ifndef WIN32 -# include <sys/wait.h> -#endif -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif +#include <sys/wait.h> +#include <regex.h> #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -735,7 +731,6 @@ cleanup: } -#ifdef HAVE_REGEX_H int virtTestClearLineRegex(const char *pattern, char *str) { @@ -779,10 +774,3 @@ int virtTestClearLineRegex(const char *pattern, return 0; } -#else -int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED, - char *str ATTRIBUTE_UNUSED) -{ - return 0; -} -#endif -- 1.8.1.2

1 1

[libvirt] [PATCH] Configure native vlan modes on Open vSwitch ports
by james robson 15 Feb '13

15 Feb '13

This patch adds functionality to allow libvirt to configure the 'native-tagged' and 'native-untagged' modes on openvswitch networks. --- diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ffcc33e..a5054cc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3209,6 +3209,12 @@ qemu-kvm -net nic,model=? /dev/null <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <b><vlan trunk='yes' native_mode='tagged' native_tag='123'></b> + <b><tag id='42'/></b> + <b></vlan></b> + ... + </interface> <devices> ...</pre> @@ -3234,7 +3240,17 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>trunk='yes'</code> can be added to the toplevel vlan element. </p> - + <p> + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + <span class="since">(Since 1.0.2).</span> This uses the optional + <code>native_mode</code> and <code>native_tag</code> attributes + on the <code><vlan></code> element: <code>native_mode</code> + may be set to 'tagged' or 'untagged', <code>native_tag</code> + sets the id of the native vlan. Setting a native vlan implies + this is a trunk port, so <code>trunk='yes'</code> will be added if not + explicitly set. + </p> <h5><a name="elementLink">Modifying virtual link state</a></h5> <pre> ... diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 7b42529..68c562b 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -396,6 +396,12 @@ <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <b><vlan trunk='yes' native_mode='tagged' native_tag='123'></b> + <b><tag id='42'/></b> + <b></vlan></b> + ... + </interface> <devices> ...</pre> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 51ff759..4696f43 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -197,6 +197,21 @@ <value>yes</value> </attribute> </optional> + <optional> + <attribute name="native_mode"> + <choice> + <value>tagged</value> + <value>untagged</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="native_tag"> + <data type="unsignedInt"> + <param name="maxInclusive">4095</param> + </data> + </attribute> + </optional> <oneOrMore> <element name="tag"> <attribute name="id"> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 13ba8c6..618eb4c 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -33,6 +34,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de int ret = -1; xmlNodePtr save = ctxt->node; const char *trunk = NULL; + const char *nativeMode; + unsigned int nativeTag; xmlNodePtr *tagNodes = NULL; int nTags, ii; @@ -73,16 +76,44 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de def->nTags = nTags; - /* now that we know how many tags there are, look for an explicit - * trunk setting. - */ - if (nTags > 1) - def->trunk = true; + def->nativeMode = 0; + def->nativeTag = 0; ctxt->node = node; + if ((nativeMode = virXPathString("string(./@native_mode)", ctxt)) ! = NULL) { + if (STRCASENEQ(nativeMode, "tagged") && STRCASENEQ(nativeMode, "untagged")) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid \"native_mode='%s'\" in <vlan> - " + "native_mode must be 'tagged' or 'untagged'"), nativeMode); + goto error; + } + if (virXPathUInt("string(./@native_tag)", ctxt, &nativeTag) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing or invalid native_tag attribute")); + goto error; + } + if (nativeTag > 4095) { + virReportError(VIR_ERR_XML_ERROR, + _("native_tag %u too large (maximum 4095)"), nativeTag); + goto error; + } + def->nativeMode = STRCASEEQ(nativeMode, "tagged") ? 1 : 2; + def->nativeTag = nativeTag; + } + + /* def->trunk will be set to true if: + * "trunk='yes'" is set in xml + * a native-* vlan mode has been set + * >1 tag has been set */ if ((trunk = virXPathString("string(./@trunk)", ctxt)) != NULL) { def->trunk = STRCASEEQ(trunk, "yes"); if (!def->trunk) { + if (def->nativeMode > 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid configuration in <vlan> - \"trunk='no'\" is " + "not allowed with native_mode")); + goto error; + } if (nTags > 1) { virReportError(VIR_ERR_XML_ERROR, _("invalid \"trunk='%s'\" in <vlan> - trunk='yes' " @@ -97,6 +128,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de goto error; } } + } else if (nTags > 1 || def->nativeMode > 0) { + def->trunk = true; } ret = 0; @@ -122,8 +155,11 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) _("missing vlan tag data")); return -1; } - - virBufferAsprintf(buf, "<vlan%s>\n", def->trunk ? " trunk='yes'" : ""); + if (def->nativeMode == 0) { + virBufferAsprintf(buf, "<vlan%s>\n", def->trunk ? " trunk='yes'" : ""); + } else { + virBufferAsprintf(buf, "<vlan trunk='yes' native_mode='%s' native_tag='%u'>\n", def->nativeMode == 1 ? "tagged" : "untagged", def->nativeTag); + } for (ii = 0; ii < def->nTags; ii++) { virBufferAsprintf(buf, " <tag id='%u'/>\n", def->tag[ii]); } diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 4fe077a..87122b0 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -19,6 +19,7 @@ * Dan Wendlandt <dan(a)nicira.com> * Kyle Mestery <kmestery(a)cisco.com> * Ansis Atteka <aatteka(a)nicira.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -108,9 +109,13 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, virCommandAddArgList(cmd, "--timeout=5", "--", "--may-exist", "add-port", brname, ifname, NULL); - if (virBufferUse(&buf) != 0) + if (virBufferUse(&buf) != 0) { + if (virtVlan->nativeMode > 0) { + virCommandAddArgFormat(cmd, "vlan_mode=%s", virtVlan->nativeMode == 1 ? "native-tagged" : "native-untagged"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + } virCommandAddArgList(cmd, virBufferCurrentContent(&buf), NULL); - + } if (ovsport->profileID[0] == '\0') { virCommandAddArgList(cmd, "--", "set", "Interface", ifname, attachedmac_ex_id, diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 2fe2017..298673d 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -33,6 +34,8 @@ virNetDevVlanClear(virNetDevVlanPtr vlan) { VIR_FREE(vlan->tag); vlan->nTags = 0; + vlan->nativeMode = 0; + vlan->nativeTag = -1; } void @@ -54,7 +57,9 @@ virNetDevVlanEqual(const virNetDevVlanPtr a, const virNetDevVlanPtr b) return false; if (a->trunk != b->trunk || - a->nTags != b->nTags) { + a->nTags != b->nTags || + a->nativeMode != b->nativeMode || + a->nativeTag != b->nativeTag) { return false; } @@ -89,6 +94,8 @@ virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlanPtr src) dst->trunk = src->trunk; dst->nTags = src->nTags; + dst->nativeMode = src->nativeMode; + dst->nativeTag = src->nativeTag; memcpy(dst->tag, src->tag, src->nTags * sizeof(*src->tag)); return 0; } diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index c6b16ef..f0f78f0 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #ifndef __VIR_NETDEV_VLAN_H__ @@ -25,6 +26,8 @@ typedef struct _virNetDevVlan virNetDevVlan; typedef virNetDevVlan *virNetDevVlanPtr; struct _virNetDevVlan { + short int nativeMode; /* 0=off, 1=tagged, 2=untagged */ + unsigned int nativeTag; bool trunk; /* true if this is a trunk */ int nTags; /* number of tags in array */ unsigned int *tag; /* pointer to array of tags */ diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index a3d82b1..93c49d5 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -21,4 +21,13 @@ <parameters profileid='alice-profile'/> </virtualport> </portgroup> + <portgroup name='tagged'> + <vlan native_mode='tagged' native_tag='123'> + <tag id='555'/> + <tag id='444'/> + </vlan> + <virtualport> + <parameters profileid='tagged-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index a3d82b1..ab3d797 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -21,4 +21,13 @@ <parameters profileid='alice-profile'/> </virtualport> </portgroup> + <portgroup name='tagged'> + <vlan trunk='yes' native_mode='tagged' native_tag='123'> + <tag id='555'/> + <tag id='444'/> + </vlan> + <virtualport> + <parameters profileid='tagged-profile'/> + </virtualport> + </portgroup> </network> Protected by Websense Hosted Email Security -- www.websense.com

2 1

[libvirt] [PATCH] qemu: handle not supported writable devices
by Philipp Hahn 15 Feb '13

15 Feb '13

If the running VM contains a writable raw image, creating snapshot fails internally in QEMU, but the error is not detected by libvirt. Success is still reported to the user, who will see the snapshot in libvirt, even they are NOT created by qemu. virsh # qemu-monitor-command --hmp winxp-1 savevm \"test\" Device 'drive-fdc0-0-0' is writable but does not support snapshots. virsh # snapshot-create-as winxp-1 test Domain snapshot test created Since there is no QMP command in QEMU, libvirtd sends a HMP command to the running QEMU and parses the returned text. There only the following 4 strings are detected as errors: src/qemu/qemu_monitor_text.c:2822 # qemuMonitorTextCreateSnapshot() > "Error while creating snapshot" > "No block device can accept snapshots" > "Could not open VM state file" > "Error" + "while writing VM" Since none of them match the above message, libvirt thinks the command succeeded. Add "does not support snapshots" as an additional error condition. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_monitor_text.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index bc0a11d..5880ab9 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2854,6 +2854,10 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name) virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); goto cleanup; } + else if (strstr(reply, "does not support snapshots") != NULL) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); + goto cleanup; + } ret = 0; -- 1.7.10.4

2 2