April 2013 - Devel - libvirt List Archives

[libvirt] [PATCH v1 00/12] Multiple TX queue support
by Michal Privoznik 22 Apr '13

22 Apr '13

Kernel and subsequently QEMU learned multiple transmit queues a while ago. The feature has a nice advantage, it alloes a single guest to transmit multiple flows of network data using multiple CPUs simultaneously which increase traffic bandwidth. A lot. The documentation how to use this is available at [1] or [2]. 1: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/tree/Docume… 2: http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-options.hx;hb=HEAD#l1363 Michal Privoznik (12): Introduce /domain/devices/interface/driver/@queues attribute qemu: Move interface cmd line construction into a separate function qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Adapt command line generation to multiqueue net util: Learn virNetDevTapCreate multiqueue network qemu: Allow multiple vhost-net openings qemu: Rework qemuNetworkIfaceConnect qemu: Adapt qemuDomainAttachNetDevice to multiqueue net qemu: Change qemuOpenVhostNet return value qemu: Adapt qemuBuildInterfaceCommandLine to to multiqueue net qemu: Enable multiqueue network docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 527 +++++++++++++-------- src/qemu/qemu_command.h | 13 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_hotplug.c | 99 ++-- src/qemu/qemu_monitor.c | 78 +-- src/qemu/qemu_monitor.h | 8 +- src/uml/uml_conf.c | 5 +- src/util/virnetdevtap.c | 105 ++-- src/util/virnetdevtap.h | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- .../qemuxml2argv-net-virtio-device.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 50 ++ tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 19 files changed, 616 insertions(+), 339 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml -- 1.8.1.5

1 12

[libvirt] [PATCH v3] qemu: Implement CPUs check against machine type's cpu-max
by Michal Novotny 22 Apr '13

22 Apr '13

Implement check whether (maximum) vCPUs doesn't exceed machine type's cpu-max settings. On older versions of QEMU the check is disabled. Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 38 +++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 +++++++ src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d10c8aa..bbfe85f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,7 @@ struct _virQEMUCaps { size_t nmachineTypes; char **machineTypes; char **machineAliases; + int *machineMaxCpus; }; struct _virQEMUCapsCache { @@ -322,6 +323,7 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, { char *name = qemuCaps->machineTypes[defIdx]; char *alias = qemuCaps->machineAliases[defIdx]; + int cpu_max = qemuCaps->machineMaxCpus[defIdx]; memmove(qemuCaps->machineTypes + 1, qemuCaps->machineTypes, @@ -329,8 +331,12 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, memmove(qemuCaps->machineAliases + 1, qemuCaps->machineAliases, sizeof(qemuCaps->machineAliases[0]) * defIdx); + memmove(qemuCaps->machineMaxCpus + 1, + qemuCaps->machineMaxCpus, + sizeof(qemuCaps->machineMaxCpus[0]) * defIdx); qemuCaps->machineTypes[0] = name; qemuCaps->machineAliases[0] = alias; + qemuCaps->machineMaxCpus[0] = cpu_max; } /* Format is: @@ -377,7 +383,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, } if (VIR_REALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes + 1) < 0 || - VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0) { + VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0 || + VIR_REALLOC_N(qemuCaps->machineMaxCpus, qemuCaps->nmachineTypes + 1) < 0) { VIR_FREE(name); VIR_FREE(canonical); goto no_memory; @@ -390,6 +397,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, qemuCaps->machineTypes[qemuCaps->nmachineTypes-1] = name; qemuCaps->machineAliases[qemuCaps->nmachineTypes-1] = NULL; } + /* Value 0 means "unknown" as it's not exposed by QEMU binary */ + qemuCaps->machineMaxCpus[qemuCaps->nmachineTypes-1] = 0; } while ((p = next)); @@ -1718,6 +1727,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto no_memory; if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0) goto no_memory; + if (VIR_ALLOC_N(ret->machineMaxCpus, qemuCaps->nmachineTypes) < 0) + goto no_memory; ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i]))) @@ -1725,6 +1736,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (qemuCaps->machineAliases[i] && !(ret->machineAliases[i] = strdup(qemuCaps->machineAliases[i]))) goto no_memory; + ret->machineMaxCpus[i] = qemuCaps->machineMaxCpus[i]; } return ret; @@ -1923,6 +1935,25 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, } +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name) +{ + size_t i; + + if (!name) + return 0; + + for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { + if (!qemuCaps->machineMaxCpus[i]) + continue; + if (STREQ(qemuCaps->machineTypes[i], name)) + return qemuCaps->machineMaxCpus[i]; + } + + return 0; +} + + static int virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) @@ -2073,6 +2104,10 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, virReportOOMError(); goto cleanup; } + if (VIR_ALLOC_N(qemuCaps->machineMaxCpus, nmachines) < 0) { + virReportOOMError(); + goto cleanup; + } for (i = 0 ; i < nmachines ; i++) { if (machines[i]->alias) { @@ -2087,6 +2122,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } if (machines[i]->isDefault) defIdx = i; + qemuCaps->machineMaxCpus[i] = machines[i]->cpu_max; } qemuCaps->nmachineTypes = nmachines; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4e76799..bd97e8d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -223,7 +223,8 @@ size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps, char ***names); const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, const char *name); - +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name); int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, size_t *nmachines, virCapsGuestMachinePtr **machines); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f39f009..c097953 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -650,6 +650,7 @@ struct _qemuMonitorMachineInfo { char *name; bool isDefault; char *alias; + int cpu_max; }; int qemuMonitorGetMachines(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6fdd650..adbd865 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4024,6 +4024,13 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } } + + if (virJSONValueObjectHasKey(child, "cpu-max") && + virJSONValueObjectGetNumberInt(child, "cpu-max", &info->cpu_max) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-machines reply has malformed 'cpu-max' data")); + goto cleanup; + } } ret = n; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ce9f501..9eae8f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3266,6 +3266,30 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk) return ret; } +static bool +qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) +{ + int cpu_max; + + cpu_max = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine); + if (!cpu_max) + return true; + + if (def->vcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("CPUs greater than specified machine type limit")); + return false; + } + + if (def->maxvcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("Maximum CPUs greater than specified machine type limit")); + return false; + } + + return true; +} + int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3481,6 +3505,9 @@ int qemuProcessStart(virConnectPtr conn, vm->def->emulator))) goto cleanup; + if (!qemuValidateCpuMax(vm->def, priv->qemuCaps)) + goto cleanup; + if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) goto cleanup; -- 1.7.11.7

1 1

[libvirt] [PATCH] qemu: Fix the wrong expression
by Osier Yang 22 Apr '13

22 Apr '13

Wrong use of the parentheses causes "rc" always having a boolean value, either "1" or "0", and thus we can't get the detailed error message when it fails: Before (I only have 1 node): % virsh numatune f18 --nodeset 12 error: Unable to change numa parameters error: unable to set numa tunable: Unknown error -1 After: virsh numatune f18 --nodeset 12 error: Unable to change numa parameters error: unable to set numa tunable: Invalid argument --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cee5557..0de7ffd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7470,7 +7470,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, continue; } - if ((rc = virCgroupSetCpusetMems(priv->cgroup, nodeset_str) != 0)) { + if ((rc = virCgroupSetCpusetMems(priv->cgroup, nodeset_str)) != 0) { virReportSystemError(-rc, "%s", _("unable to set numa tunable")); virBitmapFree(nodeset); -- 1.8.1.4

2 2

[libvirt] USB pass-through with XEN
by Carlos Rodrigues 19 Apr '13

19 Apr '13

Hello everybody, I try to doing USB pass-through with XEN hypervisor using libvirt and i get the following error: # virsh attach-device c6test /tmp/usb_device.xml error: Failed to attach device from /tmp/usb_device.xml error: unsupported configuration: unsupported device type # cat /tmp/usb_device.xml <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id="0x0529" /> <product id="0x0001" /> </source> </hostdev> But using xm command, the USB pass-through has been successfully # xm usb-add c6test host:0529:0001 I try it on Fedora 17 with libvirt 1.0.4 and xen 4.2.1. Does anyone know how can i do to put libvirt work with XEN USB pass-through? Best regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Engenheiro de Software Sénior Eurotux Informática, S.A. | www.eurotux.com (t) +351 253 680 300

2 1

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

19 Apr '13

The <interface type='bridge'> is working mostly because of a bad design decision in Linux. Ideally, QEMU would run with an empty capability bounding set and would not be able to do any privileged operation (not even by running a helper program). This is not the case because dropping capabilities from the bounding set requires a capability of its own, CAP_SETPCAP; thus QEMU does *not* run with an empty bounding set if invoked via qemu:///session. This series lets libvirtd invoke the privileged helper program on its own, which is a cleaner design that would work even if the above Linux bug was not there. Also, this adds a <target dev='tap0'/> element to the XML of an active domain using <interface type='bridge'>. libvirt now needs to know the path to the helper (patch 3), and must not set permitted/effective capabilities on children when running unprivileged (patches 1/2). Apart from this, the recvfd and virCommand APIs make the task almost trivial. Paolo Bonzini (5): util: simplify virSetUIDGIDWithCaps util: allow using virCommandAllowCap with setuid helpers qemu_conf: add new configuration key bridge_helper virnetdevtap: add virNetDevTapGetName qemu: launch bridge helper from libvirtd src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 8 +++ src/qemu/qemu_command.c | 133 +++++++++++++++++++++++++++---------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_conf.c | 3 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_hotplug.c | 25 +++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virnetdevtap.c | 33 +++++++++ src/util/virnetdevtap.h | 3 + src/util/virutil.c | 36 +++++++--- 12 files changed, 183 insertions(+), 63 deletions(-) -- 1.8.1.4

5 27

[libvirt] [PATCH] docs: fix usage of 'onto'
by Eric Blake 19 Apr '13

19 Apr '13

http://www.uhv.edu/ac/newsletters/writing/grammartip2009.07.01.htm (and several other sites) give hints that 'onto' is best used if you can also add 'up' just before it and still make sense. In many cases in the code base, we really want the two-word form, or even a simplification to just 'on' or 'to'. * docs/hacking.html.in: Use correct 'on to'. * python/libvirt-override.c: Likewise. * src/lxc/lxc_controller.c: Likewise. * src/util/virpci.c: Likewise. * daemon/THREADS.txt: Use simpler 'on'. * docs/formatdomain.html.in: Better usage. * docs/internals/rpc.html.in: Likewise. * src/conf/domain_event.c: Likewise. * src/rpc/virnetclient.c: Likewise. * tests/qemumonitortestutils.c: Likewise. * HACKING: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. daemon/THREADS.txt | 2 +- docs/formatdomain.html.in | 6 +++--- docs/hacking.html.in | 2 +- docs/internals/rpc.html.in | 8 ++++---- python/libvirt-override.c | 4 ++-- src/conf/domain_event.c | 4 ++-- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetclient.c | 4 ++-- src/util/virpci.c | 4 ++-- tests/qemumonitortestutils.c | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/daemon/THREADS.txt b/daemon/THREADS.txt index 6386941..762ca25 100644 --- a/daemon/THREADS.txt +++ b/daemon/THREADS.txt @@ -40,7 +40,7 @@ The server lock is used in conjunction with a condition variable to pass jobs from the event loop thread to the workers. The main event loop thread handles I/O from the client socket, and once a complete RPC message has been read off the wire (and optionally -decrypted), it will be placed onto the 'dx' job queue for the +decrypted), it will be placed on the 'dx' job queue for the associated client object. The job condition will be signalled and a worker will wakup and process it. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cc56d9..888c005 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -741,7 +741,7 @@ <p> Resource partitions are currently supported by the QEMU and - LXC drivers, which map partition paths onto cgroups directories, + LXC drivers, which map partition paths to cgroups directories, in all mounted controllers. <span class="since">Since 1.0.5</span> </p> @@ -2701,7 +2701,7 @@ </p> <p> - Provides a bridge from the VM directly onto the LAN. This assumes + Provides a bridge from the VM directly to the LAN. This assumes there is a bridge device on the host which has one or more of the hosts physical NICs enslaved. The guest VM will have an associated tun device created with a name of vnetN, which can also be overridden with the @@ -2908,7 +2908,7 @@ <dl> <dt><code>profileid</code></dt> <dd>The profile ID contains the name of the port profile that is to - be applied onto this interface. This name is resolved by the port + be applied to this interface. This name is resolved by the port profile database into the network parameters from the port profile, and those network parameters will be applied to this interface. </dd> diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 632d357..99933d1 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -394,7 +394,7 @@ </pre> <p> - However, the moment your loop/if/else body extends onto a second + However, the moment your loop/if/else body extends on to a second line, for whatever reason (even if it's just an added comment), then you should add braces. Otherwise, it would be too easy to insert a statement just before that comment (without adding braces), thinking diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index 4cf1e38..91e8449 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -418,7 +418,7 @@ After a complete packet has been read, the header must be decoded and all 6 fields fully validated, before attempting to dispatch the payload. Once dispatched, the payload can be decoded and passed - onto the appropriate API for execution. The RPC code must not take + on to the appropriate API for execution. The RPC code must not take any action based on the payload, since it has no way to validate the semantics of the payload data. It must delegate this to the execution API (e.g. corresponding libvirt public API). @@ -785,7 +785,7 @@ return value and output parameters, or error object and encode them into a reply packet. Again it does not attempt to do any semantic validation of output data, aside from variable length - field limit checks. The worker thread puts the reply packet onto + field limit checks. The worker thread puts the reply packet on the transmission queue for the client. The worker is now finished and goes back to wait for another incoming method call. </p> @@ -811,10 +811,10 @@ for the worker threads, it is sidetracked into a per-stream processing queue. When the stream becomes writable, queued incoming stream packets will be processed, passing their data - payload onto the stream. Conversely when the stream becomes + payload on the stream. Conversely when the stream becomes readable, chunks of data will be read from it, encoded into new outgoing packets, and placed on the client's transmit - queue + queue. </p> <h4><a name="apiserverdispatchex1">Example with overlapping methods</a></h4> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 3d8490c..244b7ec 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007-2012 Red Hat, Inc. + * Copyright (C) 2005, 2007-2013 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -5084,7 +5084,7 @@ libvirt_virEventRegisterImpl(ATTRIBUTE_UNUSED PyObject * self, updateTimeoutName = py_str(updateTimeoutObj); removeTimeoutName = py_str(removeTimeoutObj); - /* Inc refs since we're holding onto these objects until + /* Inc refs since we're holding on to these objects until * the next call (if any) to this function. */ Py_INCREF(addHandleObj); diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 96a07ac..825012a 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1,7 +1,7 @@ /* * domain_event.c: domain event queue processing helpers * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * * This library is free software; you can redistribute it and/or @@ -1179,7 +1179,7 @@ virDomainEventPtr virDomainEventBalloonChangeNewFromObj(virDomainObjPtr obj, * @evtQueue: the dom event queue * @event: the event to add * - * Internal function to push onto the back of a virDomainEventQueue + * Internal function to push to the back of a virDomainEventQueue * * Returns: 0 on success, -1 on failure */ diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index f46f813..740b872 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1699,7 +1699,7 @@ int main(int argc, char *argv[]) _exit(0); } - /* Don't hold onto any cwd we inherit from libvirtd either */ + /* Don't hold on to any cwd we inherit from libvirtd either */ if (chdir("/") < 0) { virReportSystemError(errno, "%s", _("Unable to change to root dir")); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 010c5c3..1d228f0 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1,7 +1,7 @@ /* * virnetclient.c: generic network RPC client * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1771,7 +1771,7 @@ static int virNetClientIO(virNetClientPtr client, goto cleanup; } - /* Grr, someone passed the buck onto us ... */ + /* Grr, someone passed the buck to us ... */ } else { client->haveTheBuck = true; } diff --git a/src/util/virpci.c b/src/util/virpci.c index d94ff54..0fcf8ca 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1208,7 +1208,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev, * condition where the hypervisor is still cleaning up the device while * libvirt is trying to re-attach it to the host device driver. To avoid * this situation, we look through /proc/iomem, and if the hypervisor is - * still holding onto the bar (denoted by the string in the matcher variable), + * still holding on to the bar (denoted by the string in the matcher variable), * then we can wait around a bit for that to clear up. * * A typical /proc/iomem looks like this (snipped for brevity): @@ -1230,7 +1230,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev, * f0000000-f0003fff : kvm_assigned_device * * Returns 0 if we are clear to continue, and 1 if the hypervisor is still - * holding onto the resource. + * holding on to the resource. */ int virPCIDeviceWaitForCleanup(virPCIDevicePtr dev, const char *matcher) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index fe98813..43e7cb9 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -77,7 +77,7 @@ struct _qemuMonitorTest { static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item); /* - * Appends data for a reply onto the outgoing buffer + * Appends data for a reply to the outgoing buffer */ static int qemuMonitorTestAddReponse(qemuMonitorTestPtr test, const char *response) -- 1.8.1.4

1 0

[libvirt] [PATCH] audit: properly encode device path in cgroup audit
by Eric Blake 19 Apr '13

19 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=922186 Commit d04916fa introduced a regression in audit quality - even though the code was computing the proper escaped name for a path, it wasn't feeding that escaped name on to the audit message. As a result, /var/log/audit/audit.log would mention a field path=/dev/hpet instead of the intended path="/dev/hpet", which in turn caused ausearch to format the audit log as path=(null). * src/conf/domain_audit.c (virDomainAuditCgroupPath): Use constructed encoding. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A rather embarrassing bug of mine, especially since it took two years to find that such a trivial fix was needed. src/conf/domain_audit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 85d97b4..6d0ae48 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -1,7 +1,7 @@ /* * domain_audit.c: Domain audit management * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -682,8 +682,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupPtr cgroup, rdev = virDomainAuditGetRdev(path); if (!(detail = virAuditEncode("path", path)) || - virAsprintf(&extra, "path path=%s rdev=%s acl=%s", - path, VIR_AUDIT_STR(rdev), perms) < 0) { + virAsprintf(&extra, "path %s rdev=%s acl=%s", + detail, VIR_AUDIT_STR(rdev), perms) < 0) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } -- 1.8.1.4

2 2

[libvirt] [PATCH v2 00/11] qemu: add PCI bridge support
by Ján Tomko 19 Apr '13

19 Apr '13

Add new 'pci' controller type with two models: pci-root - auto-added to a pc* machine, providing pci bus 0 pci-bridge - auto-added if the devices would not leave at least one slot empty on bus 0 or bus >0 is specified Ján Tomko (10): qemu: make qemuComparePCIDevice aware of multiple buses qemu: print PCI address hexadecimally in errors qemu: QEMU_PCI constant consistency qemu: move PCI address check out of qemuPCIAddressAsString qemu: switch PCI address set from hash table to an array qemu: rename CheckSlot to SlotInUse conf: add model attribute to virDomainDefMaybeAddController conf: add PCI controllers qemu: auto-add bridges and allow using them qemu: auto-add pci-root controller for pc machine types liguang (1): qemu: build command line for pci-bridge device docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 63 ++- src/conf/domain_conf.h | 14 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 477 +++++++++++++-------- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_domain.c | 37 ++ src/qemu/qemu_hotplug.c | 4 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/qemuhelptest.c | 21 +- .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 1 + .../qemuxml2argv-blkiotune-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 1 + .../qemuxml2argv-boot-menu-disable.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 1 + .../qemuxml2argv-channel-guestfwd.xml | 1 + .../qemuxml2argv-channel-virtio.xml | 1 + .../qemuxml2argv-clock-localtime.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 1 + .../qemuxml2argv-console-compat.xml | 1 + .../qemuxml2argv-console-virtio-many.xml | 1 + .../qemuxml2argv-controller-order.xml | 1 + .../qemuxml2argv-cpu-eoi-disabled.xml | 1 + .../qemuxml2argv-cpu-eoi-enabled.xml | 1 + .../qemuxml2argv-cpu-host-kvmclock.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 1 + .../qemuxml2argv-disk-cdrom-empty.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 1 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 1 + .../qemuxml2argv-disk-drive-boot-disk.xml | 1 + .../qemuxml2argv-disk-drive-cache-directsync.xml | 1 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 1 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 1 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 1 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 1 + .../qemuxml2argv-disk-drive-fat.xml | 1 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 1 + .../qemuxml2argv-disk-drive-network-gluster.xml | 1 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 1 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-export.xml | 1 + ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 1 + .../qemuxml2argv-disk-scsi-device.xml | 1 + .../qemuxml2argv-disk-scsi-disk-vpd.xml | 1 + ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 1 + .../qemuxml2argv-disk-scsi-megasas.xml | 1 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 1 + .../qemuxml2argv-disk-scsi-vscsi.xml | 1 + .../qemuxml2argv-disk-source-pool.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 1 + .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 1 + .../qemuxml2argv-encrypted-disk.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 1 + .../qemuxml2argv-floppy-drive-fat.xml | 1 + .../qemuxml2argv-graphics-listen-network.xml | 1 + .../qemuxml2argv-graphics-sdl-fullscreen.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 1 + .../qemuxml2argv-graphics-spice-compression.xml | 1 + .../qemuxml2argv-graphics-spice-qxl-vga.xml | 1 + .../qemuxml2argv-graphics-spice.xml | 1 + .../qemuxml2argv-graphics-vnc-sasl.xml | 1 + .../qemuxml2argv-graphics-vnc-socket.xml | 1 + .../qemuxml2argv-graphics-vnc-tls.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 1 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argv-hostdev-usb-address.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 1 + .../qemuxml2argv-input-usbmouse.xml | 1 + .../qemuxml2argv-input-usbtablet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 1 + .../qemuxml2argv-machine-core-off.xml | 1 + .../qemuxml2argv-machine-core-on.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 1 + .../qemuxml2argv-misc-disable-s3.xml | 1 + .../qemuxml2argv-misc-disable-suspends.xml | 1 + .../qemuxml2argv-misc-enable-s4.xml | 1 + .../qemuxml2argv-misc-no-reboot.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + .../qemuxml2argv-net-openvswitch.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-device.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 1 + .../qemuxml2argv-nographics-vga.xml | 1 + .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 1 + .../qemuxml2argv-qemu-ns-no-env.xml | 1 + .../qemuxml2argv-reboot-timeout-disabled.xml | 1 + .../qemuxml2argv-reboot-timeout-enabled.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 1 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 1 + .../qemuxml2argv-seclabel-dynamic-override.xml | 1 + .../qemuxml2argv-seclabel-none.xml | 1 + .../qemuxml2argv-seclabel-static.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 1 + .../qemuxml2argv-serial-tcp-telnet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 1 + .../qemuxml2argv-tpm-passthrough.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 1 + .../qemuxml2argv-virtio-rng-egd.xml | 1 + .../qemuxml2argv-virtio-rng-random.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 1 + .../qemuxml2xmlout-balloon-device-auto.xml | 1 + .../qemuxml2xmlout-channel-virtio-auto.xml | 1 + .../qemuxml2xmlout-console-compat-auto.xml | 1 + .../qemuxml2xmlout-console-virtio.xml | 1 + .../qemuxml2xmlout-disk-mirror.xml | 1 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 1 + .../qemuxml2xmlout-graphics-listen-network2.xml | 1 + .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 1 + ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 1 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 1 + .../qemuxml2xmlout-serial-target-port-auto.xml | 1 + .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 1 + 168 files changed, 574 insertions(+), 211 deletions(-) -- 1.8.1.5

3 33

[libvirt] [PATCHv2] conf: Reword error message to be more universal
by Peter Krempa 19 Apr '13

19 Apr '13

The error message that warns user when a request to chagne/get persistent configuration of a transient domain is requested suggests that changes are being made. Reword it to be more universal and allow it to be used for getter APIs too. Before: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: cannot change persistent config of a transient domain After: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: transient domains do not have any persistent config --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..758f416 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2251,8 +2251,8 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, if (*flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!dom->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient domain")); + _("transient domains do not have any " + "persistent config")); goto cleanup; } if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) { -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Enable the capability bit for -no-kvm-pit-reinjection on x86 only
by Viktor Mihajlovski 19 Apr '13

19 Apr '13

From: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> On architectures not supporting the Intel specific programmable interval timer, like e.g. S390, starting a domain with a clock definition containing a pit timer results in the error "Option no-kvm-pit-reinjection not supported for this target". By moving the capability enablement for -no-kvm-pit-reinjection from the InitQMPBasic section into the x86_64 and i686 only enablement section all other architectures are no longer automatically enabled. In addition architecture related capabilities enablements were refactored into a new architecture bound capabilities initialization function. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 55 ++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a95f23c..028e77c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2367,13 +2367,48 @@ 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); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); } +/* Capabilities that are architecture depending + * initialized for QEMU. + */ +static int +virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + char *archstr = NULL; + int ret = -1; + + if (!(archstr = qemuMonitorGetTargetArch(mon))) + return -1; + + if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown QEMU arch %s"), archstr); + goto cleanup; + } + + /* + * Currently only x86_64 and i686 support PCI-multibus, + * -no-acpi and -no-kvm-pit-reinjection. + */ + if (qemuCaps->arch == VIR_ARCH_X86_64 || + qemuCaps->arch == VIR_ARCH_I686) { + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); + } + + ret = 0; + +cleanup: + VIR_FREE(archstr); + return ret; +} static int virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, @@ -2391,7 +2426,6 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, char *monarg = NULL; char *monpath = NULL; char *pidfile = NULL; - char *archstr; pid_t pid = 0; virDomainObj vm; @@ -2508,23 +2542,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); - if (!(archstr = qemuMonitorGetTargetArch(mon))) - goto cleanup; - - if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown QEMU arch %s"), archstr); - VIR_FREE(archstr); + if (virQEMUCapsInitArchQMPBasic(qemuCaps, mon) < 0) goto cleanup; - } - VIR_FREE(archstr); - - /* Currently only x86_64 and i686 support PCI-multibus and -no-acpi. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); - } if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; -- 1.7.9.5

1 0