- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Introduce qemuhotplugtest
by Michal Privoznik 25 Jun '13

25 Jun '13

As my punishment for the break in 7f15ebc7 (fixed in 752596b5dd) I'm introducing this test to make sure it won't happen again. Currently, only test for <graphics/> is supported. --- .gitignore | 1 + tests/Makefile.am | 11 +- tests/qemuhotplugtest.c | 208 +++++++++++++++++++++ .../qemuhotplug-disk-cdrom-nochange.xml | 6 + .../qemuhotplug-graphics-spice-listen.xml | 11 ++ .../qemuhotplug-graphics-spice-nochange.xml | 11 ++ ...qemuhotplug-graphics-spice-timeout-nochange.xml | 1 + ...qemuhotplug-graphics-spice-timeout-password.xml | 1 + .../qemuxml2argv-graphics-spice-listen-network.xml | 45 +++++ 9 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 tests/qemuhotplugtest.c create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml diff --git a/.gitignore b/.gitignore index 7a28941..3efc2e4 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ /tests/openvzutilstest /tests/qemuargv2xmltest /tests/qemuhelptest +/tests/qemuhotplugtest /tests/qemumonitorjsontest /tests/qemumonitortest /tests/qemuxmlnstest diff --git a/tests/Makefile.am b/tests/Makefile.am index 9c9c802..a019eb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -155,7 +155,7 @@ endif if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ - qemumonitortest qemumonitorjsontest + qemumonitortest qemumonitorjsontest qemuhotplugtest endif if WITH_LXC @@ -405,6 +405,13 @@ qemumonitorjsontest_SOURCES = \ $(NULL) qemumonitorjsontest_LDADD = $(qemu_LDADDS) libqemumonitortestutils.la +qemuhotplugtest_SOURCES = \ + qemuhotplugtest.c \ + testutils.c testutils.h \ + testutilsqemu.c testutilsqemu.h \ + $(NULL) +qemuhotplugtest_LDADD = $(qemu_LDADDS) libqemumonitortestutils.la + domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h @@ -413,7 +420,7 @@ else EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ - qemumonitorjsontest.c \ + qemumonitorjsontest.c qemuhotplugtest.c \ $(QEMUMONITORTESTUTILS_SOURCES) endif diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c new file mode 100644 index 0000000..ed3ca7f --- /dev/null +++ b/tests/qemuhotplugtest.c @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2011-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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "qemu/qemu_conf.h" +#include "qemu/qemu_hotplug.h" +#include "qemumonitortestutils.h" +#include "testutils.h" +#include "testutilsqemu.h" +#include "virerror.h" +#include "virstring.h" +#include "virthread.h" +#include "virfile.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virQEMUDriver driver; + +struct qemuHotplugTestData { + const char *domain_filename; + const char *device_filename; + bool fail; + const char *const *mon; +}; + +static int +qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, + virDomainObjPtr *vm, + const char *filename) +{ + int ret = -1; + + if (!(*vm = virDomainObjNew(xmlopt))) + goto cleanup; + + if (!((*vm)->def = virDomainDefParseFile(filename, + driver.caps, + driver.xmlopt, + QEMU_EXPECTED_VIRT_TYPES, + 0))) + goto cleanup; + + ret = 0; +cleanup: + return ret; +} + +static int +testQemuHotplug(const void *data) +{ + int ret = -1; + struct qemuHotplugTestData *test = (struct qemuHotplugTestData *) data; + char *domain_filename = NULL; + char *device_filename = NULL; + char *device_xml = NULL; + const char *const *tmp; + bool fail = test->fail; + virDomainObjPtr vm = NULL; + virDomainDeviceDefPtr dev = NULL; + virCapsPtr caps = NULL; + qemuMonitorTestPtr test_mon = NULL; + qemuDomainObjPrivatePtr priv; + + if (virAsprintf(&domain_filename, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml", + abs_srcdir, test->domain_filename) < 0 || + virAsprintf(&device_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", + abs_srcdir, test->device_filename) < 0) + goto cleanup; + + if (!(caps = virQEMUDriverGetCapabilities(&driver, false))) + goto cleanup; + + if (qemuHotplugCreateObjects(driver.xmlopt, &vm, domain_filename) < 0) + goto cleanup; + + priv = vm->privateData; + + if (virtTestLoadFile(device_filename, &device_xml) < 0) + goto cleanup; + + if (!(dev = virDomainDeviceDefParse(device_xml, vm->def, + caps, driver.xmlopt, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + /* Now is the best time to feed the spoofed monitor with predefined + * replies. */ + if (!(test_mon = qemuMonitorTestNew(true, driver.xmlopt))) + goto cleanup; + + tmp = test->mon; + while (tmp && *tmp) { + const char *command_name; + const char *response; + + if (!(command_name = *tmp++) || + !(response = *tmp++)) + break; + if (qemuMonitorTestAddItem(test_mon, command_name, response) < 0) + goto cleanup; + } + + priv->mon = qemuMonitorTestGetMonitor(test_mon); + priv->monJSON = true; + + /* XXX We need to unlock the monitor here, as + * qemuDomainObjEnterMonitorInternal (called from qemuDomainChangeGraphics) + * tries to lock it again */ + virObjectUnlock(priv->mon); + + /* XXX Ideally, we would call qemuDomainUpdateDeviceLive here. But that + * would require us to provide virConnectPtr and virDomainPtr (they're used + * in case of updating a disk device. So for now, we will proceed with + * breaking the function into pieces. If we ever learn how to fake those + * required object, we can replace this code then. */ + switch (dev->type) { + case VIR_DOMAIN_DEVICE_GRAPHICS: + ret = qemuDomainChangeGraphics(&driver, vm, dev->data.graphics); + break; + default: + if (virTestGetVerbose()) + fprintf(stderr, "device type '%s' cannot be updated", + virDomainDeviceTypeToString(dev->type)); + break; + } + +cleanup: + VIR_FREE(domain_filename); + VIR_FREE(device_filename); + VIR_FREE(device_xml); + /* don't dispose test monitor with VM */ + priv->mon = NULL; + virObjectUnref(vm); + virDomainDeviceDefFree(dev); + virObjectUnref(caps); + qemuMonitorTestFree(test_mon); + return ((ret < 0 && fail) || (!ret && !fail)) ? 0 : -1; +} + +static int +mymain(void) +{ + int ret = 0; + +#if !WITH_YAJL + fputs("libvirt not compiled with yajl, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + + if (virThreadInitialize() < 0 || + !(driver.caps = testQemuCapsInit()) || + !(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) + return EXIT_FAILURE; + + virEventRegisterDefaultImpl(); + + driver.config = virQEMUDriverConfigNew(false); + VIR_FREE(driver.config->spiceListen); + VIR_FREE(driver.config->vncListen); + + /* some dummy values from 'config file' */ + if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0) + return EXIT_FAILURE; + +#define DO_TEST(file, dev, fial, ...) \ + do { \ + const char *my_mon[] = { __VA_ARGS__, NULL}; \ + struct qemuHotplugTestData data = \ + {.domain_filename = file, .device_filename = dev, .fail = fial, \ + .mon = my_mon}; \ + if (virtTestRun(#file, 1, testQemuHotplug, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST("graphics-spice", "graphics-spice-nochange", false, NULL); + DO_TEST("graphics-spice-timeout", "graphics-spice-timeout-nochange", false, + "set_password", "{\"return\":{}}", "expire_password", "{\"return\":{}}"); + DO_TEST("graphics-spice-timeout", "graphics-spice-timeout-password", false, + "set_password", "{\"return\":{}}", "expire_password", "{\"return\":{}}"); + DO_TEST("graphics-spice", "graphics-spice-listen", true, NULL); + DO_TEST("graphics-spice-listen-network", "graphics-spice-listen-network", false, + "set_password", "{\"return\":{}}", "expire_password", "{\"return\":{}}"); + /* Strange huh? Currently, only graphics can be testet :-P */ + DO_TEST("disk-cdrom", "disk-cdrom-nochange", true, NULL); + + virObjectUnref(driver.caps); + virObjectUnref(driver.xmlopt); + return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml new file mode 100644 index 0000000..26841ea --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml @@ -0,0 +1,6 @@ + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml new file mode 100644 index 0000000..d4a8d04 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml @@ -0,0 +1,11 @@ + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='192.168.0.1' defaultMode='secure'> + <listen type='address' address='192.168.0.1'/> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + </graphics> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml new file mode 100644 index 0000000..498ffa2 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml @@ -0,0 +1,11 @@ + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'> + <listen type='address' address='127.0.0.1'/> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + </graphics> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml new file mode 100644 index 0000000..f7ea796 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml @@ -0,0 +1 @@ + <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml new file mode 100644 index 0000000..f826459 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml @@ -0,0 +1 @@ + <graphics type='spice' port='5900' autoport='no' passwd='secret' passwdValidTo='2013-05-31T16:11:22' connected='disconnect'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml new file mode 100644 index 0000000..34971fe --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> + <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> + <channel mode='secure' name='main'/> + <channel mode='secure' name='display'/> + <channel mode='secure' name='inputs'/> + <channel mode='secure' name='cursor'/> + <channel mode='secure' name='playback'/> + <channel mode='secure' name='record'/> + <channel mode='secure' name='smartcard'/> + <channel mode='secure' name='usbredir'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='18432' heads='1'/> + </video> + <video> + <model type='qxl' ram='65536' vram='32768' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> -- 1.8.1.5

2 3

[libvirt] [PATCH] virsh: edit: don't leak XML string on reedit or redefine
by Ján Tomko 25 Jun '13

25 Jun '13

Free the old XML strings before overwriting them if the user has chosen to reedit the file or force the redefinition. Found by Alex Jia trying to reproduce another bug: https://bugzilla.redhat.com/show_bug.cgi?id=977430#c3 --- tools/virsh-edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 9d612a3..bb79853 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -86,6 +86,7 @@ reedit: goto edit_cleanup; /* Read back the edited file. */ + VIR_FREE(doc_edited); doc_edited = vshEditReadBackFile(ctl, tmp); if (!doc_edited) goto edit_cleanup; @@ -102,6 +103,7 @@ redefine: * it was being edited? This also catches problems such as us * losing a connection or the object going away. */ + VIR_FREE(doc_reread); doc_reread = (EDIT_GET_XML); if (!doc_reread) goto edit_cleanup; -- 1.8.1.5

2 2

[libvirt] [PATCH] BSD: implement virNetDev(Set|Clear)IPv4Address
by Roman Bogorodskiy 25 Jun '13

25 Jun '13

Provide an implementation of virNetDev(Set|Clear)IPv4Address based on BSD ifconfig tool in addition to 'ip' from Linux iproute2 package. --- configure.ac | 15 +++++++++++++++ src/util/virnetdev.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/configure.ac b/configure.ac index ef246a6..16560fc 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,10 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are known @@ -408,6 +412,8 @@ if test $with_linux = no; then fi if test $with_freebsd = yes; then + want_ifconfig=yes + with_firewalld=no fi @@ -2410,6 +2416,15 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check if we need to look for ifconfig +if test "$want_ifconfig" = "yes"; then + AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) + if test -z "$IFCONFIG_PATH"; then + AC_MSG_ERROR([Failed to find ifconfig.]) + fi + AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) +fi + # Detect when running under the clang static analyzer's scan-build driver # or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. AC_CACHE_CHECK([whether this build is done by a static analysis tool], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7aba515..85f39a3 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -814,12 +814,21 @@ int virNetDevSetIPv4Address(const char *ifname, !(bcaststr = virSocketAddrFormat(&broadcast)))) { goto cleanup; } +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArgList(cmd, ifname, "inet", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArg(cmd, "alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -899,10 +908,17 @@ int virNetDevClearIPv4Address(const char *ifname, if (!(addrstr = virSocketAddrFormat(addr))) goto cleanup; +#ifdef IFCoNFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArgList(cmd, ifname, "inet", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArg(cmd, "-alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; -- 1.8.2.3

3 3

[libvirt] [PATCH v2] BSD: implement virNetDev(Set|Clear)IPv4Address
by Roman Bogorodskiy 25 Jun '13

25 Jun '13

Provide an implementation of virNetDev(Set|Clear)IPv4Address based on BSD ifconfig tool in addition to 'ip' from Linux iproute2 package. --- configure.ac | 15 +++++++++++++++ src/util/virnetdev.c | 26 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/configure.ac b/configure.ac index ef246a6..15618dc 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,10 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are known @@ -408,6 +412,8 @@ if test $with_linux = no; then fi if test $with_freebsd = yes; then + want_ifconfig=yes + with_firewalld=no fi @@ -2410,6 +2416,15 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check if we need to look for ifconfig +if test "$want_ifconfig" = "yes"; then + AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) + if test -z "$IFCONFIG_PATH"; then + AC_MSG_ERROR([Failed to find ifconfig.]) + fi + AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) +fi + # Detect when running under the clang static analyzer's scan-build driver # or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. AC_CACHE_CHECK([whether this build is done by a static analysis tool], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ebe20d0..4d53ac3 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -816,12 +816,26 @@ int virNetDevSetIPv4Address(const char *ifname, !(bcaststr = virSocketAddrFormat(&broadcast)))) { goto cleanup; } +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) { + virCommandAddArg(cmd, "inet"); + } else if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) { + virCommandAddArg(cmd, "inet6"); + } + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArg(cmd, "alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -901,10 +915,22 @@ int virNetDevClearIPv4Address(const char *ifname, if (!(addrstr = virSocketAddrFormat(addr))) goto cleanup; +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) { + virCommandAddArg(cmd, "inet"); + } else if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) { + virCommandAddArg(cmd, "inet6"); + } + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArg(cmd, "-alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; -- 1.7.11.5

1 0

[libvirt] [PATCH] build: Fix check-aclrules in VPATH build
by Jiri Denemark 25 Jun '13

25 Jun '13

--- Pushed as a build-breaker. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 530de53..e6b1927 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -500,7 +500,7 @@ check-driverimpls: check-aclrules: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \ - $(STATEFUL_DRIVER_SOURCE_FILES) + $(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES))) EXTRA_DIST += check-driverimpls.pl check-aclrules.pl -- 1.8.2.1

1 0

[libvirt] [PATCH 00/22] support VFIO groups
by Laine Stump 24 Jun '13

24 Jun '13

When I first put in support for VFIO device assignment, I didn't realize that groups of devices were quite as common as they actually are. In particular, I didn't know that often multiple seemingly-unrelated devices can end up in the same VFIO iommu group due to unlucky circumstances of hardware - they may share a dma controller which means that the devices can't truly be isolated from each other, and thus should not be simultaneously assigned to different guests (or even used by the host) - all of the devices in a group should be either assigned to the same guest or, if not assigned to the guest, should be isolated off in a driver to prevent them from being used by the host. The following set of patches makes setting that up easier to deal with. The end result of all the patches is the following: 1) The virNodeDevice API will be able to detach or re-attach all the devices in a particular group with a single API call. 2) <hostdev managed='yes'>, <interface type='hostdev' managed='yes'>, and <interface type='network' managed='yes'> devices (where the network is itself a pool of SRIOV Virtual Functions) can specify: <driver name='vfio' group='auto'/> and libvirt will automatically detach (and bind to the 'vfio-pci' driver for assignment/isolation) all devices in the same group as the device being assigned. Likewise, when the device it detached from the guest, a check will be made and, if none of the devices in the same group as the device being detach is still in use by a guest As usual there are a lot of patches here, but many of them are extremely simple, so don't be put off by the count. Also, please note that patches 15/22 - 18/22 provide a new public API (virNodeDeviceReAttachFlags()). I kept the new API later in the series just in case someone wanted to backport as much as possible of this patchset to an old release. Laine Stump (22): syntax: virPCIDeviceFree is also a NOP for NULL args pci: change stubDriver from const char* to char* pci: new utility functions pci: eliminate memory leak in virPCIDeviceReattach pci: make virPCIDeviceDetach consistent in behavior pci: eliminate repetitive path constructions in virPCIDeviceBindToStub pci: eliminate unused driver arg from virPCIDeviceDetach pci: update stubDriver name in virPCIDeviceBindToStub pci: rename virPCIDeviceGetVFIOGroupDev to virPCIDeviceGetIOMMUGroupDev pci: make virPCIParseDeviceAddress public pci: new iommu_group functions pci: optionally detach/reattach all devices in a VFIO group API & qemu: add ability to detach an entire VFIO group of devices virsh: add option to detach entire group of devices API: new virNodeDeviceReAttachFlags API: implement RPC calls for virNodeDeviceReAttachFlags qemu: implement virNodeDeviceReAttachFlags xen: implement virNodeDeviceReAttachFlags virsh: add option to attach entire group of devices nodedev: add iommuGroup to node device object conf: add <driver group='auto'> to hostdev, interface, and networks qemu: implement backend of <driver group='auto'/> cfg.mk | 1 + docs/formatdomain.html.in | 94 ++- docs/formatnetwork.html.in | 11 + docs/formatnode.html.in | 63 +- docs/schemas/domaincommon.rng | 16 + docs/schemas/network.rng | 8 + docs/schemas/nodedev.rng | 11 + include/libvirt/libvirt.h.in | 18 + src/conf/domain_conf.c | 36 +- src/conf/domain_conf.h | 13 + src/conf/network_conf.c | 39 +- src/conf/network_conf.h | 14 + src/conf/node_device_conf.c | 86 ++- src/conf/node_device_conf.h | 5 +- src/driver.h | 5 + src/libvirt.c | 60 ++ src/libvirt_private.syms | 11 +- src/libvirt_public.syms | 4 + src/network/bridge_driver.c | 22 + src/node_device/node_device_udev.c | 21 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_driver.c | 40 +- src/qemu/qemu_hostdev.c | 39 +- src/remote/remote_driver.c | 29 + src/remote/remote_protocol.x | 12 +- src/remote_protocol-structs | 5 + src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 +- src/security/security_selinux.c | 4 +- src/util/virpci.c | 707 ++++++++++++++++++--- src/util/virpci.h | 37 +- src/xen/xen_driver.c | 22 +- tests/networkxml2xmlin/hostdev-pf.xml | 2 +- tests/networkxml2xmlout/hostdev-pf.xml | 2 +- tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 16 + tests/nodedevxml2xmltest.c | 1 + .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 +- .../qemuxml2argv-net-hostdev-vfio.xml | 2 +- tools/virsh-nodedev.c | 30 +- 39 files changed, 1340 insertions(+), 158 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml -- 1.7.11.7

3 35

[libvirt] [PATCH] qemu: don't reset PCI devices being assigned with VFIO
by Laine Stump 24 Jun '13

24 Jun '13

I just learned that VFIO resets PCI devices when they are assigned to guests / returned to the host, so it is redundant for libvirt to reset the devices. This patch inhibits calling virPCIDeviceReset to devices that will be/were assigned using VFIO. --- src/qemu/qemu_hostdev.c | 4 ++++ src/qemu/qemu_hotplug.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 2b0221d..5a87eb0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -556,6 +556,8 @@ int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, * can safely reset them */ for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); + if (STREQ_NULLABLE(virPCIDeviceGetStubDriver(dev), "vfio-pci")) + continue; if (virPCIDeviceReset(dev, driver->activePciHostdevs, driver->inactivePciHostdevs) < 0) goto reattachdevs; @@ -1122,6 +1124,8 @@ void qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver, for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); + if (STREQ_NULLABLE(virPCIDeviceGetStubDriver(dev), "vfio-pci")) + continue; if (virPCIDeviceReset(dev, driver->activePciHostdevs, driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 18f5fa5..46875ad 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2528,8 +2528,9 @@ qemuDomainDetachHostPciDevice(virQEMUDriverPtr driver, if (pci) { activePci = virPCIDeviceListSteal(driver->activePciHostdevs, pci); if (activePci && - virPCIDeviceReset(activePci, driver->activePciHostdevs, - driver->inactivePciHostdevs) == 0) { + (subsys->u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO || + virPCIDeviceReset(activePci, driver->activePciHostdevs, + driver->inactivePciHostdevs) == 0)) { qemuReattachPciDevice(activePci, driver); ret = 0; } else { -- 1.7.11.7

2 1

[libvirt] [PATCH v2 0/8] Chardev hotplug
by Michal Privoznik 24 Jun '13

24 Jun '13

The second round which is just a rebase of the first round: https://www.redhat.com/archives/libvir-list/2013-May/msg00395.html Michal Privoznik (8): domain_conf: Introduce chardev hotplug helpers qemu: Implement chardev hotplug on config level qemu_monitor_json: Move InetSocketAddress build to a separate function qemu_monitor: Introduce qemuMonitorAttachCharDev qemu_monitor: Introduce qemuMonitorDetachCharDev qemu_command: Honour chardev alias assignment with a function qemu: Introduce qemuBuildChrDeviceStr qemu: Implement chardev hotplug on live level src/conf/domain_conf.c | 182 +++++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_command.c | 262 +++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_command.h | 14 ++- src/qemu/qemu_driver.c | 43 ++++++- src/qemu/qemu_hotplug.c | 102 +++++++++++++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_monitor.c | 41 +++++++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 259 +++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 5 + 12 files changed, 861 insertions(+), 73 deletions(-) -- 1.8.2.1

4 18

[libvirt] [PATCH 0/2] libxl: Add support for qdisk disk backend
by Jim Fehlig 24 Jun '13

24 Jun '13

An update of https://www.redhat.com/archives/libvir-list/2013-April/msg02104.html This small patch series adds support for qdisk backend type in libxl. A qdisk uses the block drivers in qemu to serve as a block backend, verses blktap or blkbk. While testing the second patch, I noticed a slightly misleading error was emitted when the tap backend didn't support the requested disk format. Fix this with the first patch, including adding format checks in the other supported disk backends. V2: Fix logic errors when validating disk format Jim Fehlig (2): libxl: Fix disk format error message libxl: support qdisk backend src/libxl/libxl_conf.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) -- 1.7.7

2 5

[libvirt] Introduction of virDomainDefPtr resulted in deadlock in xenUnifiedDomainGetXMLDesc
by Stefan Bader 24 Jun '13

24 Jun '13

The problem is the mutex lock on xenUnifiedPrivatePtr which is held around xenDomainUsedCpus. xenUnifiedDomainGetXMLDesc ... xenUnifiedLock(priv); cpus = xenDomainUsedCpus(dom); xenUnifiedUnlock(priv); ... Unfortunately the introduction of virDomainDefPtr added the following call paths xenDomainUsedCpus ... nb_vcpu = xenUnifiedDomainGetMaxVcpus(dom); return xenUnifiedDomainGetVcpusFlags(...) ... if (!(def = xenGetDomainDefForDom(dom))) return xenGetDomainDefForUUID(dom->conn, dom->uuid); ... ret = xenHypervisorLookupDomainByUUID(conn, uuid); ... xenUnifiedLock(priv); name = xenStoreDomainGetName(conn, id); xenUnifiedUnlock(priv); ... if ((ncpus = xenUnifiedDomainGetVcpus(dom, cpuinfo, nb_vcpu, ... if (!(def = xenGetDomainDefForDom(dom))) [again like above] Right now, running the GetXMLDesc command for an active Xen domain will lock up right in the xenUnifiedDomainGetMaxVcpus call. But any subcall leading to a call to xenGetDomainDefForDom while holding the xenUnifiedPrivatePtr lock will have the same fate. I assume the lock around the xenDomainUsedCpus call is there to ensure all accesses to the private pointer see consistent data. Otherwise it would be possible to simply release the lock before the GetMaxVcpus and GetVcpus calls. If that lock cannot be dropped this feels like a much more painful rework is needed. What do others think? -Stefan

2 3