- Devel - libvirt List Archives

[libvirt] [PATCH] maint: add configure checks for BSD CPU affinity
by Roman Bogorodskiy 29 Jan '14

29 Jan '14

Check for presence of sys/cpuset.h header and cpuset_getaffinity() in configure instead of just using #ifdef __FreeBSD__ for that code. --- configure.ac | 10 ++++++++++ src/util/virprocess.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3a70375..1670a41 100644 --- a/configure.ac +++ b/configure.ac @@ -2604,6 +2604,16 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check for BSD CPU affinity availability +AC_CHECK_DECLS([cpuset_getaffinity], + [AC_DEFINE([HAVE_BSD_CPU_AFFINITY], + [1], + [whether BSD CPU affinity management is available])], + [], + [#include <sys/param.h> + #include <sys/cpuset.h> + ]) + # Check if we need to look for ifconfig if test "$want_ifconfig" = "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 827143c..83d0679 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -34,11 +34,14 @@ #ifdef __FreeBSD__ # include <sys/param.h> -# include <sys/cpuset.h> # include <sys/sysctl.h> # include <sys/user.h> #endif +#ifdef HAVE_BSD_CPU_AFFINITY +# include <sys/cpuset.h> +#endif + #include "viratomic.h" #include "virprocess.h" #include "virerror.h" @@ -457,7 +460,7 @@ realloc: return 0; } -#elif defined(__FreeBSD__) +#elif defined(HAVE_BSD_CPU_AFFINITY) int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, virBitmapPtr map) -- 1.8.4.3

2 1

[libvirt] [PATCH] Revert "networkAllocateActualDevice: Set QoS for bridgeless networks too"
by Michal Privoznik 29 Jan '14

29 Jan '14

This reverts commit 2996e6be19a13199ded7c2aa21039cca97318e01 and some parts of 2636dc8c4de83cd37bc0680a6fbc3f6d25023bd7. Conflicts: tests/virnetdevbandwidthtest.c: New test has been introduced since then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 - src/network/bridge_driver.c | 25 +----------- src/util/virnetdevbandwidth.c | 84 -------------------------------------- src/util/virnetdevbandwidth.h | 6 --- tests/virnetdevbandwidthtest.c | 91 ------------------------------------------ 5 files changed, 2 insertions(+), 205 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7655247..45f3117 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1470,7 +1470,6 @@ virNetDevBandwidthClear; virNetDevBandwidthCopy; virNetDevBandwidthEqual; virNetDevBandwidthFree; -virNetDevBandwidthMinimal; virNetDevBandwidthPlug; virNetDevBandwidthSet; virNetDevBandwidthUnplug; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6bdd1d6..0b43a67 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3284,30 +3284,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) else if (portgroup && portgroup->bandwidth) bandwidth = portgroup->bandwidth; - /* For bridgeless networks we must take into account any QoS set to them. - * This is, however, a bit tricky. With bridged network there are two - * points where QoS can be set: domain's interface and the bridge. The - * limits on those differ (in general) in which case the lower limit gets - * into effect. For example, if domain's interface average is 10Mbps but - * the network's is just 1Mbps, the domain will not be able to send data - * any faster than 1Mbps. However, on bridgeless networks we can't just set - * those two points and let kernel do its job since we have only single - * point. Therefore, we must combine the QoS settings from both domain's - * interface and network and choose the minimal value from pairs. - */ - if (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE || - netdef->forward.type == VIR_NETWORK_FORWARD_VEPA || - netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH || - netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - if (virNetDevBandwidthMinimal(&iface->data.network.actual->bandwidth, - bandwidth, - netdef->bandwidth) < 0) - goto error; - } else if (bandwidth && - virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, - bandwidth) < 0) { + if (bandwidth && virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, + bandwidth) < 0) goto error; - } /* copy appropriate vlan info to actualNet */ if (iface->vlan.nTags > 0) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 273c2db..ed6a19d 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -27,7 +27,6 @@ #include "viralloc.h" #include "virerror.h" #include "virstring.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -589,86 +588,3 @@ cleanup: VIR_FREE(ceil); return ret; } - -static void -virNetDevBandwidthRateMinimal(virNetDevBandwidthRatePtr result, - virNetDevBandwidthRatePtr band1, - virNetDevBandwidthRatePtr band2) -{ - if (!band1 || !band2) { - memcpy(result, band1 ? band1 : band2, sizeof(*result)); - return; - } - - /* We can't do a simple MIN() here, because zero value doesn't mean the - * narrowest limit, but an unset value. Hence we need symmetric F(a, b) - * so that: - * F(a, 0) = F(0, a) = a; special corner case: F(0, 0) = 0 - * F(a, b) = MIN(a, b) for a != 0 and b != 0 - */ -#define NON_ZERO_MIN(a, b) \ - ((a) && (b) ? MIN(a, b) : (a) ? (a) : (b)) - - result->average = NON_ZERO_MIN(band1->average, band2->average); - result->peak = NON_ZERO_MIN(band1->peak, band2->peak); - result->floor = NON_ZERO_MIN(band1->floor, band2->floor); - result->burst = NON_ZERO_MIN(band1->burst, band2->burst); -} - -/** - * virNetDevBandwidthMinimal: - * @result: the minimal intersect of @band1 and @band2 - * @band1: the first bandwidth - * @band2: the second bandwidth - * - * Combine the two bandwidths into one with choosing the minimal value for each - * pair of items within bandwidth structure. The resulting bandwidth is stored - * into @result. In case of both @band1 and @band2 being NULL pointers, the - * @ret is set to NULL as well as there's no bandwidth to calculate (this is - * not considered an error). The caller is responsible for freeing @result when - * no longer needed. - * - * Returns 0 on success, -1 otherwise. - */ -int -virNetDevBandwidthMinimal(virNetDevBandwidthPtr *result, - virNetDevBandwidthPtr band1, - virNetDevBandwidthPtr band2) -{ - int ret = -1; - - if (!band1 && !band2) { - /* Nothing to compute */ - *result = NULL; - return 0; - } - - if (!band1 || !band2) { - /* Sweet, one of the args is NULL. The non-NULL one - * is our minimum then. */ - return virNetDevBandwidthCopy(result, band1 ? band1 : band2); - } - - if (VIR_ALLOC(*result) < 0) - goto cleanup; - - if (band1->in || band2->in) { - if (VIR_ALLOC((*result)->in) < 0) - goto cleanup; - - virNetDevBandwidthRateMinimal((*result)->in, band1->in, band2->in); - } - - if (band1->out || band2->out) { - if (VIR_ALLOC((*result)->out) < 0) - goto cleanup; - - virNetDevBandwidthRateMinimal((*result)->out, band1->out, band2->out); - } - - ret = 0; -cleanup: - if (ret < 0) - VIR_FREE(*result); - return ret; -} diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index ea40df4..4606a07 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -74,10 +74,4 @@ int virNetDevBandwidthUpdateRate(const char *ifname, unsigned long long new_rate) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; - -int -virNetDevBandwidthMinimal(virNetDevBandwidthPtr *result, - virNetDevBandwidthPtr band1, - virNetDevBandwidthPtr band2) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_BANDWIDTH_H__ */ diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 345a0dd..609deb8 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -62,56 +62,6 @@ struct testSetStruct { } while (0) static int -testVirNetDevBandwidthMinimal(const void *data) -{ - int ret = -1; - const struct testMinimalStruct *info = data; - virNetDevBandwidthPtr expected_result = NULL, result = NULL, - band1 = NULL, band2 = NULL; - - - /* Parse given XMLs */ - PARSE(info->expected_result, expected_result); - PARSE(info->band1, band1); - PARSE(info->band2, band2); - - if (virNetDevBandwidthMinimal(&result, band1, band2) < 0) - goto cleanup; - - if (!virNetDevBandwidthEqual(expected_result, result)) { - virBuffer exp_buf = VIR_BUFFER_INITIALIZER, - res_buf = VIR_BUFFER_INITIALIZER; - char *exp = NULL, *res = NULL; - - fprintf(stderr, "expected_result != result"); - - if (virNetDevBandwidthFormat(expected_result, &exp_buf) < 0 || - virNetDevBandwidthFormat(result, &res_buf) < 0 || - !(exp = virBufferContentAndReset(&exp_buf)) || - !(res = virBufferContentAndReset(&res_buf))) { - fprintf(stderr, "Failed to fail"); - virBufferFreeAndReset(&exp_buf); - virBufferFreeAndReset(&res_buf); - VIR_FREE(exp); - VIR_FREE(res); - goto cleanup; - } - - virtTestDifference(stderr, exp, res); - VIR_FREE(exp); - VIR_FREE(res); - } - - ret = 0; -cleanup: - virNetDevBandwidthFree(expected_result); - virNetDevBandwidthFree(result); - virNetDevBandwidthFree(band1); - virNetDevBandwidthFree(band2); - return ret; -} - -static int testVirNetDevBandwidthSet(const void *data) { int ret = -1; @@ -159,15 +109,6 @@ mymain(void) { int ret = 0; -#define DO_TEST_MINIMAL(r, ...) \ - do { \ - struct testMinimalStruct data = {r, __VA_ARGS__}; \ - if (virtTestRun("virNetDevBandwidthMinimal", \ - testVirNetDevBandwidthMinimal, \ - &data) < 0) \ - ret = -1; \ - } while (0) - #define DO_TEST_SET(Band, Exp_cmd, ...) \ do { \ struct testSetStruct data = {.band = Band, \ @@ -180,38 +121,6 @@ mymain(void) } while (0) - DO_TEST_MINIMAL(NULL, NULL, NULL); - - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>", - .band1 = "<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>"); - - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>", - .band2 = "<bandwidth>" - " <inbound average='1000' peak='5000' burst='5120'/>" - " <outbound average='128' peak='256' burst='256'/>" - "</bandwidth>"); - DO_TEST_MINIMAL("<bandwidth>" - " <inbound average='1' peak='2' floor='3' burst='4'/>" - " <outbound average='5' peak='6' burst='7'/>" - "</bandwidth>", - "<bandwidth>" - " <inbound average='1' peak='2' burst='4'/>" - " <outbound average='0' burst='7'/>" - "</bandwidth>", - "<bandwidth>" - " <inbound average='1' peak='2' floor='3'/>" - " <outbound average='5' peak='6'/>" - "</bandwidth>"); - DO_TEST_SET(("<bandwidth>" " <inbound average='1' peak='2' floor='3' burst='4'/>" " <outbound average='5' peak='6' burst='7'/>" -- 1.8.5.2

2 3

[libvirt] [PATCH 0/4] Improve QoS and unit-test it
by Michal Privoznik 29 Jan '14

29 Jan '14

*** BLURB HERE *** Michal Privoznik (4): networkAllocateActualDevice: Set QoS for bridgeless networks too tests: Introduce virnetdevbandwidthtest virnetdevbandwidthtest: Introduce mocking virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 25 ++++- src/util/virnetdevbandwidth.c | 88 +++++++++++++++ src/util/virnetdevbandwidth.h | 6 + tests/Makefile.am | 14 +++ tests/virnetdevbandwidthmock.c | 106 ++++++++++++++++++ tests/virnetdevbandwidthtest.c | 244 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 482 insertions(+), 2 deletions(-) create mode 100644 tests/virnetdevbandwidthmock.c create mode 100644 tests/virnetdevbandwidthtest.c -- 1.8.5.2

3 13

[libvirt] [libvirt-glib 0/3] Add unit tests
by Christophe Fergeau 29 Jan '14

29 Jan '14

This patch series adds support for GTester tests to libvirt-glib, and starts implementing some unit tests for libvirt-gconfig, and for a very specific part of the event handling code. This series https://www.redhat.com/archives/libvir-list/2014-January/msg00939.html is needed for the gconfig test to build and successfully pass. This series https://www.redhat.com/archives/libvir-list/2014-January/msg01359.html is needed too if you don't want the event test to fail. Christophe

2 10

[libvirt] ANNOUNCE: virt-xml: Edit libvirt XML with command line options
by Cole Robinson 29 Jan '14

29 Jan '14

I've just pushed a new tool to virt-manager.git called virt-xml. virt-xml uses virt-install's command line options to allow building and editing domain XML. Best way to describe what it can do is with a bunch of examples: See a list of all suboptions that --disk and --network take # virt-xml --disk=? --network=? Change the <description> of domain 'example': # virt-xml example --edit --metadata description="my new description" # Enable the boot device menu for domain 'example': # virt-xml example --edit --boot bootmenu=on Clear the previous <cpu> definition of domain 'winxp', change it to 'host-model', but interactively confirm the diff before saving: # virt-xml winxp --edit --cpu host-model,clearxml=yes --confirm Change the sound cards with model=ac97 to model=ich6 on 'fedora19', but only output the diff: # virt-xml fedora19 --edit model=ac97 --soundhw model=ich6 --print-diff Update the first graphics password to 'foo' of the running VM 'rhel6': # virt-xml rhel6 --edit --graphics password=foo --update Remove the disk path from disk device hdc: # virt-xml rhel6 --edit target=hdc --disk path= Change all disk devices of type 'disk' to use cache=none, using XML from stdin, printing the new XML to stdout. # cat <xmlfile> | virt-xml --edit device=disk --disk cache=none Change all host devices to use driver_name=vfio for VM 'fedora20' on the remote connection # virt-xml --connect qemu+ssh://remotehost/system \ fedora20 --edit all --host-device driver_name=vfio Hotplug host USB device 001.003 to running domain 'fedora19': # virt-xml f19 --add-device --host-device 001.003 --update Add a spicevmc channel to the domain 'winxp', that will be available after the next VM shutdown. # virt-xml winxp --add-device --channel spicevmc Create a 10G qcow2 disk image and attach it to 'fedora18' for the next VM startup: # virt-xml fedora18 --add-device \ --disk /var/lib/libvirt/images/newimage.qcow2,format=qcow2,size=10 Remove the disk vdb from the running domain 'rhel7': # virt-xml rhel7 --remove-device --disk target=vdb Remove all graphics devices from the VM 'rhel7' after the next shutdown: # virt-xml rhel7 --remove-device --graphics all Generate XML for a virtio console device and print it to stdout: # virt-xml --build-xml --console pty,target_type=virtio The man page and --help output have more info, man page at: https://git.fedorahosted.org/cgit/virt-manager.git/tree/man/virt-xml.pod If you are interested in trying it out before it hits any distro, it's really simple: git clone git://git.fedorahosted.org/virt-manager.git cd virt-manager ./virt-xml --help Nothing is set in stone yet, so if anyone has suggestions about the command line syntax or any of the above, please speak up: I plan on cutting a new virt-manager release with virt-xml within the next few weeks. Thanks, Cole

4 6

[libvirt] [PATCH v2 0/4] Fix deadlock in nwfilter code
by Daniel P. Berrange 29 Jan '14

29 Jan '14

Since we introduced fine grained locking into the QEMU driver so that VM start can run in parallel, we appear to have caused a race with the nwfilter code. In particular since we no longer hold the global QEMU driver lock for the duration of VM startup we have a lock ordering flaw. This results in deadlock when nwfilter operations happen in parallel with VM startup. This also affects the LXC driver. This patch series attempts to address the problem https://bugzilla.redhat.com/show_bug.cgi?id=929412 the removal of the windows thread impl isn't strictly required, I just didn't want to waste time creating a read/write lock impl for Windows threads. See also this callgraph http://berrange.fedorapeople.org/nwfilter.ps In v2: - Re-ordered patches and squashed two together - Add missing locking in state reload function - Don't remove locking from virNWFilterInstantiateFilterLate Daniel P. Berrange (4): Add a read/write lock implementation Remove windows thread implementation in favour of pthreads Add a mutex to serialize updates to firewall Push nwfilter update locking up to top level configure.ac | 15 +- src/Makefile.am | 4 - src/conf/nwfilter_conf.c | 23 +- src/conf/nwfilter_conf.h | 3 +- src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 6 + src/nwfilter/nwfilter_driver.c | 15 +- src/nwfilter/nwfilter_gentech_driver.c | 23 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/qemu/qemu_driver.c | 6 + src/uml/uml_driver.c | 4 + src/util/virthread.c | 291 +++++++++++++++++++++++- src/util/virthread.h | 51 ++++- src/util/virthreadpthread.c | 278 ----------------------- src/util/virthreadpthread.h | 49 ---- src/util/virthreadwin32.c | 396 --------------------------------- src/util/virthreadwin32.h | 53 ----- 17 files changed, 404 insertions(+), 823 deletions(-) delete mode 100644 src/util/virthreadpthread.c delete mode 100644 src/util/virthreadpthread.h delete mode 100644 src/util/virthreadwin32.c delete mode 100644 src/util/virthreadwin32.h -- 1.8.4.2

3 21

[libvirt] [RFC PATCHv2 0/4] Adding 'config' driver
by Adam Walters 29 Jan '14

29 Jan '14

This patchset adds a driver named 'config' which provides access to configuration data, such as secret and storage definitions, without requiring a connection to a hypervisor. This complements my previous patchset, which resolves the race condition on libvirtd startup. The rationale behind this idea is that there exist circumstances under which a driver may require access to things such as secrets during a time at which there is no active connection to a hypervisor. Currently, that data can not be accessed. An example of this in libvirt today is that the storage driver requires a connection in order to access secret data to auto-start an RBD storage pool that uses CephX authentication. My previous patchset breaks the ability to auto-start that type of storage pool, and this patchset fixes it again. This driver is technically what one may call a hypervisor driver, but it does not implement any domain operations. It simply exists to handle requests by drivers for access to information that would otherwise by unattainable. The URI provided by this driver is 'config:///' and has been tested working on four different machines of mine, running three different Linux distributions (Archlinux, Gentoo, and CentOS). Being a very simple driver, I would expect it to work pretty much anywhere. I welcome comments and suggestions related to this driver. At the very least, this patchset combined with my previous patchset resolves the current race condition present on startup of libvirtd without any loss of functionality. Adam Walters (4): config: Adding config driver configure: Implement config driver libvirtd: Reorder load of secrets driver storage: Change hardcoded QEMU connection to use config driver configure.ac | 11 ++ daemon/libvirtd.c | 21 ++-- include/libvirt/virterror.h | 2 + po/POTFILES.in | 1 + src/Makefile.am | 25 +++++ src/config/config_driver.c | 238 +++++++++++++++++++++++++++++++++++++++++++ src/config/config_driver.h | 44 ++++++++ src/storage/storage_driver.c | 13 +-- src/util/virerror.c | 2 + 9 files changed, 345 insertions(+), 12 deletions(-) create mode 100644 src/config/config_driver.c create mode 100644 src/config/config_driver.h -- 1.8.5.2

2 7

[libvirt] [PATCHv2 0/9] Snapshots on gluster
by Peter Krempa 29 Jan '14

29 Jan '14

Peter Krempa (9): storage: Add new argument for createVol backend API storage: gluster: Introduce dummy functions for creating a volume storage: Add internal API to create temporary storage pools and vols snapshot: Add support for specifying snapshot disk backing type snapshot: Test snapshot disk type specification storage: Implement ephemeral storage APIs in the generic storage driver storage: gluster: Support conversion of gluster volumes to temp volumes qemu: snapshot: Switch snapshot file deletion to the new storage API qemu: snapshot: Add support for external active snapshots on gluster docs/formatsnapshot.html.in | 15 + docs/hvsupport.pl | 3 + docs/schemas/domainsnapshot.rng | 76 +++- src/Makefile.am | 3 +- src/check-aclrules.pl | 3 + src/check-drivername.pl | 1 + src/conf/snapshot_conf.c | 42 ++- src/conf/snapshot_conf.h | 15 +- src/driver.h | 13 + src/libvirt_internal.c | 70 ++++ src/libvirt_internal.h | 22 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 9 + src/qemu/qemu_conf.c | 3 - src/qemu/qemu_driver.c | 227 ++++++++++-- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 30 +- src/storage/storage_backend_gluster.c | 119 +++++- src/storage/storage_backend_logical.c | 6 +- src/storage/storage_backend_rbd.c | 3 +- src/storage/storage_backend_sheepdog.c | 3 +- src/storage/storage_driver.c | 405 ++++++++++++++++++++- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 + .../disk_driver_name_null.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 22 +- .../disk_snapshot_redefine.xml | 6 +- 28 files changed, 1007 insertions(+), 120 deletions(-) create mode 100644 src/libvirt_internal.c -- 1.8.5.2

2 22

[libvirt] [libvirt-glib 0/3] Fixes to glib/libvirt mainloop integration
by Christophe Fergeau 29 Jan '14

29 Jan '14

While reviewing danpb's win32 patch for the mainloop integration code, I found 2 more issues in the existing code (one leak, one bug). These patches fix this (first patch is just some cleanup). Christophe

2 6

[libvirt] [PATCH] Honor blacklist for modprobe command
by John Ferlan 29 Jan '14

29 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1045124 When loading modules, libvirt does not honor the modprobe blacklist. By adding a "-b" to the modprobe command libvirt will fail to load a module if it's on the blacklist Check if the failure to load a driver was due to it being on the blacklist using the output of a "modprobe -c" searching for "blacklist <driver_Name>" where driver_Name is possibly a modified string of the input driver changing all '-' into '_' since that's what modprobe does. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virpci.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index e2d222e..18b85f2 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -979,6 +979,10 @@ virPCIProbeStubDriver(const char *driver) { char *drvpath = NULL; bool probed = false; + size_t i; + char *drvblklst = NULL; + char *outbuf = NULL; + virCommandPtr cmd = NULL; recheck: if (virPCIDriverDir(&drvpath, driver) == 0 && virFileExists(drvpath)) { @@ -990,18 +994,49 @@ recheck: VIR_FREE(drvpath); if (!probed) { - const char *const probecmd[] = { MODPROBE, driver, NULL }; + cmd = virCommandNewArgList(MODPROBE, "-b", driver, NULL); probed = true; - if (virRun(probecmd, NULL) < 0) { + if (virCommandRun(cmd, NULL) < 0) { char ebuf[1024]; VIR_WARN("failed to load driver %s: %s", driver, virStrerror(errno, ebuf, sizeof(ebuf))); - return -1; + goto cleanup; } + virCommandFree(cmd); + cmd = NULL; goto recheck; } + /* All error path code - purpose is to determine whether the failure + * occurs because device is on blacklist in order to add an error + * message to help detect why load failed + */ + if (virAsprintfQuiet(&drvblklst, "blacklist %s", driver) < 0) + goto cleanup; + + /* Although driver may have dash, 'modprobe -c' adjusts to use underscore */ + for (i = 0; i < drvblklst[i]; i++) + if (drvblklst[i] == '-') + drvblklst[i] = '_'; + + cmd = virCommandNewArgList(MODPROBE, "-c", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + /* Find driver on blacklist? */ + if (strstr(outbuf, drvblklst)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load PCI stub module %s: " + "administratively prohibited"), + driver); + } + +cleanup: + virCommandFree(cmd); + VIR_FREE(drvblklst); + VIR_FREE(outbuf); return -1; } @@ -1313,9 +1348,10 @@ virPCIDeviceDetach(virPCIDevicePtr dev, virPCIDeviceList *inactiveDevs) { if (virPCIProbeStubDriver(dev->stubDriver) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s"), - dev->stubDriver); + if (virGetLastError() == NULL) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load PCI stub module %s"), + dev->stubDriver); return -1; } -- 1.8.4.2

2 3