- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Silence qemuxml2argv test
by Jiri Denemark 23 Oct '10

23 Oct '10

--- tests/qemuxml2argvtest.c | 240 +++++++++++++++++++++++++--------------------- 1 files changed, 132 insertions(+), 108 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 551d6c4..4eb3cc6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -4,6 +4,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <stdbool.h> #include <sys/types.h> #include <fcntl.h> @@ -26,7 +27,8 @@ static struct qemud_driver driver; static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, unsigned long long extraFlags, - const char *migrateFrom) { + const char *migrateFrom, + bool expectError) { char argvData[MAX_FILE]; char *expectargv = &(argvData[0]); char *actualargv = NULL; @@ -38,6 +40,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; virConnectPtr conn; + char *log = NULL; if (!(conn = virGetConnect())) goto fail; @@ -80,12 +83,28 @@ static int testCompareXMLToArgvFiles(const char *xml, } + free(virtTestLogContentAndReset()); + if (qemudBuildCommandLine(conn, &driver, vmdef, &monitor_chr, 0, flags, &argv, &qenv, NULL, NULL, migrateFrom, NULL) < 0) goto fail; + if ((log = virtTestLogContentAndReset()) == NULL) + goto fail; + + if (!!strstr(log, ": error :") != expectError) { + if (virTestGetDebug()) + fprintf(stderr, "\n%s", log); + goto fail; + } + + if (expectError) { + /* need to suppress the errors */ + virResetLastError(); + } + len = 1; /* for trailing newline */ tmp = qenv; while (*tmp) { @@ -125,6 +144,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; fail: + free(log); free(actualargv); if (argv) { tmp = argv; @@ -152,6 +172,7 @@ struct testInfo { const char *name; unsigned long long extraFlags; const char *migrateFrom; + bool expectError; }; static int testCompareXMLToArgvHelper(const void *data) { @@ -162,7 +183,8 @@ static int testCompareXMLToArgvHelper(const void *data) { abs_srcdir, info->name); snprintf(args, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.args", abs_srcdir, info->name); - return testCompareXMLToArgvFiles(xml, args, info->extraFlags, info->migrateFrom); + return testCompareXMLToArgvFiles(xml, args, info->extraFlags, + info->migrateFrom, info->expectError); } @@ -193,16 +215,18 @@ mymain(int argc, char **argv) if ((driver.hugepage_path = strdup("/dev/hugepages/libvirt/qemu")) == NULL) return EXIT_FAILURE; -# define DO_TEST_FULL(name, extraFlags, migrateFrom) \ +# define DO_TEST_FULL(name, extraFlags, migrateFrom, expectError) \ do { \ - const struct testInfo info = { name, extraFlags, migrateFrom }; \ + const struct testInfo info = { \ + name, extraFlags, migrateFrom, expectError \ + }; \ if (virtTestRun("QEMU XML-2-ARGV " name, \ 1, testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ } while (0) -# define DO_TEST(name, extraFlags) \ - DO_TEST_FULL(name, extraFlags, NULL) +# define DO_TEST(name, extraFlags, expectError) \ + DO_TEST_FULL(name, extraFlags, NULL, expectError) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected @@ -217,175 +241,175 @@ mymain(int argc, char **argv) unsetenv("QEMU_AUDIO_DRV"); unsetenv("SDL_AUDIODRIVER"); - DO_TEST("minimal", QEMUD_CMD_FLAG_NAME); - DO_TEST("machine-aliases1", 0); - DO_TEST("machine-aliases2", 0); - DO_TEST("boot-cdrom", 0); - DO_TEST("boot-network", 0); - DO_TEST("boot-floppy", 0); - DO_TEST("boot-multi", QEMUD_CMD_FLAG_BOOT_MENU); - DO_TEST("boot-menu-disable", QEMUD_CMD_FLAG_BOOT_MENU); - DO_TEST("bootloader", QEMUD_CMD_FLAG_DOMID); - DO_TEST("clock-utc", 0); - DO_TEST("clock-localtime", 0); + DO_TEST("minimal", QEMUD_CMD_FLAG_NAME, false); + DO_TEST("machine-aliases1", 0, false); + DO_TEST("machine-aliases2", 0, true); + DO_TEST("boot-cdrom", 0, false); + DO_TEST("boot-network", 0, false); + DO_TEST("boot-floppy", 0, false); + DO_TEST("boot-multi", QEMUD_CMD_FLAG_BOOT_MENU, false); + DO_TEST("boot-menu-disable", QEMUD_CMD_FLAG_BOOT_MENU, false); + DO_TEST("bootloader", QEMUD_CMD_FLAG_DOMID, true); + DO_TEST("clock-utc", 0, false); + DO_TEST("clock-localtime", 0, false); /* * Can't be enabled since the absolute timestamp changes every time - DO_TEST("clock-variable", QEMUD_CMD_FLAG_RTC); + DO_TEST("clock-variable", QEMUD_CMD_FLAG_RTC, false); */ - DO_TEST("clock-france", QEMUD_CMD_FLAG_RTC); + DO_TEST("clock-france", QEMUD_CMD_FLAG_RTC, false); - DO_TEST("hugepages", QEMUD_CMD_FLAG_MEM_PATH); - DO_TEST("disk-cdrom", 0); - DO_TEST("disk-cdrom-empty", QEMUD_CMD_FLAG_DRIVE); - DO_TEST("disk-floppy", 0); - DO_TEST("disk-many", 0); + DO_TEST("hugepages", QEMUD_CMD_FLAG_MEM_PATH, false); + DO_TEST("disk-cdrom", 0, false); + DO_TEST("disk-cdrom-empty", QEMUD_CMD_FLAG_DRIVE, false); + DO_TEST("disk-floppy", 0, false); + DO_TEST("disk-many", 0, false); DO_TEST("disk-virtio", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT); + QEMUD_CMD_FLAG_DRIVE_BOOT, false); DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT); + QEMUD_CMD_FLAG_DRIVE_BOOT, false); DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT); + QEMUD_CMD_FLAG_DRIVE_BOOT, false); DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT); + QEMUD_CMD_FLAG_DRIVE_BOOT, false); DO_TEST("floppy-drive-fat", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-fat", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-readonly-disk", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("disk-drive-fmt-qcow", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_BOOT | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-shared", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_FORMAT | QEMUD_CMD_FLAG_DRIVE_SERIAL); + QEMUD_CMD_FLAG_DRIVE_FORMAT | QEMUD_CMD_FLAG_DRIVE_SERIAL, false); DO_TEST("disk-drive-cache-v1-wt", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-cache-v1-wb", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-cache-v1-none", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-error-policy-stop", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_MONITOR_JSON | - QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-cache-v2-wt", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-cache-v2-wb", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT); + QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); DO_TEST("disk-drive-cache-v2-none", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT); - DO_TEST("disk-usb", 0); + QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT, false); + DO_TEST("disk-usb", 0, false); DO_TEST("disk-usb-device", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("disk-scsi-device", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("disk-scsi-device-auto", QEMUD_CMD_FLAG_DRIVE | - QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); - DO_TEST("graphics-vnc", 0); + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG, false); + DO_TEST("graphics-vnc", 0, false); driver.vncSASL = 1; driver.vncSASLdir = strdup("/root/.sasl2"); - DO_TEST("graphics-vnc-sasl", QEMUD_CMD_FLAG_VGA); + DO_TEST("graphics-vnc-sasl", QEMUD_CMD_FLAG_VGA, false); driver.vncTLS = 1; driver.vncTLSx509verify = 1; driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu"); - DO_TEST("graphics-vnc-tls", 0); + DO_TEST("graphics-vnc-tls", 0, false); driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0; free(driver.vncSASLdir); free(driver.vncTLSx509certdir); driver.vncSASLdir = driver.vncTLSx509certdir = NULL; - DO_TEST("graphics-sdl", 0); - DO_TEST("graphics-sdl-fullscreen", 0); - DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA); - DO_TEST("input-usbmouse", 0); - DO_TEST("input-usbtablet", 0); - DO_TEST("input-xen", QEMUD_CMD_FLAG_DOMID); - DO_TEST("misc-acpi", 0); - DO_TEST("misc-no-reboot", 0); + DO_TEST("graphics-sdl", 0, false); + DO_TEST("graphics-sdl-fullscreen", 0, false); + DO_TEST("nographics-vga", QEMUD_CMD_FLAG_VGA, false); + DO_TEST("input-usbmouse", 0, false); + DO_TEST("input-usbtablet", 0, false); + DO_TEST("input-xen", QEMUD_CMD_FLAG_DOMID, true); + DO_TEST("misc-acpi", 0, false); + DO_TEST("misc-no-reboot", 0, false); DO_TEST("misc-uuid", QEMUD_CMD_FLAG_NAME | - QEMUD_CMD_FLAG_UUID); - DO_TEST("net-user", 0); - DO_TEST("net-virtio", 0); + QEMUD_CMD_FLAG_UUID, false); + DO_TEST("net-user", 0, false); + DO_TEST("net-virtio", 0, false); DO_TEST("net-virtio-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("net-virtio-netdev", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NETDEV | QEMUD_CMD_FLAG_NODEFCONFIG); - DO_TEST("net-eth", 0); - DO_TEST("net-eth-ifname", 0); - DO_TEST("net-eth-names", QEMUD_CMD_FLAG_NET_NAME); - - DO_TEST("serial-vc", 0); - DO_TEST("serial-pty", 0); - DO_TEST("serial-dev", 0); - DO_TEST("serial-file", 0); - DO_TEST("serial-unix", 0); - DO_TEST("serial-tcp", 0); - DO_TEST("serial-udp", 0); - DO_TEST("serial-tcp-telnet", 0); - DO_TEST("serial-many", 0); - DO_TEST("parallel-tcp", 0); - DO_TEST("console-compat", 0); - DO_TEST("console-compat-auto", 0); + QEMUD_CMD_FLAG_NETDEV | QEMUD_CMD_FLAG_NODEFCONFIG, false); + DO_TEST("net-eth", 0, false); + DO_TEST("net-eth-ifname", 0, false); + DO_TEST("net-eth-names", QEMUD_CMD_FLAG_NET_NAME, false); + + DO_TEST("serial-vc", 0, false); + DO_TEST("serial-pty", 0, false); + DO_TEST("serial-dev", 0, false); + DO_TEST("serial-file", 0, false); + DO_TEST("serial-unix", 0, false); + DO_TEST("serial-tcp", 0, false); + DO_TEST("serial-udp", 0, false); + DO_TEST("serial-tcp-telnet", 0, false); + DO_TEST("serial-many", 0, false); + DO_TEST("parallel-tcp", 0, false); + DO_TEST("console-compat", 0, false); + DO_TEST("console-compat-auto", 0, false); DO_TEST("serial-vc-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-pty-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-dev-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-file-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-unix-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-udp-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-tcp-telnet-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("serial-many-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("parallel-tcp-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("console-compat-chardev", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("channel-virtio", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("channel-virtio-auto", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("console-virtio", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); - DO_TEST("watchdog", 0); + DO_TEST("watchdog", 0, false); DO_TEST("watchdog-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("balloon-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("balloon-device-auto", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); - DO_TEST("sound", 0); + QEMUD_CMD_FLAG_NODEFCONFIG, false); + DO_TEST("sound", 0, false); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV); + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV, false); - DO_TEST("hostdev-usb-address", 0); + DO_TEST("hostdev-usb-address", 0, false); DO_TEST("hostdev-usb-address-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG); - DO_TEST("hostdev-pci-address", QEMUD_CMD_FLAG_PCIDEVICE); + QEMUD_CMD_FLAG_NODEFCONFIG, false); + DO_TEST("hostdev-pci-address", QEMUD_CMD_FLAG_PCIDEVICE, false); DO_TEST("hostdev-pci-address-device", QEMUD_CMD_FLAG_PCIDEVICE | - QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG, false); - DO_TEST_FULL("restore-v1", QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO, "stdio"); - DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "stdio"); - DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat"); - DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000"); + DO_TEST_FULL("restore-v1", QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO, "stdio", false); + DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "stdio", false); + DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat", false); + DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000", false); - DO_TEST("qemu-ns", 0); + DO_TEST("qemu-ns", 0, false); - DO_TEST("smp", QEMUD_CMD_FLAG_SMP_TOPOLOGY); + DO_TEST("smp", QEMUD_CMD_FLAG_SMP_TOPOLOGY, false); free(driver.stateDir); virCapabilitiesFree(driver.caps); -- 1.7.3.1

3 3

[libvirt] [PATCH] maint: ignore new test executable
by Eric Blake 23 Oct '10

23 Oct '10

* tests/.gitignore: Sort, and add sockettest. --- Pushing under the trivial rule, so that I don't accidentally add a binary when I do 'git add .'. tests/.gitignore | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tests/.gitignore b/tests/.gitignore index e7c74c5..8ad3e98 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,35 +1,34 @@ -Makefile -Makefile.in +*.exe .deps .libs -sexpr2xmltest -xml2sexprtest -virshtest conftest -reconnect -xmconfigtest -xencapstest -qemuxml2xmltest -qemuxml2argvtest -qemuargv2xmltest -qemuhelptest +esxutilstest +eventtest +interfacexml2xmltest networkxml2xmltest nodedevxml2xmltest -interfacexml2xmltest -storagevolxml2xmltest -storagepoolxml2xmltest nodeinfotest -statstest -qparamtest -virbuftest -seclabeltest -eventtest -*.exe object-locking +object-locking-files.txt object-locking.cmi object-locking.cmx -object-locking-files.txt -esxutilstest +qemuargv2xmltest +qemuhelptest +qemuxml2argvtest +qemuxml2xmltest +qparamtest +reconnect +secaatest +seclabeltest +sexpr2xmltest +sockettest +statstest +storagepoolxml2xmltest +storagevolxml2xmltest +virbuftest +virshtest vmx2xmltest +xencapstest +xmconfigtest +xml2sexprtest xml2vmxtest -secaatest -- 1.7.2.3

1 0

[libvirt] [PATCH 0/1] Convert network driver to use virSocketAddr
by Daniel P. Berrange 23 Oct '10

23 Oct '10

This is an experimental (read: completely untested) patch that converts the network driver to use virSocketAddr everywhere. The primary motivation for this is that it'll make it easier to add IPv6 support, and lets us talk to OS level services easier because they typically take a sockaddr struct.

2 4

[libvirt] [PATCH] docs: added a table of contents to the new c sharp bindings page
by Justin Clift 23 Oct '10

23 Oct '10

--- docs/csharp.html.in | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/csharp.html.in b/docs/csharp.html.in index 3e15176..a32fbd2 100644 --- a/docs/csharp.html.in +++ b/docs/csharp.html.in @@ -3,7 +3,9 @@ <body> <h1>C# API bindings</h1> - <h2>Description</h2> + <ul id="toc"></ul> + + <h2><a name="description">Description</a></h2> <p> The C# libvirt bindings are a class library. They use a Microsoft @@ -18,7 +20,7 @@ <p> </p> - <h2>Requirements</h2> + <h2><a name="requirements">Requirements</a></h2> <p> These bindings depend upon the libvirt libraries being installed. @@ -29,7 +31,7 @@ <p> </p>  - <h2>GIT source repository</h2> + <h2><a name="git">GIT source repository</a></h2> <p> The C# bindings source code is maintained in a <a href="http://git-scm.com/">git</a> repository available on @@ -62,7 +64,7 @@ git clone git://libvirt.org/libvirt-csharp.git <p> </p> - <h2>Usage</h2> + <h2><a name="usage">Usage</a></h2> <p> The class library exposes the <b>LibvirtBindings</b> namespace. @@ -80,7 +82,7 @@ git clone git://libvirt.org/libvirt-csharp.git <p> </p> - <h2>Authors</h2> + <h2><a name="authors">Authors</a></h2> <p> The C# bindings are the work of Arnaud Champion @@ -90,7 +92,7 @@ git clone git://libvirt.org/libvirt-csharp.git <p> </p> - <h2>Notes on testing</h2> + <h2><a name="notes">Notes on testing</a></h2> <p> Windows testing is performed on Windows 7, with .NET 4, Visual Studio 2010, and MonoDevelop 2.4. @@ -101,7 +103,7 @@ git clone git://libvirt.org/libvirt-csharp.git <p> </p> - <h2>Type Coverage</h2> + <h2><a name="type">Type Coverage</a></h2> <p> Coverage of the libvirt types is: @@ -178,7 +180,7 @@ git clone git://libvirt.org/libvirt-csharp.git <p> </p> - <h2>Function Coverage</h2> + <h2><a name="funccover">Function Coverage</a></h2> <p> Coverage of the libvirt functions is: -- 1.7.2.3

2 2

[libvirt] web page suggestion
by Eric Blake 23 Oct '10

23 Oct '10

My XSL skills are less than stellar, so I'm throwing this out to the list in case someone else can pick it up and come up with a decent patch in less time. Right now, http://libvirt.org/ChangeLog.html is worthless; it is linked from a couple of other pages, such as http://libvirt.org/news.html. A better place to link would be a live git page: http://libvirt.org/git/?p=libvirt.git;a=log I don't know whether it is easier to update news.html.in and sitemap.html.in to point directly to the new link, or if we should keep ChangeLog.xsl but have it revamped to point to the new link. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

3 4

[libvirt] [PATCH] vbox: Fix compile errors due to the virSocketAddr series
by Matthias Bolte 22 Oct '10

22 Oct '10

--- src/vbox/vbox_tmpl.c | 116 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 100 insertions(+), 16 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 5a859a4..ddbca97 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -626,6 +626,45 @@ static PRUnichar *PRUnicharFromInt(int n) { #endif /* !(VBOX_API_VERSION == 2002) */ +static PRUnichar * +vboxSocketFormatAddrUtf16(vboxGlobalData *data, virSocketAddrPtr addr) +{ + char *utf8 = NULL; + PRUnichar *utf16 = NULL; + + utf8 = virSocketFormatAddr(addr); + + if (utf8 == NULL) { + return NULL; + } + + VBOX_UTF8_TO_UTF16(utf8, &utf16); + VIR_FREE(utf8); + + return utf16; +} + +static int +vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16, + virSocketAddrPtr addr) +{ + int result = -1; + char *utf8 = NULL; + + VBOX_UTF16_TO_UTF8(utf16, &utf8); + + if (virSocketParseAddr(utf8, addr, AF_UNSPEC) < 0) { + goto cleanup; + } + + result = 0; + +cleanup: + VBOX_UTF8_FREE(utf8); + + return result; +} + static virCapsPtr vboxCapsInit(void) { struct utsname utsname; virCapsPtr caps; @@ -7073,8 +7112,8 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * * with contigious address space from start to end */ if ((def->nranges >= 1) && - (def->ranges[0].start) && - (def->ranges[0].end)) { + VIR_SOCKET_HAS_ADDR(&def->ranges[0].start) && + VIR_SOCKET_HAS_ADDR(&def->ranges[0].end)) { IDHCPServer *dhcpServer = NULL; data->vboxObj->vtbl->FindDHCPServerByNetworkName(data->vboxObj, @@ -7094,11 +7133,21 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * PRUnichar *toIPAddressUtf16 = NULL; PRUnichar *trunkTypeUtf16 = NULL; + ipAddressUtf16 = vboxSocketFormatAddrUtf16(data, &def->ipAddress); + networkMaskUtf16 = vboxSocketFormatAddrUtf16(data, &def->netmask); + fromIPAddressUtf16 = vboxSocketFormatAddrUtf16(data, &def->ranges[0].start); + toIPAddressUtf16 = vboxSocketFormatAddrUtf16(data, &def->ranges[0].end); + + if (ipAddressUtf16 == NULL || networkMaskUtf16 == NULL || + fromIPAddressUtf16 == NULL || toIPAddressUtf16 == NULL) { + VBOX_UTF16_FREE(ipAddressUtf16); + VBOX_UTF16_FREE(networkMaskUtf16); + VBOX_UTF16_FREE(fromIPAddressUtf16); + VBOX_UTF16_FREE(toIPAddressUtf16); + VBOX_RELEASE(dhcpServer); + goto cleanup; + } - VBOX_UTF8_TO_UTF16(def->ipAddress, &ipAddressUtf16); - VBOX_UTF8_TO_UTF16(def->netmask, &networkMaskUtf16); - VBOX_UTF8_TO_UTF16(def->ranges[0].start, &fromIPAddressUtf16); - VBOX_UTF8_TO_UTF16(def->ranges[0].end, &toIPAddressUtf16); VBOX_UTF8_TO_UTF16("netflt", &trunkTypeUtf16); dhcpServer->vtbl->SetEnabled(dhcpServer, PR_TRUE); @@ -7125,12 +7174,18 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * } if ((def->nhosts >= 1) && - (def->hosts[0].ip)) { + VIR_SOCKET_HAS_ADDR(&def->hosts[0].ip)) { PRUnichar *ipAddressUtf16 = NULL; PRUnichar *networkMaskUtf16 = NULL; - VBOX_UTF8_TO_UTF16(def->netmask, &networkMaskUtf16); - VBOX_UTF8_TO_UTF16(def->hosts[0].ip, &ipAddressUtf16); + ipAddressUtf16 = vboxSocketFormatAddrUtf16(data, &def->hosts[0].ip); + networkMaskUtf16 = vboxSocketFormatAddrUtf16(data, &def->netmask); + + if (ipAddressUtf16 == NULL || networkMaskUtf16 == NULL) { + VBOX_UTF16_FREE(ipAddressUtf16); + VBOX_UTF16_FREE(networkMaskUtf16); + goto cleanup; + } /* Current drawback is that since EnableStaticIpConfig() sets * IP and enables the interface so even if the dhcpserver is not @@ -7393,6 +7448,7 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE PRUnichar *networkMaskUtf16 = NULL; PRUnichar *fromIPAddressUtf16 = NULL; PRUnichar *toIPAddressUtf16 = NULL; + bool errorOccurred = false; dhcpServer->vtbl->GetIPAddress(dhcpServer, &ipAddressUtf16); dhcpServer->vtbl->GetNetworkMask(dhcpServer, &networkMaskUtf16); @@ -7401,15 +7457,25 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE /* Currently virtualbox supports only one dhcp server per network * with contigious address space from start to end */ - VBOX_UTF16_TO_UTF8(ipAddressUtf16, &def->ipAddress); - VBOX_UTF16_TO_UTF8(networkMaskUtf16, &def->netmask); - VBOX_UTF16_TO_UTF8(fromIPAddressUtf16, &def->ranges[0].start); - VBOX_UTF16_TO_UTF8(toIPAddressUtf16, &def->ranges[0].end); + if (vboxSocketParseAddrUtf16(data, ipAddressUtf16, + &def->ipAddress) < 0 || + vboxSocketParseAddrUtf16(data, networkMaskUtf16, + &def->netmask) < 0 || + vboxSocketParseAddrUtf16(data, fromIPAddressUtf16, + &def->ranges[0].start) < 0 || + vboxSocketParseAddrUtf16(data, toIPAddressUtf16, + &def->ranges[0].end) < 0) { + errorOccurred = true; + } VBOX_UTF16_FREE(ipAddressUtf16); VBOX_UTF16_FREE(networkMaskUtf16); VBOX_UTF16_FREE(fromIPAddressUtf16); VBOX_UTF16_FREE(toIPAddressUtf16); + + if (errorOccurred) { + goto cleanup; + } } else { def->nranges = 0; virReportOOMError(); @@ -7425,15 +7491,24 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE } else { PRUnichar *macAddressUtf16 = NULL; PRUnichar *ipAddressUtf16 = NULL; + bool errorOccurred = false; networkInterface->vtbl->GetHardwareAddress(networkInterface, &macAddressUtf16); networkInterface->vtbl->GetIPAddress(networkInterface, &ipAddressUtf16); VBOX_UTF16_TO_UTF8(macAddressUtf16, &def->hosts[0].mac); - VBOX_UTF16_TO_UTF8(ipAddressUtf16, &def->hosts[0].ip); + + if (vboxSocketParseAddrUtf16(data, ipAddressUtf16, + &def->hosts[0].ip) < 0) { + errorOccurred = true; + } VBOX_UTF16_FREE(macAddressUtf16); VBOX_UTF16_FREE(ipAddressUtf16); + + if (errorOccurred) { + goto cleanup; + } } } else { def->nhosts = 0; @@ -7443,15 +7518,24 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE } else { PRUnichar *networkMaskUtf16 = NULL; PRUnichar *ipAddressUtf16 = NULL; + bool errorOccurred = false; networkInterface->vtbl->GetNetworkMask(networkInterface, &networkMaskUtf16); networkInterface->vtbl->GetIPAddress(networkInterface, &ipAddressUtf16); - VBOX_UTF16_TO_UTF8(networkMaskUtf16, &def->netmask); - VBOX_UTF16_TO_UTF8(ipAddressUtf16, &def->ipAddress); + if (vboxSocketParseAddrUtf16(data, networkMaskUtf16, + &def->netmask) < 0 || + vboxSocketParseAddrUtf16(data, ipAddressUtf16, + &def->ipAddress) < 0) { + errorOccurred = true; + } VBOX_UTF16_FREE(networkMaskUtf16); VBOX_UTF16_FREE(ipAddressUtf16); + + if (errorOccurred) { + goto cleanup; + } } DEBUGIID("Network UUID", vboxnet0IID); -- 1.7.0.4

2 2

[libvirt] [PATCH v2] qemu: call drive_unplug in DetachPciDiskDevice
by Ryan Harper 22 Oct '10

22 Oct '10

Currently libvirt doesn't confirm whether the guest has responded to the disk removal request. In some cases this can leave the guest with continued access to the device while the mgmt layer believes that it has been removed. With a recent qemu monitor command[1] we can deterministically revoke a guests access to the disk (on the QEMU side) to ensure no futher access is permitted. This patch adds support for the drive_unplug() command and introduces it in the disk removal paths. There is some discussion to be had about how to handle the case where the guest is running in a QEMU without this command (and the fact that we currently don't have a way of detecting what monitor commands are available). Changes since v1: - return > 0 when command isn't present, < 0 on command failure - detect when drive_unplug command isn't present and log error instead of failing entire command Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abd8e9d..615427a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8646,6 +8646,7 @@ static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainDiskDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virCgroupPtr cgroup = NULL; + char drivestr[PATH_MAX]; i = qemudFindDisk(vm->def, dev->data.disk->dst); @@ -8673,13 +8674,36 @@ static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, goto cleanup; } + /* build the actual drive id string as the disk->info.alias doesn't + * contain the QEMU_DRIVE_HOST_PREFIX that is passed to qemu */ + if ((ret = snprintf(drivestr, sizeof(drivestr), "%s%s", + QEMU_DRIVE_HOST_PREFIX, + detach->info.alias)) + < 0 || ret >= sizeof(drivestr)) { + virReportOOMError(); + goto cleanup; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + ret = qemuMonitorDriveUnplug(priv->mon, drivestr); + DEBUG("DriveUnplug ret=%d", ret); + /* ret > 0 indicates unplug isn't supported, issue will be logged */ + if (ret < 0) { + qemuDomainObjExitMonitor(vm); + goto cleanup; + } if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { qemuDomainObjExitMonitor(vm); goto cleanup; } } else { + ret = qemuMonitorDriveUnplug(priv->mon, drivestr); + /* ret > 0 indicates unplug isn't supported, issue will be logged */ + if (ret < 0) { + qemuDomainObjExitMonitor(vm); + goto cleanup; + } if (qemuMonitorRemovePCIDevice(priv->mon, &detach->info.addr.pci) < 0) { qemuDomainObjExitMonitor(vm); @@ -8723,6 +8747,7 @@ static int qemudDomainDetachSCSIDiskDevice(struct qemud_driver *driver, virDomainDiskDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virCgroupPtr cgroup = NULL; + char drivestr[PATH_MAX]; i = qemudFindDisk(vm->def, dev->data.disk->dst); @@ -8749,7 +8774,22 @@ static int qemudDomainDetachSCSIDiskDevice(struct qemud_driver *driver, } } + /* build the actual drive id string as the disk->info.alias doesn't + * contain the QEMU_DRIVE_HOST_PREFIX that is passed to qemu */ + if ((ret = snprintf(drivestr, sizeof(drivestr), "%s%s", + QEMU_DRIVE_HOST_PREFIX, + detach->info.alias)) + < 0 || ret >= sizeof(drivestr)) { + virReportOOMError(); + goto cleanup; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); + /* ret > 0 indicates unplug isn't supported, issue will be logged */ + if (qemuMonitorDriveUnplug(priv->mon, drivestr) < 0) { + qemuDomainObjExitMonitor(vm); + goto cleanup; + } if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { qemuDomainObjExitMonitor(vm); goto cleanup; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2366fdb..285381d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1781,6 +1781,25 @@ int qemuMonitorGetAllPCIAddresses(qemuMonitorPtr mon, return ret; } +int qemuMonitorDriveUnplug(qemuMonitorPtr mon, + const char *drivestr) +{ + DEBUG("mon=%p drivestr=%s", mon, drivestr); + int ret; + + if (!mon) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (mon->json) + ret = qemuMonitorJSONDriveUnplug(mon, drivestr); + else + ret = qemuMonitorTextDriveUnplug(mon, drivestr); + return ret; +} + int qemuMonitorDelDevice(qemuMonitorPtr mon, const char *devalias) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 48f4c20..bfe3641 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -381,6 +381,9 @@ int qemuMonitorDelDevice(qemuMonitorPtr mon, int qemuMonitorAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorDriveUnplug(qemuMonitorPtr mon, + const char *drivestr); + int qemuMonitorSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, const char *passphrase); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3ab25f..8e474be 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2243,6 +2243,40 @@ int qemuMonitorJSONAddDrive(qemuMonitorPtr mon, } +int qemuMonitorJSONDriveUnplug(qemuMonitorPtr mon, + const char *drivestr) +{ + int ret; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + DEBUG("JSONDriveUnplug drivestr=%s", drivestr); + cmd = qemuMonitorJSONMakeCommand("drive_unplug", + "s:id", drivestr, + NULL); + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) { + /* See if drive_unplug isn't supported */ + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("unplugging disk is not supported. " + "This may leak data if disk is reassigned")); + ret = 1; + goto cleanup; + } + ret = qemuMonitorJSONCheckError(cmd, reply); + } + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, const char *passphrase) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 94806c1..6a8692e 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -188,6 +188,9 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon, int qemuMonitorJSONAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorJSONDriveUnplug(qemuMonitorPtr mon, + const char *drivestr); + int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, const char *passphrase); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 69971a6..5f7869d 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2380,6 +2380,53 @@ cleanup: return ret; } +/* Attempts to unplug a drive. Returns 1 if unsupported, 0 if ok, and -1 on + * other failure */ +int qemuMonitorTextDriveUnplug(qemuMonitorPtr mon, + const char *drivestr) +{ + char *cmd = NULL; + char *reply = NULL; + char *safedev; + int ret = -1; + DEBUG("TextDriveUnplug drivestr=%s", drivestr); + + if (!(safedev = qemuMonitorEscapeArg(drivestr))) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&cmd, "drive_unplug %s", safedev) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (qemuMonitorCommand(mon, cmd, &reply) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("cannot unplug %s drive"), drivestr); + goto cleanup; + } + + if (strstr(reply, "unknown command:")) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("unplugging disk is not supported. " + "This may leak data if disk is reassigned")); + ret = 1; + goto cleanup; + } else if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("unplugging %s drive failed: %s"), drivestr, reply); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(cmd); + VIR_FREE(reply); + VIR_FREE(safedev); + return ret; +} int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index c017509..8355ce8 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -186,6 +186,9 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon, int qemuMonitorTextAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorTextDriveUnplug(qemuMonitorPtr mon, + const char *drivestr); + int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, const char *passphrase); -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh(a)us.ibm.com

2 1

[libvirt] [PATCH 0/2] Add support for DTrace probes in libvirtd
by Daniel P. Berrange 22 Oct '10

22 Oct '10

This is an update of the earlier DTrace patch. Primarily it is just a rebase, but the second patch adds support for including the socket address in the CLIENT_CONNECT probe event. This is dependant on the big virSocket API series. Support for probing public API functions in libvirt.so is still under investigation.

2 6

[libvirt] [PATCH] support compressed crashdump of guests
by KAMEZAWA Hiroyuki 22 Oct '10

22 Oct '10

Now, virsh dump doesn't support compresses dump. This patch adds GZIP and LZOP option to virsh dump and support it at qemu coredump. (AFAIK, LZOP is available on RHEL6.) When I did 4G guest dump, (Raw) 3844669750 (Gzip) 1029846577 (LZOP) 1416263880 (faster than gzip in general) This will be a help for a host where crash-dump is used and several guests works on it. help message is modified as this. NAME dump - dump the core of a domain to a file for analysis SYNOPSIS dump [--live] [--crash] [--gzip] [--lzop] <domain> <file> DESCRIPTION Core dump a domain. OPTIONS --live perform a live core dump if supported --crash crash the domain after core dump --gzip gzip dump(only one compression allowed --lzop lzop dump(only one compression allowed [--domain] <string> domain name, id or uuid [--file] <string> where to dump the core Tested on Fedora-13+x86-64. Note: for better compression, we may have to skip pages filled by zero or freed pages. But it seems it's qemu's works. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- include/libvirt/libvirt.h.in | 2 ++ src/qemu/qemu_driver.c | 23 +++++++++++++++++++---- tools/virsh.c | 10 +++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) Index: libvirt-0.8.4/src/qemu/qemu_driver.c =================================================================== --- libvirt-0.8.4.orig/src/qemu/qemu_driver.c +++ libvirt-0.8.4/src/qemu/qemu_driver.c @@ -5710,7 +5710,7 @@ cleanup: static int qemudDomainCoreDump(virDomainPtr dom, const char *path, - int flags ATTRIBUTE_UNUSED) { + int flags) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int resume = 0, paused = 0; @@ -5720,6 +5720,14 @@ static int qemudDomainCoreDump(virDomain "cat", NULL, }; + const char *zargs[] = { + "gzip", + NULL, + }; + const char *lzargs[] = { + "lzop", + NULL, + }; qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); @@ -5787,9 +5795,16 @@ static int qemudDomainCoreDump(virDomain } qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorMigrateToFile(priv->mon, - QEMU_MONITOR_MIGRATE_BACKGROUND, - args, path, 0); + if (flags & VIR_DUMP_GZIP) + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, zargs, path, 0); + else if (flags & VIR_DUMP_LZOP) + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, lzargs, path, 0); + else + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, args, path, 0); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0) goto endjob; Index: libvirt-0.8.4/tools/virsh.c =================================================================== --- libvirt-0.8.4.orig/tools/virsh.c +++ libvirt-0.8.4/tools/virsh.c @@ -1751,6 +1751,8 @@ static const vshCmdInfo info_dump[] = { static const vshCmdOptDef opts_dump[] = { {"live", VSH_OT_BOOL, 0, N_("perform a live core dump if supported")}, {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, + {"gzip", VSH_OT_BOOL, 0, N_("gzip dump(only one compression allowed")}, + {"lzop", VSH_OT_BOOL, 0, N_("lzop dump(only one compression allowed")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, {NULL, 0, 0, NULL} @@ -1778,7 +1780,13 @@ cmdDump(vshControl *ctl, const vshCmd *c flags |= VIR_DUMP_LIVE; if (vshCommandOptBool (cmd, "crash")) flags |= VIR_DUMP_CRASH; - + if (vshCommandOptBool (cmd, "gzip")) + flags |= VIR_DUMP_GZIP; + if (vshCommandOptBool (cmd, "lzop")) + flags |= VIR_DUMP_LZOP; + if ((flags & (VIR_DUMP_GZIP | VIR_DUMP_LZOP)) + == (VIR_DUMP_GZIP | VIR_DUMP_LZOP)) + return FALSE; if (virDomainCoreDump(dom, to, flags) == 0) { vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to); } else { Index: libvirt-0.8.4/include/libvirt/libvirt.h.in =================================================================== --- libvirt-0.8.4.orig/include/libvirt/libvirt.h.in +++ libvirt-0.8.4/include/libvirt/libvirt.h.in @@ -402,6 +402,8 @@ typedef virDomainMemoryStatStruct *virDo typedef enum { VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ VIR_DUMP_LIVE = (1 << 1), /* live dump */ + VIR_DUMP_GZIP = (1 << 2), /* gzip dump file */ + VIR_DUMP_LZOP = (1 << 3), /* lzop dump file */ } virDomainCoreDumpFlags; /* Domain migration flags. */

3 7

Re: [libvirt] [libvirt-tck 3/3] Add test case for daemon hook testing
by Osier 22 Oct '10

22 Oct '10

updated, and patch attached. - Osier ----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > On Tue, Oct 19, 2010 at 03:41:55AM -0400, Osier wrote: > > attach updated patch for daemon hook testing.. > > > > replaced "cat" with "slurp", corrected typos. > > > From 963158c860d5415117e70b67458745c2b4cf9c13 Mon Sep 17 00:00:00 > 2001 > > From: Osier Yang <jyang(a)redhat.com> > > Date: Tue, 19 Oct 2010 15:32:17 +0800 > > Subject: [libvirt-tck 4/4] Add test case for daemon hook testing > > > > Validate daemon hook is invoked correctly while start, stop, > > restart, reload libvirtd > > --- > > scripts/hooks/051-daemon-hook.t | 153 > +++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 153 insertions(+), 0 deletions(-) > > create mode 100644 scripts/hooks/051-daemon-hook.t > > This still needs to skip execution if the Sys::Virt::TCK > connection object is not lxc:/// or qemu:///system > > Regards, > Daniel > -- > |: Red Hat, Engineering, London -o- > http://people.redhat.com/berrange/ :| > |: http://libvirt.org -o- http://virt-manager.org -o- > http://deltacloud.org :| > |: http://autobuild.org -o- > http://search.cpan.org/~danberr/ :| > |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B > 9505 :|

2 1