- Devel - libvirt List Archives

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

27 Apr '13

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

1 0

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

27 Apr '13

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

2 15

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

27 Apr '13

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

2 4

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

27 Apr '13

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

3 6

[libvirt] [PATCH-v4 0/2] Static Route related updates
by Gene Czarcinski 27 Apr '13

27 Apr '13

This update includes two patch files: 1. The first file adds virSocketAddrGetIpPrefix() to determine the prefix for a network. This function is used by the static route code and has also been used to update (replace the code in) virNetworkIpDefPrefix() in src/conf/network_conf.c 2. The second and major update adds functionality to implement static route for both IPv4 and IPv6. Having static route provides the routing information needed to forward packets not directly reachable from a host. As far as I can determine, this update has adopted all suggestions made against the previous version (except that I am still using CommandRun ... that will be addressed in a future update). I also plan to take a look at <ip> processing such as handling ULong return codes. I also raise the question as to whether address= should be manditory rather than (currently) optional ... I am not sure what <ip> means with address= being optional. Gene Czarcinski (2): create virSocketAddrGetIpPrefix utility function Support for static routes on a virtual bridge docs/formatnetwork.html.in | 80 +++++ docs/schemas/network.rng | 22 ++ src/conf/network_conf.c | 364 +++++++++++++++++++-- src/conf/network_conf.h | 20 ++ src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 41 +++ src/util/virnetdev.c | 44 +++ src/util/virnetdev.h | 5 + src/util/virsocketaddr.c | 43 +++ src/util/virsocketaddr.h | 3 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 2 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 2 + 12 files changed, 600 insertions(+), 28 deletions(-) -- 1.8.1.4

3 11

[libvirt] [PATCH] qemu: don't assign a PCI address to 'none' USB controller
by Ján Tomko 27 Apr '13

27 Apr '13

--- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9737609..126cced 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1925,6 +1925,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue; + /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue; + /* FDC lives behind the ISA bridge; CCID is a usb device */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC || def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_CCID) -- 1.8.1.5

3 5

[libvirt] libvirtd segfault
by AL13N 27 Apr '13

27 Apr '13

regarding http://www.redhat.com/archives/libvir-list/2012-December/msg01365.html and https://www.redhat.com/archives/libvir-list/2012-December/msg00935.html This seems like the problem i'm having... is there a permanent solution for this? (i'm using libvirtd with XEN using libxl) almost every time i shutdown a domain libvirtd segfaults...

4 13

[libvirt] [PATCH] fix segfault during virsh save in pv guest
by Bamvor Jian Zhang 27 Apr '13

27 Apr '13

this patch fix the wrong sequence for fd and timeout register. the sequence was right in dfa1e1dd for fd register, but it changed in e0622ca2. in this patch, set priv, xl_priv in info and increase info->priv ref count before virEventAddHandle. if do this after virEventAddHandle, the fd callback or fd deregister maybe got the empty priv, xl_priv or wrong ref count. after apply this patch, test more than 100 rounds passed compare to fail within 3 rounds without this patch. each round includes define -> start -> destroy -> create -> suspend -> resume -> reboot -> shutdown -> save -> resotre -> dump -> destroy -> create -> setmem -> setvcpus -> destroy. Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- src/libxl/libxl_driver.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b4f1889..212d0fc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -181,26 +181,28 @@ libxlFDRegisterEventHook(void *priv, int fd, void **hndp, return -1; } + info->priv = priv; + /* + * Take a reference on the domain object. Reference is dropped in + * libxlEventHookInfoFree, ensuring the domain object outlives the fd + * event objects. + */ + virObjectRef(info->priv); + info->xl_priv = xl_priv; + if (events & POLLIN) vir_events |= VIR_EVENT_HANDLE_READABLE; if (events & POLLOUT) vir_events |= VIR_EVENT_HANDLE_WRITABLE; + info->id = virEventAddHandle(fd, vir_events, libxlFDEventCallback, info, libxlEventHookInfoFree); if (info->id < 0) { + virObjectUnref(info->priv); VIR_FREE(info); return -1; } - info->priv = priv; - /* - * Take a reference on the domain object. Reference is dropped in - * libxlEventHookInfoFree, ensuring the domain object outlives the fd - * event objects. - */ - virObjectRef(info->priv); - - info->xl_priv = xl_priv; *hndp = info; return 0; @@ -283,6 +285,15 @@ libxlTimeoutRegisterEventHook(void *priv, return -1; } + info->priv = priv; + /* + * Also take a reference on the domain object. Reference is dropped in + * libxlEventHookInfoFree, ensuring the domain object outlives the timeout + * event objects. + */ + virObjectRef(info->priv); + info->xl_priv = xl_priv; + gettimeofday(&now, NULL); timersub(&abs_t, &now, &res); /* Ensure timeout is not overflowed */ @@ -296,22 +307,14 @@ libxlTimeoutRegisterEventHook(void *priv, info->id = virEventAddTimeout(timeout, libxlTimerCallback, info, libxlEventHookInfoFree); if (info->id < 0) { + virObjectUnref(info->priv); VIR_FREE(info); return -1; } - info->priv = priv; - /* - * Also take a reference on the domain object. Reference is dropped in - * libxlEventHookInfoFree, ensuring the domain object outlives the timeout - * event objects. - */ - virObjectRef(info->priv); - virObjectLock(info->priv); LIBXL_EV_REG_APPEND(info->priv->timerRegistrations, info); virObjectUnlock(info->priv); - info->xl_priv = xl_priv; *hndp = info; return 0; -- 1.6.0.2

2 1

[libvirt] KVM Forum 2013 Save the Date
by KVM-Forum-2013-PC＠redhat.com 27 Apr '13

27 Apr '13

KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. The oVirt Workshop will run in parallel with the KVM Forum again, bringing in a community focused on enterprise datacenter virtualization management built on KVM. So mark your calendar and join us in advancing KVM. Once again we are colocated with The Linux Foundation's LinuxCon Europe, this year in Edinburgh. Date: October 21-23, 2013 Location: Edinburgh International Conference Centre - Edinburgh, UK Details regarding registration and proposal submission are forthcoming. thanks, -KVM Forum 2013 Program Commitee

1 0

[libvirt] [PATCH 0/4] Remaining patches from VFIO series
by Laine Stump 27 Apr '13

27 Apr '13

I've pushed everything else from all 3 VFIO series. Patch 1/4 in this series had questions from Eric about whether it is the right way to go, or if we want to do something more limited: https://www.redhat.com/archives/libvir-list/2013-April/msg01864.html Eric and danpb had both raised issues with Patch 2/4, so I redid it addressing all the points they brought up, and it's now ready for review: https://www.redhat.com/archives/libvir-list/2013-April/msg01853.html https://www.redhat.com/archives/libvir-list/2013-April/msg01869.html 3/4 and 4/4 were ACKed, but depend on 2/4, so I couldn't push them. If these patches are ACKed and DV wants to make the RC1 snapshot before I wake up, anyone else feel free to push these 4 patches as they are (assuming they're ACKed, of course :-) Laine Stump (4): util: new virCommandSetMax(MemLock|Processes|Files) qemu: use new virCommandSetMax(Processes|Files) qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used qemu: add VFIO devices to cgroup ACL configure.ac | 2 +- src/libvirt_private.syms | 6 ++ src/qemu/qemu_cgroup.c | 11 ++++ src/qemu/qemu_command.c | 25 +++++--- src/qemu/qemu_hotplug.c | 27 ++++++--- src/qemu/qemu_process.c | 38 +----------- src/util/vircommand.c | 38 ++++++++++++ src/util/vircommand.h | 4 ++ src/util/virprocess.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- src/util/virprocess.h | 5 +- 10 files changed, 255 insertions(+), 53 deletions(-) -- 1.7.11.7

3 13

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 26 Apr '13

26 Apr '13

Overall status: failed Start date: Fri Apr 26 2013 Start time: 12:45:58 UTC / 13:45:58 BST Build counter: 1366980358 Build timestamp: 1366980358 URL: http://dhcp74-229.virt.bos.redhat.com/index.html Module: libvirt Status: failed URL: http://dhcp74-229.virt.bos.redhat.com/module-libvirt.html

2 1

[libvirt] [PATCH] S390: Add fake PCI root
by Viktor Mihajlovski 26 Apr '13

26 Apr '13

For the time being add a PCI root for s390 to avoid getting issues later on with PCI address checking. I don't want to unconditionally switch off PCI for s390. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d927716..a00536f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -700,6 +700,8 @@ qemuDomainDefPostParse(virDomainDefPtr def, case VIR_ARCH_PPCEMB: case VIR_ARCH_SH4: case VIR_ARCH_SH4EB: + case VIR_ARCH_S390: + case VIR_ARCH_S390X: addPCIRoot = true; break; default: -- 1.7.9.5

3 4

[libvirt] [PATCH] qemu: assume virtio-memballon without an address to be PCI
by Ján Tomko 26 Apr '13

26 Apr '13

When doing XML-to-native conversion, addresses are not assigned. The code building memballon device string assumed they are and returned an error without reporting any error message, leading to: error: An error occurred, but the cause is unknown Assume that address type none means it's a PCI device, as we do for other virtio devices. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=957077 --- This still leaves XML-to-native conversion broken for S390 machines, not just for memballon, but for other virtio devices as well. Should we assign addresses in DomainXMLToNative as well, or just decide which virtio device to add based on the machine type? src/qemu/qemu_command.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f6b61b..6e1fff2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4083,14 +4083,12 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virBuffer buf = VIR_BUFFER_INITIALIZER; switch (dev->info.type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - virBufferAddLit(&buf, "virtio-balloon-pci"); - break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: virBufferAddLit(&buf, "virtio-balloon-ccw"); break; default: - goto error; + virBufferAddLit(&buf, "virtio-balloon-pci"); + break; } virBufferAsprintf(&buf, ",id=%s", dev->info.alias); -- 1.8.1.5

3 2

[libvirt] [PATCH 0/3] Honour standards for cgroup naming/escaping
by Daniel P. Berrange 26 Apr '13

26 Apr '13

In discussions with the systemd team, we deciced we needed some clearer rules on cgroup naming / escaping, to ensure there are never clashes with filenames owned by the kernel. This series makes the changes required to libvirt

2 10

[libvirt] [PATCH v2] test: Add JSON test for query-tpm-types
by Stefan Berger 26 Apr '13

26 Apr '13

Add a test case for query-tpm-models QMP command. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- tests/qemumonitorjsontest.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 24685c7..6f42598 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -25,6 +25,7 @@ #include "qemu/qemu_conf.h" #include "virthread.h" #include "virerror.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -440,6 +441,59 @@ cleanup: static int +testQemuMonitorJSONGetTPMModels(const void *data) +{ + const virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNew(true, xmlopt); + int ret = -1; + char **tpmmodels = NULL; + int ntpmmodels = 0; + + if (!test) + return -1; + + if (qemuMonitorTestAddItem(test, "query-tpm-models", + "{ " + " \"return\": [ " + " \"passthrough\"" + " ]" + "}") < 0) + goto cleanup; + + if ((ntpmmodels = qemuMonitorGetTPMModels(qemuMonitorTestGetMonitor(test), + &tpmmodels)) < 0) + goto cleanup; + + if (ntpmmodels != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "ntpmmodels %d is not 1", ntpmmodels); + goto cleanup; + } + +#define CHECK(i, wantname) \ + do { \ + if (STRNEQ(tpmmodels[i], (wantname))) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + "name %s is not %s", \ + tpmmodels[i], (wantname)); \ + goto cleanup; \ + } \ + } while (0) + + CHECK(0, "passthrough"); + +#undef CHECK + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + virStringFreeList(tpmmodels); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -465,6 +519,7 @@ mymain(void) DO_TEST(GetMachines); DO_TEST(GetCPUDefinitions); DO_TEST(GetCommands); + DO_TEST(GetTPMModels); virObjectUnref(xmlopt); -- 1.7.11.7

2 2

[libvirt] [PATCH] virsh: suppress aliases in group help
by Eric Blake 26 Apr '13

26 Apr '13

'virsh help | grep nodedev-det' shows only nodedev-detach, but 'virsh help nodedev | grep nodedev-det' also shows the older alias that we intentionally hid in commit af3f9aab. See also commit 787f4fe and this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=956966 * tools/virsh.c (vshCmdGrpHelp): Copy suppression of vshCmdHelp. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 4cd93ca..6ec2f7b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1177,6 +1177,8 @@ vshCmdGrpHelp(vshControl *ctl, const char *grpname) grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) { + if (cmd->flags & VSH_CMD_FLAG_ALIAS) + continue; vshPrint(ctl, " %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); } -- 1.8.1.4

2 2

[libvirt] [question] Why doesn't virsh command support an optional parameter
by Zhang Xiaohe 26 Apr '13

26 Apr '13

hi guys, It's hard for me to understand why doesn't virsh command support an optional parameter because I think omitting a parameter and offering a default value sometimes is quite convenient. For example: $ virsh shutdown guest --mode acpi The option --mode only accept string "acpi", "agent", "initctl" and "signal", assuming that "acpi" is the most frequently used parameter when --mode is specified, why not just using $ virsh shutdown guest --mode acpi instead. Maybe this example is not very precise, but what I mean is if there is an option which only accepts several candidate values and one of the value is always used when it is specified, then we can make it the default parameter of this option. This would be convenient and save some typing. Of course, this can also result in ambiguity to people who is not familiar with the command. But with the help, it won't trap one very long, will it? So, why doesn't virsh support this and what do you think of adding this feature? Thanks Zhang Xiaohe

2 2

[libvirt] [libvirt-perl][PATCH] Fix typo in domain help page
by Zhe Peng 26 Apr '13

26 Apr '13

The help page of $dom->set_metadata have a typo,this patch fix it. --- lib/Sys/Virt/Domain.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index a502029..053f127 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -112,7 +112,7 @@ C<$flags> parameter defaults to zero. Sets the metadata element of type C<$type> to hold the value C<$val>. If C<$type> is C<Sys::Virt::Domain::METADATA_ELEMENT> then the C<$key> and C<$uri> elements specify an XML namespace -to use, otherwise they should both be C<nudef>. The optional +to use, otherwise they should both be C<undef>. The optional C<$flags> parameter defaults to zero. =item $dom->is_active() -- 1.7.7.6

1 0

[libvirt] [PATCH 0/8] VDIO support part 3
by Laine Stump 26 Apr '13

26 Apr '13

This *almost* completes VFIO support. I still need to add a couple of xml/args test cases. Laine Stump (8): util: new function virPCIDeviceGetVFIOGroupDev security: update hostdev labelling functions for VFIO qemu: add VFIO devices to cgroup ACL qemu: add QEMU_CAPS_VFIO_PCI_BOOTINDEX qemu: use vfio-pci on commandline when appropriate util: new virCommandSetMax(MemLock|Processes|Files) qemu: use new virCommandSetMax(Processes|Files) qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used configure.ac | 2 +- src/libvirt_private.syms | 7 ++ src/qemu/qemu_capabilities.c | 7 ++ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_cgroup.c | 11 +++ src/qemu/qemu_command.c | 56 ++++++++++++--- src/qemu/qemu_hotplug.c | 23 +++++- src/qemu/qemu_process.c | 38 +--------- src/security/security_apparmor.c | 12 +++- src/security/security_dac.c | 27 +++++++- src/security/security_selinux.c | 24 ++++++- src/util/vircommand.c | 38 ++++++++++ src/util/vircommand.h | 4 ++ src/util/virpci.c | 34 +++++++++ src/util/virpci.h | 2 + src/util/virutil.c | 146 +++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 4 ++ 17 files changed, 382 insertions(+), 55 deletions(-) -- 1.7.11.7

3 24

[libvirt] [PATCH 0/7] VFIO support part 2
by Laine Stump 26 Apr '13

26 Apr '13

More patches to go on top of the 3 patches yesterday. These patches add a new API that I just learned was necessary - virNodeDeviceDetachFlags() (explanation in patches), implement it for xen and qemu, and use it in virsh. Laine Stump (7): pci: keep a stubDriver in each virPCIDevice qemu: bind/unbind stub driver according to config <driver name='x'/> hypervisor api: new virNodeDeviceDetachFlags hypervisor api: implement RPC calls for virNodeDeviceDetachFlags qemu: implement virNodeDeviceDetachFlags backend xen: implement virNodeDeviceDetachFlags backend virsh: use new virNodeDeviceDetachFlags include/libvirt/libvirt.h.in | 5 +++- src/driver.h | 6 ++++ src/libvirt.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 ++ src/libvirt_public.syms | 5 ++++ src/qemu/qemu_driver.c | 25 ++++++++++++++-- src/qemu/qemu_hostdev.c | 22 ++++++++++++-- src/remote/remote_driver.c | 34 +++++++++++++++++++++- src/remote/remote_protocol.x | 15 ++++++++-- src/remote_protocol-structs | 6 ++++ src/util/virpci.c | 19 ++++++++++++ src/util/virpci.h | 5 +++- src/xen/xen_driver.c | 25 ++++++++++++++-- tools/virsh-nodedev.c | 28 +++++++++++++----- 14 files changed, 246 insertions(+), 20 deletions(-) -- 1.7.11.7

3 15

[libvirt] [PATCH 0/3] start of patches to support VFIO device assignment
by Laine Stump 26 Apr '13

26 Apr '13

This work isn't finished, but since there's a freeze coming up in a few days, I thought I should send these patches that *are* finished to get them out of the way before the last minute rush. Patch 1 is trivial. Patch 2 is longer, but completely mechanical (NOTE: there may be some uses of that struct living in code that I lack the environment to compile for, so test builds by people with odd platforms would be appreciated!) Patch 3 is standard parser/formatter/RNG/docs for the new XML. I haven't added any test cases, because lacking backend functionality I could only test xml-to-xml, which would require adding yet another test xml file, and I'd rather wait until the backend commandline-building code is in place, then simply add the new element to a few existing test XML files. In email awhile ago, danpb had suggested <driver name='vfio|qemu'/> I've used <driver name='kvm'/> because, unlike vhost-net where <driver name='qemu'/> indicates that the driver used is in the usermode qemu process (and *not* in the kernel), in this case <driver name='kvm'/> indicates that the driver used is in the kernel (and I've seen it referenced in several places as being "done by KVM", but never as "done by QEMU" (makes sense, since qemu is all in userland) Laine Stump (3): qemu: detect vfio-pci device assignment support conf: put hostdev pci address in a struct conf: formatter/parser/RNG/docs for hostdev <driver name='kvm|vfio'/> docs/formatdomain.html.in | 42 ++++++++++++++++++++- docs/formatnetwork.html.in | 15 ++++++++ docs/schemas/domaincommon.rng | 79 ++++++++++++++++++++++++++-------------- docs/schemas/network.rng | 11 ++++++ src/conf/domain_audit.c | 8 ++-- src/conf/domain_conf.c | 48 +++++++++++++++++++++--- src/conf/domain_conf.h | 15 +++++++- src/network/bridge_driver.c | 24 ++++++------ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 34 ++++++++--------- src/qemu/qemu_hostdev.c | 42 ++++++++++----------- src/qemu/qemu_hotplug.c | 14 +++---- src/security/security_apparmor.c | 8 ++-- src/security/security_dac.c | 16 ++++---- src/security/security_selinux.c | 16 ++++---- src/security/virt-aa-helper.c | 10 ++--- src/xen/xend_internal.c | 10 ++--- src/xenxs/xen_sxpr.c | 16 ++++---- src/xenxs/xen_xm.c | 16 ++++---- 20 files changed, 286 insertions(+), 142 deletions(-) -- 1.7.11.7

2 8

[libvirt] [PATCH] build: avoid unsafe functions in libgen.h
by Eric Blake 26 Apr '13

26 Apr '13

POSIX says that both basename() and dirname() may return static storage (aka they are not thread-safe); and that they may but not must modify their input argument. Furthermore, <libgen.h> is not available on all platforms. For these reasons, you should never use these functions in a multi-threaded library. Gnulib instead recommends a way to avoid the portability nightmare: gnulib's "dirname.h" provides useful counterparts. The obvious dir_name() and base_name() are GPL (because they malloc(), but call exit() on failure) so we can't use them; but the LGPL variants mdir_name() (malloc's or returns NULL) and last_component (always points into the incoming string without modifying it, differing from basename semantics only on corner cases like the empty string that we shouldn't be hitting in the first place) are already in use in libvirt. This finishes the swap over to the safe functions. * cfg.mk (sc_prohibit_libgen): New rule. * src/util/vircgroup.c: Fix offenders. * src/parallels/parallels_storage.c (parallelsPoolAddByDomain): Likewise. * src/parallels/parallels_network.c (parallelsGetBridgedNetInfo): Likewise. * src/node_device/node_device_udev.c (udevProcessSCSIHost) (udevProcessSCSIDevice): Likewise. * src/storage/storage_backend_disk.c (virStorageBackendDiskDeleteVol): Likewise. * src/util/virpci.c (virPCIGetDeviceAddressFromSysfsLink): Likewise. * src/util/virstoragefile.h (_virStorageFileMetadata): Avoid false positive. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Spotted during a review of Laine's pending work. cfg.mk | 6 ++++++ src/node_device/node_device_udev.c | 7 ++++--- src/parallels/parallels_network.c | 4 +++- src/parallels/parallels_storage.c | 8 ++++---- src/storage/storage_backend_disk.c | 5 +++-- src/util/vircgroup.c | 3 +-- src/util/virpci.c | 3 ++- src/util/virstoragefile.h | 2 +- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/cfg.mk b/cfg.mk index ebb6613..f0f78f5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -493,6 +493,12 @@ sc_prohibit_gethostby: halt='use getaddrinfo, not gethostby*' \ $(_sc_search_regexp) +# dirname and basename from <libgen.h> are not required to be thread-safe +sc_prohibit_libgen: + @prohibit='( (base|dir)name *\(|include .libgen\.h)' \ + halt='use functions from gnulib "dirname.h", not <libgen.h>' \ + $(_sc_search_regexp) + # raw xmlGetProp requires some nasty casts sc_prohibit_xmlGetProp: @prohibit='\<xmlGetProp *\(' \ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 92292be..f98841e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1,7 +1,7 @@ /* * node_device_udev.c: node device enumeration - libudev implementation * - * 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 @@ -26,6 +26,7 @@ #include <scsi/scsi.h> #include <c-ctype.h> +#include "dirname.h" #include "node_device_udev.h" #include "virerror.h" #include "node_device_conf.h" @@ -653,7 +654,7 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, union _virNodeDevCapData *data = &def->caps->data; char *filename = NULL; - filename = basename(def->sysfs_path); + filename = last_component(def->sysfs_path); if (!STRPREFIX(filename, "host")) { VIR_ERROR(_("SCSI host found, but its udev name '%s' does " @@ -774,7 +775,7 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, union _virNodeDevCapData *data = &def->caps->data; char *filename = NULL, *p = NULL; - filename = basename(def->sysfs_path); + filename = last_component(def->sysfs_path); if (udevStrToLong_ui(filename, &p, 10, &data->scsi.host) == -1) { goto out; diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index c61e280..7a9436f 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -2,6 +2,7 @@ * parallels_storage.c: core privconn functions for managing * Parallels Cloud Server hosts * + * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2012 Parallels, Inc. * * This library is free software; you can redistribute it and/or @@ -23,6 +24,7 @@ #include <config.h> #include "datatypes.h" +#include "dirname.h" #include "viralloc.h" #include "virerror.h" #include "md5.h" @@ -64,7 +66,7 @@ static int parallelsGetBridgedNetInfo(virNetworkDefPtr def, virJSONValuePtr jobj goto cleanup; } - if (!(def->bridge = strdup(basename(bridgePath)))) { + if (!(def->bridge = strdup(last_component(bridgePath)))) { virReportOOMError(); goto cleanup; } diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index cf2f790..271f370 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -2,6 +2,7 @@ * parallels_storage.c: core driver functions for managing * Parallels Cloud Server hosts * + * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2012 Parallels, Inc. * * This library is free software; you can redistribute it and/or @@ -28,9 +29,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include <libgen.h> #include "datatypes.h" +#include "dirname.h" #include "viralloc.h" #include "configmake.h" #include "virstoragefile.h" @@ -230,13 +231,12 @@ parallelsPoolAddByDomain(virConnectPtr conn, virDomainObjPtr dom) virStoragePoolObjPtr pool = NULL; int j; - if (!(poolPath = strdup(pdom->home))) { + poolPath = mdir_name(pdom->home); + if (!poolPath) { virReportOOMError(); return NULL; } - poolPath = dirname(poolPath); - for (j = 0; j < pools->count; j++) { if (STREQ(poolPath, pools->objs[j]->def->target.path)) { pool = pools->objs[j]; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 40da306..1faf1ae 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -26,6 +26,7 @@ #include <unistd.h> #include <stdio.h> +#include "dirname.h" #include "virerror.h" #include "virlog.h" #include "storage_backend_disk.h" @@ -728,8 +729,8 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } - dev_name = basename(devpath); - srcname = basename(pool->def->source.devices[0].path); + dev_name = last_component(devpath); + srcname = last_component(pool->def->source.devices[0].path); VIR_DEBUG("dev_name=%s, srcname=%s", dev_name, srcname); isDevMapperDevice = virIsDevMapperDevice(devpath); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5a2a75c..4c836c7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1,7 +1,7 @@ /* * vircgroup.c: methods for managing control cgroups * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright IBM Corp. 2008 * * This library is free software; you can redistribute it and/or @@ -37,7 +37,6 @@ #include <sys/stat.h> #include <sys/types.h> #include <signal.h> -#include <libgen.h> #include <dirent.h> #define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ diff --git a/src/util/virpci.c b/src/util/virpci.c index e58010b..5811f22 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -36,6 +36,7 @@ #include <unistd.h> #include <stdlib.h> +#include "dirname.h" #include "virlog.h" #include "viralloc.h" #include "vircommand.h" @@ -1925,7 +1926,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link, return ret; } - config_address = basename(device_path); + config_address = last_component(device_path); if (VIR_ALLOC(*bdf) != 0) { virReportOOMError(); goto out; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index d7b4508..ffe7a54 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -56,7 +56,7 @@ typedef virStorageFileMetadata *virStorageFileMetadataPtr; struct _virStorageFileMetadata { char *backingStore; /* Canonical name (absolute file, or protocol) */ char *backingStoreRaw; /* If file, original name, possibly relative */ - char *directory; /* The directory containing basename(backingStoreRaw) */ + char *directory; /* The directory containing basename of backingStoreRaw */ int backingStoreFormat; /* enum virStorageFileFormat */ bool backingStoreIsFile; virStorageFileMetadataPtr backingMeta; -- 1.8.1.4

2 2

[libvirt] Two trivial doc patches
by Christophe Fergeau 26 Apr '13

26 Apr '13

Hey, I've just pushed these 2 patches under the trivial/doc rule. Christophe

1 2

[libvirt] Error in documentation about memory ballon
by Alexandre Laurent 26 Apr '13

26 Apr '13

Hello, In "Memory Ballon" ( http://www.libvirt.org/formatdomain.html#elementsMemBalloon ) section, the second XML exemple has an error. Effectively, the documentation shows the following : ... <devices> <watchdog model='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </devices> </domain> but it should be ... <devices> <memballoon model='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </memballoon> </devices> </domain> Best regards,

2 1

[libvirt] [PATCH] qemu: fix build error with older glibc
by Eric Blake 26 Apr '13

26 Apr '13

Jim Fehlig reported on IRC that older glibc triggers this warning: cc1: warnings being treated as errors qemu/qemu_domain.c: In function 'qemuDomainDefFormatBuf': qemu/qemu_domain.c:1297: error: declaration of 'remove' shadows a global declaration [-Wshadow] /usr/include/stdio.h:157: error: shadowed declaration is here [-Wshadow] make[3]: *** [libvirt_driver_qemu_impl_la-qemu_domain.lo] Error 1 Fix it like we have done in the past (such as commit 2e6322a). * src/qemu/qemu_domain.c (qemuDomainDefFormatBuf): Avoid shadowing a function name. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/qemu/qemu_domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 98ac56f..0ef79cd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1293,7 +1293,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { int i; - int remove = 0; + int toremove = 0; virDomainControllerDefPtr usb = NULL, pci = NULL; /* If only the default USB controller is present, we can remove it @@ -1313,7 +1313,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, if (usb && usb->idx == 0 && usb->model == -1) { VIR_DEBUG("Removing default USB controller from domain '%s'" " for migration compatibility", def->name); - remove++; + toremove++; } else { usb = NULL; } @@ -1334,15 +1334,15 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, pci->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { VIR_DEBUG("Removing default 'pci-root' from domain '%s'" " for migration compatibility", def->name); - remove++; + toremove++; } else { pci = NULL; } - if (remove) { + if (toremove) { controllers = def->controllers; ncontrollers = def->ncontrollers; - if (VIR_ALLOC_N(def->controllers, ncontrollers - remove) < 0) { + if (VIR_ALLOC_N(def->controllers, ncontrollers - toremove) < 0) { controllers = NULL; virReportOOMError(); goto cleanup; -- 1.8.1.4

1 0