- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/2] Empty first lines series
by Martin Kletzander 11 Jun '14

11 Jun '14

v3 -- use the whole VC_LIST_EXCEPT, create exception for necessities and clear the rest v2 -- s/FILENAME:1:/FILENAME ":1:"/ Martin Kletzander (2): Remove unnecessary empty first lines maint: prohibit empty first lines cfg.mk | 10 ++++++++++ docs/generic.css | 1 - docs/libvirt.css | 2 -- src/locking/lockd.conf | 1 - src/locking/sanlock.conf | 1 - tests/nodeinfodata/linux-test3/node/node0/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node1/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node2/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node3/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node4/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node5/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node6/meminfo | 1 - tests/nodeinfodata/linux-test3/node/node7/meminfo | 1 - tests/nodeinfodata/linux-test4/node/node0/meminfo | 1 - tests/nodeinfodata/linux-test4/node/node1/meminfo | 1 - tests/nodeinfodata/linux-test6/node/node0/meminfo | 1 - tests/nodeinfodata/linux-test8/cpu/offline | 1 - tests/nodeinfodata/linux-test8/node/node0/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node1/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node2/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node3/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node4/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node5/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node6/meminfo | 1 - tests/nodeinfodata/linux-test8/node/node7/meminfo | 1 - 25 files changed, 10 insertions(+), 25 deletions(-) -- 2.0.0

4 10

[libvirt] [PATCH v4] qemu: Properly label FDs when restoring domain with static label
by Shivaprasad G Bhat 11 Jun '14

11 Jun '14

When saving domain with relabel=no, the file that gets created must have the context set anyway. That way restore can be successful without the need of relabeling the file. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5d40239..cf5c27c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2966,6 +2966,9 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (fd < 0) goto cleanup; + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) + goto cleanup; + if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) goto cleanup;

2 1

[libvirt] [PATCH v8 0/4] Handling of undefine and re define snapshots with VirtualBox 4.2 or higher
by Yohan BELLEGUIC 11 Jun '14

11 Jun '14

Hello, This is a new series of patches in order to support undefining and redefining snapshots with VirtualBox 4.2 or higher. These patches are based on Manuel Vives' patches, taking into account Daniel P. Berrange's remarks. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was made to emulate these behaviours by manipulating directly the .vbox XML files. The first patch adds extra details in the snapshot XML returned by libvirt. We will need those details in order to redefine the snapshots. The second patch adds a new API to manipulate the VirtualBox XML file. It provides several structs describing the VirtualBox XML file nodes and functions which can manipulate these structs. The third patch adds support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The idea is to unregister the machine, add the snapshot in the Virtualbox XML file and re-register the machine. However, VirtualBox forbids a machine to have snapshots but no current snapshot. So, if the real current snapshot has not been redefined yet, we create fake disks, allowing us to have an intermediate state in order to not corrupt the snapshot's read-write disks. These fake disks will be deleted during the next redefine. The fourth and last patch adds support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. As in the third patch, we also create fake disks to not corrupt the snapshot's read-write disks. The patches were only tested with VirtualBox 4.3.10 and VirtualBox 4.2.24. Regards Yohan BELLEGUIC v8: * Fix patches according to Daniel P. Berrange review (May 01, 2014) * Rename all the methods in vbox_snapshot.{c,h} * Add a test case for serialize and deserialize a virVBoxSnapshotConfMachine * Fix memory leaks v7: * Add vbox_snapshot_conf.{h,c} files to (de)serialize VirtualBox XML files * Update the code to use the API exposed by vbox_snapshot_conf.h * Handle the fact that VirtualBox forbids a machine to have snapshots but no current snapshot v6: * Rebased because of a massive change in vbox_tmpl.c due to changes in the handling of different versions of VirtualBox v5: * The patches are modified according to a first review by Laine Stump: * renamed virSearchUuid to virSearchRegex and moved it from viruuid.{c,h} to virstring.{c,h}. * Various fixes. v4: * The code is compliant with Virtualbox 4.3 API * Some minor modifications in order to satisfy "make syntax-check" v3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review v2: * Fix a licence problem with the method for string replacement Manuel VIVES (1): vbox_tmpl.c: Better XML description for snapshots Yohan BELLEGUIC (3): Add vbox_snapshot_conf struct vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add function for undefining snapshot po/POTFILES.in | 1 + src/Makefile.am | 1 + src/vbox/vbox_snapshot_conf.c | 1490 +++++++++++++++ src/vbox/vbox_snapshot_conf.h | 105 ++ src/vbox/vbox_tmpl.c | 1982 +++++++++++++++++++- tests/Makefile.am | 15 + tests/vboxsnapshotxmldata/2disks-1snap.vbox | 322 ++++ tests/vboxsnapshotxmldata/2disks-2snap.vbox | 478 +++++ .../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 786 ++++++++ tests/vboxsnapshotxmldata/2disks-3snap.vbox | 636 +++++++ tests/vboxsnapshotxmldata/2disks-nosnap.vbox | 168 ++ tests/vboxsnapshotxmltest.c | 161 ++ 12 files changed, 6100 insertions(+), 45 deletions(-) create mode 100644 src/vbox/vbox_snapshot_conf.c create mode 100644 src/vbox/vbox_snapshot_conf.h create mode 100644 tests/vboxsnapshotxmldata/2disks-1snap.vbox create mode 100644 tests/vboxsnapshotxmldata/2disks-2snap.vbox create mode 100644 tests/vboxsnapshotxmldata/2disks-3snap-brother.vbox create mode 100644 tests/vboxsnapshotxmldata/2disks-3snap.vbox create mode 100644 tests/vboxsnapshotxmldata/2disks-nosnap.vbox create mode 100644 tests/vboxsnapshotxmltest.c -- 1.7.10.4

3 14

[libvirt] [PATCH] virnetdev: Use ifname in virNetDevGetLinkInfo
by Michal Privoznik 11 Jun '14

11 Jun '14

If we're compiling on non-Linux platform, the virNetDevGetLinkInfo() is a dummy function which barely logs debug message that getting link info is not supported. However, while the debug message was prepared for printing the interface name too, I actually forgot to pass the variable which resulted in build error on platforms like mingw or FreeBSD. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: Pushed under build breaker rule. src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index cbf086e..6f3a202 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1921,7 +1921,8 @@ virNetDevGetLinkInfo(const char *ifname, virInterfaceLinkPtr lnk) { /* Port me */ - VIR_DEBUG("Getting link info on %s is not implemented on this platform"); + VIR_DEBUG("Getting link info on %s is not implemented on this platform", + ifname); lnk->speed = lnk->state = 0; return 0; } -- 1.8.5.5

1 0

[libvirt] [PATCH] vmware: make version parsing more robust
by Jean-Baptiste Rouault 11 Jun '14

11 Jun '14

Since commit d69415d4, vmware version is parsed from both stdout and stderr. This patch makes version parsing work even if there is garbage (libvirt debug messages for example) in the command output. Add test data for this case. --- src/vmware/vmware_conf.c | 10 ++++++++-- tests/vmwareverdata/workstation-7.0.0-with-garbage.txt | 3 +++ tests/vmwarevertest.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tests/vmwareverdata/workstation-7.0.0-with-garbage.txt diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 5ff6396..1f6f3bd 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------------*/ /* * Copyright (C) 2011-2014 Red Hat, Inc. - * Copyright 2010, diateam (www.diateam.net) + * Copyright (C) 2010-2014, diateam (www.diateam.net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -241,7 +241,13 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) return -1; } - if ((tmp = STRSKIP(verbuf, pattern)) == NULL) { + if ((tmp = strstr(verbuf, pattern)) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot find version pattern \"%s\""), pattern); + return -1; + } + + if ((tmp = STRSKIP(tmp, pattern)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse %sversion"), pattern); return -1; diff --git a/tests/vmwareverdata/workstation-7.0.0-with-garbage.txt b/tests/vmwareverdata/workstation-7.0.0-with-garbage.txt new file mode 100644 index 0000000..b3c8085 --- /dev/null +++ b/tests/vmwareverdata/workstation-7.0.0-with-garbage.txt @@ -0,0 +1,3 @@ +garbage line +VMware Workstation 7.0.0 build-203739 Release +garbage line diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index 16e48de..24de9e1 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -88,6 +88,7 @@ mymain(void) } while (0) DO_TEST("ws", "workstation-7.0.0", 7000000); + DO_TEST("ws", "workstation-7.0.0-with-garbage", 7000000); DO_TEST("fusion", "fusion-5.0.3", 5000003); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 1.8.5.3

2 3

[libvirt] [PATCH] nodeinfo: avoid uninitialized variable on error
by Eric Blake 11 Jun '14

11 Jun '14

Commit 8ba0a58 introduced a compiler warning that I hit during a run of ./autobuild.sh: ../../src/nodeinfo.c: In function 'nodeCapsInitNUMA': ../../src/nodeinfo.c:1853:43: error: 'nsiblings' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (virCapabilitiesAddHostNUMACell(caps, n, memory, ^ Sure enough, nsiblings starts uninitialized, and is set by a call to virNodeCapsGetSiblingInfo, but that function fails to assign through the pointer if virNumaGetDistances fails. * src/nodeinfo.c (nodeCapsInitNUMA): Initialize nsiblings. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/nodeinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 5eef42e..5332ede 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1803,7 +1803,7 @@ nodeCapsInitNUMA(virCapsPtr caps) virCapsHostNUMACellCPUPtr cpus = NULL; virBitmapPtr cpumap = NULL; virCapsHostNUMACellSiblingInfoPtr siblings = NULL; - int nsiblings; + int nsiblings = 0; int ret = -1; int ncpus = 0; int cpu; -- 1.9.3

2 1

[libvirt] [PATCH] libxl: support interface type=network
by Jim Fehlig 10 Jun '14

10 Jun '14

Add support for <interface type='network'> in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index cec37d6..6efcea6 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -908,7 +908,44 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) return -1; break; - default: + case VIR_DOMAIN_NET_TYPE_NETWORK: + { + bool error = true; + char *brname = NULL; + virNetworkPtr network = NULL; + virConnectPtr conn; + + if (!(conn = virConnectOpen("xen:///system"))) + return -1; + + if (!(network = + virNetworkLookupByName(conn, l_nic->data.network.name))) + goto cleanup_net; + + if (!(brname = virNetworkGetBridgeName(network))) + goto cleanup_net; + + if (VIR_STRDUP(x_nic->bridge, brname) < 0) + goto cleanup_net; + + error = false; + + cleanup_net: + VIR_FREE(brname); + virNetworkFree(network); + virObjectUnref(conn); + if (error) + return -1; + break; + } + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight does not support network device type %s"), virDomainNetTypeToString(l_nic->type)); @@ -919,7 +956,7 @@ libxlMakeNic(virDomainDefPtr def, } static int -libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) +libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) { virDomainNetDefPtr *l_nics = def->nets; size_t nnics = def->nnets; -- 1.8.0.1

2 3

[libvirt] [PATCH] storage: fix memory leak with encrypted images
by Eric Blake 10 Jun '14

10 Jun '14

Jim Fehlig reported a regression found by libvirt-TCK tests: > ~ # perl /usr/share/libvirt-tck/tests/qemu/100-disk-encryption.t ... > ok 4 - defined persistent domain config > # Starting inactive domain config > libvirt error code: 1, message: internal error: unable to execute QEMU command > 'cont': 'drive-ide0-0-1' > (/var/cache/libvirt-tck/300-disk-encryption/demo.qcow2) is encrypted Commit 2279d560 converted a boolean into a pointer with the intent of transferring that pointer out of a temporary object into the caller's data structure. The temporary structure meant that meta->encryption was always NULL on entry, so we could get away with blindly allocating the pointer when the header said so. But later commits then tweaked things to do backing chain detection in-place, rather than via a temporary object; this has the net result that meta->encryption can be non-NULL on entry. Not only did this turn the latent behavior into a memory leak, it is also a behavior regression: blindly allocating a new pointer wipes out what secrets we already knew about the chain, making it impossible to restart the domain. Of course, no one in their right mind should be relying on qcow2 encryption - it is fundamentally flawed. And sadly, the TCK tests don't get run often enough, and this shows that our virstoragetest does not exercise encrypted images at all. Otherwise, we could have avoided a release containing this regression. * src/util/virstoragefile.c (virStorageFileGetMetadataInternal): Don't nuke an already-existing encryption. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/util/virstoragefile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 43b7a5a..0792dd8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -805,7 +805,8 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta, crypt_format = virReadBufInt32BE(buf + fileTypeInfo[meta->format].qcowCryptOffset); - if (crypt_format && VIR_ALLOC(meta->encryption) < 0) + if (crypt_format && !meta->encryption && + VIR_ALLOC(meta->encryption) < 0) goto cleanup; } -- 1.9.3

2 2

[libvirt] [PATCH] vbox: fix compilation error
by Roman Bogorodskiy 10 Jun '14

10 Jun '14

clang complains about possibly uninitialized variable: vbox/vbox_snapshot_conf.c:1355:9: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!(xPathContext = xmlXPathNewContext(xml))) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So init 'ret' with NULL. --- src/vbox/vbox_snapshot_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 4909665..9c78410 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -1336,7 +1336,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath, { int result = -1; size_t i = 0; - char **ret; + char **ret = NULL; xmlDocPtr xml = NULL; xmlXPathContextPtr xPathContext = NULL; xmlNodePtr *nodes = NULL; -- 1.9.0

3 4

[libvirt] [patch v2 1/1] manual: Add virsh manual about specified migration host
by Chen Fan 10 Jun '14

10 Jun '14

the 'migration_host' description maybe have a bit of difficulty to understand for user, so add this manual for them. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- tools/virsh.pod | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 02671b4..7b30292 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1208,7 +1208,8 @@ such as GFS2 or GPFS. If you are sure the migration is safe or you just do not care, use I<--unsafe> to force the migration. The I<desturi> is the connection URI of the destination host, and -I<migrateuri> is the migration URI, which usually can be omitted (see below). +I<migrateuri> is the migration URI for specifying which IP address/URI of the +destination host to tansfer migration data, which usually can be omitted (see below). I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. Likewise, I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on @@ -1238,6 +1239,15 @@ seen from the source machine. When I<migrateuri> is not specified, libvirt will automatically determine the hypervisor specific URI, by looking up the target host's configured hostname. + +For QEMU/KVM hypervisor, when I<migrateuri> is not specified, at first libvirt +will ask the destination side whether the optional "migration_host" is specified +or not, if the "migration_host" is specified, libvirt will use the specified +network for transferring migration data(the "migrateion_host" is useful when +hosts has multiple network interface). if the "migrateion_host" is not specified +too, libvirt will automatically determine the hypervisor specific URI, by looking +up the target host's configured hostname. + There are a few scenarios where specifying I<migrateuri> may help: =over 4 -- 1.9.3

4 5

[libvirt] [PATCH] docs: fix a typo in hacking.html.in
by Wangrui (K) 10 Jun '14

10 Jun '14

Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- docs/hacking.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index b2ef85a..9c6dd26 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -122,7 +122,7 @@ Some tests are skipped by default in a development environment, based on the time they take in comparison to the likelihood that those tests will turn up problems during incremental builds. - These tests default to being run when when building from a + These tests default to being run when building from a tarball or with the configure option --enable-expensive-tests; you can also force a one-time toggle of these tests by setting VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in: -- 1.7.12.4

3 2

[libvirt] IPv6 in Libvirt LXC
by Thomas Maddox 10 Jun '14

10 Jun '14

Hey all, According to a discussion last week in the Nova-Libvirt subgroup meeting, it was advised, by danpb, that I bring this issue up on the Libvirt mailing list for discussion and resolution. So, here goes - I'm currently using config drive from Nova to generate network configurations for LXC guests that are spun up via Libvirt. Unfortunately, when doing some IPv6 testing, I ran into a snag (with a couple work arounds detailed below). Due to the read-only mount of /proc/sys (http://libvirt.org/drvlxc.html#fsmounts) I am unable to get expected behavior from IPv6 static network configurations. I did some poking around and found this bug from a couple years ago that pretty well outlines the problem: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/964882. I wasn't sure how we might go about correcting this, but it seems like something we'll need to address in Libvirt. Maybe with the user namespaces working, we can begin to provide some read/write mounts instead of read-only with clear documentation on the security implications? =] When using static IPv6 addressing it was attempting the following command: 'sysctl -q -e -w net.ipv6.conf.eth0.autoconf=0'. I tested to see whether the host and the guest share this value. I was able to change it in the host without it being reflected in the guest. The work arounds I've tried that seemed to allow IPv6 to get configured properly: 1. Use the post-up hook on an IPv4 static configuration to configure IPv6 via ifconfig/routes (example: http://paste.openstack.org/show/82446/) 2. Patch Libvirt to include a /proc/sys/net mount as read/write. Cheers! -Thomas

3 2

[libvirt] [PATCH RFC] network: Bring netdevs online later
by Matthew Rosato 10 Jun '14

10 Jun '14

Defer MAC registration until net devices are actually going to be used by the guest. This patch does so by setting the devices online just before starting guest CPUs. This approach is an alternative to my previously proposed 'network: Defer online of macvtap during qemu migration' Laine/Wangrui, is this the sort of thing you had in mind? Previous thread: https://www.redhat.com/archives/libvir-list/2014-May/msg00427.html Associated BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1081461 Signed-off-by: Matthew Rosato <mjrosato(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 45 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_process.c | 3 +++ src/util/virnetdevmacvlan.c | 5 ----- src/util/virnetdevtap.c | 3 --- 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e6acced..c161d73 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -571,6 +571,51 @@ qemuNetworkPrepareDevices(virDomainDefPtr def) return ret; } +void +qemuNetworkIfaceUp(virDomainNetDefPtr net) +{ + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevTapDelete(net->ifname)); + } + return; +} + +void +qemuPhysIfaceUp(virDomainNetDefPtr net) +{ + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevVPortProfileDisassociate(net->ifname, + virDomainNetGetActualVirtPortProfile(net), + &net->mac, + virDomainNetGetActualDirectDev(net), + -1, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); + ignore_value(virNetDevMacVLanDelete(net->ifname)); + } + return; +} + +void +qemuNetworkInitializeDevices(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + switch(virDomainNetGetActualType(net)) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + qemuNetworkIfaceUp(net); + break; + case VIR_DOMAIN_NET_TYPE_DIRECT: + qemuPhysIfaceUp(net); + break; + } + } + + return; +} + static int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info, const char *prefix) { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index afbd6ff..4a44464 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -206,6 +206,9 @@ int qemuOpenVhostNet(virDomainDefPtr def, int *vhostfdSize); int qemuNetworkPrepareDevices(virDomainDefPtr def); +void qemuNetworkIfaceUp(virDomainNetDefPtr net); +void qemuPhysIfaceUp(virDomainNetDefPtr net); +void qemuNetworkInitializeDevices(virDomainDefPtr def); /* * NB: def->name can be NULL upon return and the caller diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d719716..bbc11f3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2765,6 +2765,9 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + /* Bring up netdevs before starting CPUs */ + qemuNetworkInitializeDevices(vm->def); + VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, vm, priv->lockState) < 0) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index cb85b74..3748527 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -898,11 +898,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, goto link_del_exit; } - if (virNetDevSetOnline(cr_ifname, true) < 0) { - rc = -1; - goto disassociate_exit; - } - if (withTap) { if ((rc = virNetDevMacVLanTapOpen(cr_ifname, 10)) < 0) goto disassociate_exit; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 0b444fa..09b9c12 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -574,9 +574,6 @@ int virNetDevTapCreateInBridgePort(const char *brname, goto error; } - if (virNetDevSetOnline(*ifname, !!(flags & VIR_NETDEV_TAP_CREATE_IFUP)) < 0) - goto error; - return 0; error: -- 1.7.9.5

2 2

[libvirt] [PATCH] Report an clear error when try to build lvm2 type pool
by Shanzhi Yu 10 Jun '14

10 Jun '14

STORAGE_POOL_DISK_LVM2 can't be created by "parted mklabel", so report an error when build such type pool Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/storage/storage_backend_disk.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 8e12974..5b5a1fa 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -414,13 +414,21 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, goto error; } - if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) + if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE && + pool->def->source.format != VIR_STORAGE_POOL_DISK_LVM2) ok_to_mklabel = true; else { int check; check = virStorageBackendDiskFindLabel( pool->def->source.devices[0].path); + + if (pool->def->source.format == VIR_STORAGE_POOL_DISK_LVM2){ + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Invalid disk label: lvm2")); + goto error; + } + if (check > 0) { ok_to_mklabel = true; } else if (check < 0) { -- 1.9.3

1 0

[libvirt] [PATCH] qemu: Properly label FDs while saving domain for successful restores in case of static labelling.
by Shivaprasad G Bhat 10 Jun '14

10 Jun '14

Static labelling has the relabel set to no by default and restore of a saved image file fails when the selinux context is static. This is because the saved file doesnt have the context set during the saving. The libvirt has to set the conext of save image file to that of the guest during save. The fix applies to both managedsave and save codepath. The managedsave works as is without the fix as well since the files are saved in the directory having viable default context. Signed-off-by: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3a7622a..e4390ee 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2966,6 +2966,9 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (fd < 0) goto cleanup; + if (asyncJob == QEMU_ASYNC_JOB_SAVE) + virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd); + if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) goto cleanup;

1 0

[libvirt] [PATCH] SELinux: don't silently fail when no label is present
by Ján Tomko 10 Jun '14

10 Jun '14

This fixes startup of a domain with: <seclabel type='none' model='dac'/> on a host with selinux and dac drivers and security_default_confined = 0 https://bugzilla.redhat.com/show_bug.cgi?id=1105939 --- src/security/security_selinux.c | 98 ++++++++++++----------------------------- 1 file changed, 29 insertions(+), 69 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 8380bba..008c58c 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -585,7 +585,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return rc; + return 0; data = virSecurityManagerGetPrivateData(mgr); @@ -739,11 +739,7 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr seclabel; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) { - return -1; - } - - if (seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) + if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) return 0; if (getpidcon_raw(pid, &pctx) == -1) { @@ -1060,7 +1056,7 @@ virSecuritySELinuxSetSecurityTPMFileLabel(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: @@ -1102,7 +1098,7 @@ virSecuritySELinuxRestoreSecurityTPMFileLabelInt(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: @@ -1136,7 +1132,7 @@ virSecuritySELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr, seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (seclabel == NULL) - return -1; + return 0; disk_seclabel = virDomainDiskDefGetSecurityLabelDef(disk, SECURITY_SELINUX_NAME); @@ -1256,10 +1252,7 @@ virSecuritySELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, cbdata.manager = mgr; cbdata.secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (cbdata.secdef == NULL) - return -1; - - if (cbdata.secdef->norelabel) + if (!cbdata.secdef || cbdata.secdef->norelabel) return 0; if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_NETWORK) @@ -1279,7 +1272,7 @@ virSecuritySELinuxSetSecurityHostdevLabelHelper(const char *file, void *opaque) secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; return virSecuritySELinuxSetFilecon(file, secdef->imagelabel); } @@ -1397,7 +1390,7 @@ virSecuritySELinuxSetSecurityHostdevCapsLabel(virDomainDefPtr def, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { @@ -1447,10 +1440,7 @@ virSecuritySELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; switch (dev->mode) { @@ -1635,10 +1625,7 @@ virSecuritySELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; switch (dev->mode) { @@ -1667,14 +1654,14 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, int ret = -1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) - return -1; + if (!seclabel || seclabel->norelabel) + return 0; if (dev) chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, SECURITY_SELINUX_NAME); - if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + if (chr_seclabel && chr_seclabel->norelabel) return 0; if (chr_seclabel) @@ -1738,13 +1725,13 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virSecurityManagerPtr mgr, int ret = -1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (seclabel == NULL) - return -1; + if (!seclabel || seclabel->norelabel) + return 0; if (dev) chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, SECURITY_SELINUX_NAME); - if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + if (chr_seclabel && chr_seclabel->norelabel) return 0; switch (dev_source->type) { @@ -1864,7 +1851,7 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->norelabel || data->skipAllLabel) return 0; @@ -1925,7 +1912,7 @@ virSecuritySELinuxReleaseSecurityLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { if (secdef->label != NULL) { @@ -1953,10 +1940,7 @@ virSecuritySELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; return virSecuritySELinuxSetFilecon(savefile, secdef->imagelabel); @@ -1971,10 +1955,7 @@ virSecuritySELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->norelabel) + if (!secdef || secdef->norelabel) return 0; return virSecuritySELinuxRestoreSecurityFileLabel(mgr, savefile); @@ -1989,7 +1970,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2018,10 +1999,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; VIR_DEBUG("label=%s", secdef->label); @@ -2055,10 +2033,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; VIR_DEBUG("label=%s", secdef->label); @@ -2088,10 +2063,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU int rc = -1; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2138,10 +2110,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU int rc = -1; secdef = virDomainDefGetSecurityLabelDef(vm, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2179,10 +2148,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { @@ -2264,7 +2230,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef == NULL) - return -1; + return 0; if (secdef->norelabel || data->skipAllLabel) return 0; @@ -2337,10 +2303,7 @@ virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return -1; - - if (secdef->imagelabel == NULL) + if (!secdef || !secdef->imagelabel) return 0; return virSecuritySELinuxFSetFilecon(fd, secdef->imagelabel); @@ -2358,10 +2321,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, int rc = -1; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (secdef == NULL) - return rc; - - if (secdef->label == NULL) + if (!secdef || !secdef->label) return 0; if (fstat(fd, &buf) < 0) { -- 1.8.3.2

2 2

[libvirt] [RFC][PATCH]QEMU: Parse -device vfio-pci commandline
by Olivia Yin 09 Jun '14

09 Jun '14

Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/qemu/qemu_command.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/qemuargv2xmltest.c | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e6acced..4db4a1d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10239,6 +10239,59 @@ qemuParseCommandLinePCI(const char *val) return NULL; } +/* + * Tries to parse a QEMU vfio-pci device + */ +static virDomainHostdevDefPtr +qemuParseCommandLineVFIOPCI(const char *val) +{ + int bus = 0, slot = 0, func = 0; + const char *start; + char *end; + virDomainHostdevDefPtr def = virDomainHostdevDefAlloc(); + + if (!def) + goto error; + + if (!STRPREFIX(val, "host=")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown PCI device syntax '%s'"), val); + goto error; + } + + start = val + strlen("host="); + if (virStrToLong_i(start, &end, 16, &bus) < 0 || *end != ':') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device bus '%s'"), val); + goto error; + } + start = end + 1; + if (virStrToLong_i(start, &end, 16, &slot) < 0 || *end != '.') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device slot '%s'"), val); + goto error; + } + start = end + 1; + if (virStrToLong_i(start, &end, 16, &func) < 0 || *end != ',') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } + + def->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; + def->managed = true; + def->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; + def->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; + def->source.subsys.u.pci.addr.bus = bus; + def->source.subsys.u.pci.addr.slot = slot; + def->source.subsys.u.pci.addr.function = func; + return def; + + error: + virDomainHostdevDefFree(def); + return NULL; +} + /* * Tries to parse a QEMU USB device @@ -11351,6 +11404,20 @@ qemuParseCommandLine(virCapsPtr qemuCaps, virDomainHostdevDefFree(hostdev); goto error; } + } else if (STREQ(arg, "-device")) { + WANT_VALUE(); + if (STRPREFIX(val, "vfio-pci,")) { + const char *start; + start = val; + virDomainHostdevDefPtr hostdev; + start += strlen("vfio-pci,"); + if (!(hostdev = qemuParseCommandLineVFIOPCI(start))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } } else if (STREQ(arg, "-soundhw")) { const char *start; WANT_VALUE(); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 0fc9fcb..b4ba97a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -251,8 +251,8 @@ mymain(void) DO_TEST("watchdog"); DO_TEST("hostdev-usb-address"); - DO_TEST("hostdev-pci-address"); + DO_TEST("hostdev-vfio"); DO_TEST("smp"); -- 1.8.5

4 14

[libvirt] [PATCHv2] QEMU: Modify qemuParseCommandLinePCI() to parsee '-device vfio-pci'
by Olivia Yin 09 Jun '14

09 Jun '14

Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> Modify qemuParseCommandLinePCI() to support parsing '-device vfio-pci,host=bus:slot.func'. Add test case 'hostdev-vfio' into qemuargv2xmltest to validate this function. The case related to QEMU_CAPS_HOST_PCI_MULTIDOMAIN which uses '-device vfio-pci,host=domain:bus:slot.func' is not supported yet. --- src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++------ tests/qemuargv2xmltest.c | 2 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3cf279e..ae7f94e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10193,7 +10193,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, * Tries to parse a QEMU PCI device */ static virDomainHostdevDefPtr -qemuParseCommandLinePCI(const char *val) +qemuParseCommandLinePCI(const char *val, bool vfio) { int bus = 0, slot = 0, func = 0; const char *start; @@ -10222,10 +10222,20 @@ qemuParseCommandLinePCI(const char *val) goto error; } start = end + 1; - if (virStrToLong_i(start, NULL, 16, &func) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot extract PCI device function '%s'"), val); - goto error; + + if (!vfio) { + if (virStrToLong_i(start, NULL, 16, &func) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } + } else { + if (virStrToLong_i(start, &end, 16, &func) < 0 || *end != ',') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } else + def->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; } def->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; @@ -11347,12 +11357,26 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STREQ(arg, "-pcidevice")) { virDomainHostdevDefPtr hostdev; WANT_VALUE(); - if (!(hostdev = qemuParseCommandLinePCI(val))) + if (!(hostdev = qemuParseCommandLinePCI(val,0))) goto error; if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { virDomainHostdevDefFree(hostdev); goto error; } + } else if (STREQ(arg, "-device")) { + WANT_VALUE(); + if (STRPREFIX(val, "vfio-pci,")) { + const char *start; + start = val; + virDomainHostdevDefPtr hostdev; + start += strlen("vfio-pci,"); + if (!(hostdev = qemuParseCommandLinePCI(start,1))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } } else if (STREQ(arg, "-soundhw")) { const char *start; WANT_VALUE(); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 0fc9fcb..b4ba97a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -251,8 +251,8 @@ mymain(void) DO_TEST("watchdog"); DO_TEST("hostdev-usb-address"); - DO_TEST("hostdev-pci-address"); + DO_TEST("hostdev-vfio"); DO_TEST("smp"); -- 1.8.5

2 1

[libvirt] [PATCH] parallels: Avoid possible leak of "cpu" from parallelsBuildCapabilities
by Peter Krempa 09 Jun '14

09 Jun '14

4d06af97d38c3648937eb8f732704379b3cd9e59 introduced a possible memory leak of the memory allocated into the "cpu" pointer in parallelsBuildCapabilities in the case "nodeGetInfo()" would fail right after the allocation. Rearrange the code to avoid the possibility of the leak. Found by Coverity. --- src/parallels/parallels_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 153961b..411527c 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -151,10 +151,10 @@ parallelsBuildCapabilities(void) "parallels", NULL, NULL, 0, NULL) == NULL) goto error; - if (VIR_ALLOC(cpu) < 0) + if (nodeGetInfo(&nodeinfo)) goto error; - if (nodeGetInfo(&nodeinfo)) + if (VIR_ALLOC(cpu) < 0) goto error; cpu->arch = caps->host.arch; -- 1.9.3

2 2

Re: [libvirt] [Qemu-devel] Question about how to distinguish a usb device in usb pass-through feature
by Gonglei (Arei) 09 Jun '14

09 Jun '14

Hi, Qemu has supported 3rd method for USB passthrough except two ways that you have pointed: hostbus+hostport -- match for a specific physical port in the host, any device which is plugged in there gets passed to the guest. The method can resolve your all problems. AFAICT, libvirt do not support this way at present. Any Plan? CC'ing libvirt developer mailist. Best regards, -Gonglei From: qemu-devel-bounces+arei.gonglei=huawei.com(a)nongnu.org [mailto:qemu-devel-bounces+arei.gonglei=huawei.com@nongnu.org] On Behalf Of Yuanjing (D) Sent: Monday, June 09, 2014 11:37 AM To: qemu-devel(a)nongnu.org Cc: Liuji (Jeremy) Subject: [Qemu-devel] Question about how to distinguish a usb device in usb pass-through feature Hi, I want to provide feature that pass-through host's usb device to guest os in Openstack. I have question about how to distinguish a usb device. I have read some introductions and made some tests. I think qemu supports two ways to identify a host usb device: (1)host:bus.addr (2)host:vendor_id:product_id I think they both have restriction on some use cases: (1) 'host:bus.addr' is not appropriate if more than one usb devices with the same 'host:bus.addr' in a host. (2) The addr(device number) may change every time unplug/plug usb device of a host. One this happen the guest may reboot failed with wrong host:bus.addr. I noticed that Vmware supports technology 'autoconnection', they pass-through usb device by using usb path of the device on the host(physical topology and port location). Once unplug usb device and plug usb device again with the same usb path, the new device appears and is connected to the guest. I am not a qemu/system programmer and I apologize if I am missing something very obvious. Hope somebody can help me to find the best way to distinguish a usb device? Thanks in advance

1 0

[libvirt] [PATCH] m4: bhyve: Fix check for the required bhyve programs
by Peter Krempa 09 Jun '14

09 Jun '14

bhyveload and bhyvectl wouldn't be checked otherwise as the configure script wouldn't execute one of the tests: checking for bhyve... /usr/local/sbin/bhyve checking for bhyvectl... /usr/local/sbin/bhyvectl checking for bhyveload... /usr/local/sbin/bhyveload ./configure: line 62602: test: too many arguments Fix the shell statement testing the 3 binaries. --- m4/virt-driver-bhyve.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4 index 9c0030b..c65b15d 100644 --- a/m4/virt-driver-bhyve.m4 +++ b/m4/virt-driver-bhyve.m4 @@ -28,7 +28,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin]) AC_PATH_PROG([BHYVELOAD], [bhyveload], [], [$PATH:/usr/sbin/]) - if test -z "$BHYVE" || test -z "$BHYVECTL" \ + if test -z "$BHYVE" || test -z "$BHYVECTL" || \ test -z "$BHYVELOAD" || test "$with_freebsd" = "no"; then if test "$with_bhyve" = "check"; then with_bhyve="no" -- 1.9.3

2 2

[libvirt] [PATCH] vmx: Relax virtualHW.version check
by Matthias Bolte 07 Jun '14

07 Jun '14

The original implementation of the VMX config parser assumed that the virtualHW.version would have more influence on the content of the VMX file than it actually seems to have. It started with accepting only version 4. Additonal versions were added later without any additional changes in the parser itself. This suggests that the influence of the virtualHW.version on the content and format of the VMX file is small or non-existent. The parser worked without any changes across several virtualHW and vSphere versions. So instead of adding new virtualHW.version values to the parser as they come along, or adding an extra flag to allow unknown virtualHW.version values just relax the check to require version 4 or later. --- This patch is meant as a alternative for this patch series: https://www.redhat.com/archives/libvir-list/2014-May/msg00122.html src/vmx/vmx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 169440c..ce228d4 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1316,12 +1316,10 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } - if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8 && virtualHW_version != 9 && - virtualHW_version != 10) { + if (virtualHW_version < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be " - "4, 7, 8, 9 or 10 but found %lld"), + "4 or higher but found %lld"), virtualHW_version); goto cleanup; } -- 1.8.1.2

2 2

[libvirt] QMP fallback race in libvirt
by Ron 07 Jun '14

07 Jun '14

Hi, Eric asked me to move this here from #virt so it doesn't get forgotten. I hit a weird bug in a new install of libvirt on Debian Jessie this week where a vm could not be configured to use any CPU type except passthrough. After much digging and headscratching, the immediate cause for that turns out to be one of the (three) files in the qemu/capabilities cache being generated wrongly the first time that libvirtd was started. Instead of being generated from the QMP queries, it appears to have fallen back to the old method of scraping 'qemu -cpu help', and since the output of that changed with qemu 2.0 it leads to things like: <cpu name='SandyBridge Intel Xeon E312xx (Sandy Bridge) '/> and hilarity then ensues when cpuModelIsAllowed() is called by x86Decode(). Since only one of the cache files there was corrupted like this, it would appear libvirt either didn't wait long enough, or didn't try hard enough, to get a connection to the monitor for the QMP query on what was probably also the very first time qemu had been started on this host machine. After nuking the cache files and restarting libvirtd they were then correctly regenerated, and things began to work as expected. This was all done on a new clean install of the host machine, so there was nothing around from any earlier versions to get tangled up with, and possibly means qemu had some first time init of its own to do which took some time before it was ready to be queried. I am also seeing bursts of several of these warnings in the logs: libvirtd[26475]: This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous Which I haven't confirmed as being related, but doesn't seem to be obviously unrelated either, and at worst is a separate bug. Cheers, Ron

1 0

[libvirt] libvirt, libxl and <channels>
by Dave Scott 06 Jun '14

06 Jun '14

Hi, Two of the applications I’d like to use with libvirt (cloudstack and oVirt) make use of “<channels>” in the domain XML, like this: <channel type='unix'> <source mode='bind' path='/var/lib/libvirt/qemu/s-4-VM.agent'/> <target type='virtio' name='s-4-VM.vport'/> <address type='virtio-serial'/> </channel> I don’t believe these are currently supported by libvirt + libxl — I’d like to see what it would take to hook these up. I chatted with Daniel Berrange at the Xen hackathon last week, and if I understood correctly these channels are analogous to serial ports used for low-bandwidth communication to (e.g.) guest agents. Daniel suggested that the xen console mechanism ought to be adequate to power these things. The other option (if higher bandwidth was required) would be to use the Xen vchan protocol. I think the behaviour is: * bind a unix domain socket on the host (‘/var/lib/libvirt/qemu/…') * connect a bidirectional low-bandwidth channel to the guest * manifest the channel in the guest as a ‘/dev/vport/s-4-VM.vport’ device (?) So an application on the host can connect() to the host socket, an application in the guest can open() the guest device and they can talk privately. [Have I got this right?] I had a quick read of the libxl code and I think the consoles are considered an internal detail: there is a function libxl_console_get_tty to retrieve a console’s endpoint in dom0 but I couldn’t see a way to request additional consoles are created. The libxl_domain_config has disks, nics, pcidevs, vfbs, vkbs, and vtpms but no consoles. (Have I missed something?) Bypassing libxl I was able to manually create a /local/domain/%d/device/console/1 which was recognised by the VM as /dev/hvc1. As an aside, I notice that there are 2 console backends now: xenconsoled seems to only watch for the initial console, while a per-domain qemu process is used for all subsequent consoles, so any enhancements to the dom0 end would have to go into qemu? So to implement channels via consoles I would need to: 1. check if qemu when acting as a console server in dom0 is able to connect the console to a suitably named Unix domain socket in dom0 (signalled via xenstore in the usual way) 2. modify libxl to support consoles as configurable devices alongside disks, nics etc 3. add support to libvirt’s libxl driver 4. see if I can write something like a udev rule in the guest to notice the console, look up the ‘name’ from xenstore and make a suitably-named file? What do you think? Cheers, Dave

2 2

[libvirt] [PATCH] Fix virbitmaptest on 32-bit
by Ján Tomko 06 Jun '14

06 Jun '14

My commit 7d8afc4 was passing the incorrect size to virBitmapDataToString in the newly added test. --- Pushed as a trivial paper-bag build breaker fix. tests/virbitmaptest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 139b8e2..048946f 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -313,7 +313,7 @@ test5(const void *v ATTRIBUTE_UNUSED) if (STRNEQ(str, "0,9,34")) goto error; VIR_FREE(str); - if (!(str = virBitmapDataToString(data2, sizeof(data2)))) + if (!(str = virBitmapDataToString(data2, len2))) goto error; if (STRNEQ(str, "0,2,9,15,34")) goto error; -- 1.8.3.2

1 0