- Devel - libvirt List Archives

[libvirt] [PATCH] Fix yet another printf("%s", NULL) case
by john.levon＠sun.com 30 Jan '09

30 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1233282885 28800 # Node ID 6ee939f57a02bf9d332f094e07180e0149e85924 # Parent c60439e564f90b579c07f6349f8f0810a5da1032 Fix yet another printf("%s", NULL) case Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/libvirt.c b/src/libvirt.c --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2691,7 +2691,7 @@ virDomainMigrate (virDomainPtr domain, char *dom_xml = NULL; int cookielen = 0, ret, version = 0; DEBUG("domain=%p, dconn=%p, flags=%lu, dname=%s, uri=%s, bandwidth=%lu", - domain, dconn, flags, dname, uri, bandwidth); + domain, dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); virResetLastError();

2 1

[libvirt] [PATCH] Fix getpwuid_r() usage
by john.levon＠sun.com 30 Jan '09

30 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1233280613 28800 # Node ID 59c231ad7e158acead0c236c3a52f60718b84605 # Parent b203988038c14f1160cbd250a48eda40d4613eca Fix getpwuid_r() usage Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/util.c b/src/util.c --- a/src/util.c +++ b/src/util.c @@ -1477,7 +1477,7 @@ char *virGetUserDirectory(virConnectPtr char *strbuf; char *ret; struct passwd pwbuf; - struct passwd *pw; + struct passwd *pw = NULL; size_t strbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { @@ -1485,7 +1485,14 @@ char *virGetUserDirectory(virConnectPtr return NULL; } - if (getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw) != 0) { + /* + * From the manpage (terrifying but true): + * + * ERRORS + * 0 or ENOENT or ESRCH or EBADF or EPERM or ... + * The given name or uid was not found. + */ + if (getpwuid_r(uid, &pwbuf, strbuf, strbuflen, &pw) != 0 || pw == NULL) virReportSystemError(conn, errno, _("Failed to find user record for uid '%d'"), uid);

3 2

[libvirt] (resend) Problems with virt-manager checking access on virtual images.
by Daniel J Walsh 30 Jan '09

30 Jan '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Met with Cole this morning and we talked about how SELinux can cause people headaches when installing virtual images from random locations. User downloads a iso image to his home directory and then uses virt-manager to install it. Problem is when the user has the whole thing configured, virt-manager tells libvirt to install. It executes qemu and SELinux prevents qemu from reading the iso image because it is labeled user_home_t and qemu is not allowed to read the contents of the home directory. qemu blows up with permission denied and the user is at a loss to what just happened. As we talked we realised this is not just an SELinux problem, but would also happen if a use had an nfs homedir or potentially a samba home directory where root was not allowed access. Also pam_namespace would cause problems, in the /tmp or /home/dwalsh would not be the same for root as they are for the user. One solution to the SELinux problem is to have a label that virt-manager could apply to the iso image (virt_content_ro_t). This would allow qemu to access the file as long as it had search access to the path to the image. solving most of these problems. But the user could still have an access problem that would be tough to diagnose. We came up with the idea of a running a simple helper application to check read access to the image file. During the install, virt-manager could tell libvirt to verify access by executing "qemuaccess /home/dwalsh/windows.iso". If this executable was labeled qemu_exec_t like the other qemu images the same SELinux transitions would happen and we could instantly figure out if SELinux was going to cause problems. As a side benefit we could also check if NFS or samba would cause a problems. If qemuaccess failed, virt-manager could put up a diagnostic message suggesting SELinux, NFS, or Samba might be a problem, and the user could move the iso image to some directory like /var/lib/libvirt/isos/, where libirt would have access. I have attached a version that could solve the problem. Comments? Dan -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkmC9NAACgkQrlYvE4MpobO8egCgpOlWtlSSrC+TPK41fWC9YPWg xwoAn2zYpk5ODoGhl5PXnwkltBKVjO1m =PYqR -----END PGP SIGNATURE-----

2 4

[libvirt] PATCH: Avoid crashing valgrind in LXC driver
by Daniel P. Berrange 30 Jan '09

30 Jan '09

The LXC driver makes use of new clone flags for creating containers. It creates a dummy container which immediately exits in order to test for availabilty of this feature in the kernel. Unfortunately valgrind has no knowledge of these new clone flags, gets very very unhappy and then reports bogus memory leaks, bogus illegal instructions, and then often SEGV's itself. Not cool. While obviously valgrind needs fixing, I looked at its code, and it doesn't seem easy, so this patch adds a quick check for a LD_PRELOAD environemnt variable which contains a library whose name contains 'vgpreload'. If it sees this, LXC driver totally disables itself. This lets me reliably valgrind the libvirtd daemon again. Second, I also move the lxcProbe() call in the lxcOpen() method down a little, so we only probe if we are actually about to try opening the connection. This avoids some unneccessary container creation checks for most virConnectOpen scenarios. Daniel diff -r 6c8e581563aa src/lxc_driver.c --- a/src/lxc_driver.c Fri Jan 30 11:00:43 2009 +0000 +++ b/src/lxc_driver.c Fri Jan 30 11:01:10 2009 +0000 @@ -80,14 +80,14 @@ static virDrvOpenStatus lxcOpen(virConne virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (!lxcProbe()) - goto declineConnection; - if (lxc_driver == NULL) goto declineConnection; /* Verify uri was specified */ if (conn->uri == NULL) { + if (!lxcProbe()) + goto declineConnection; + conn->uri = xmlParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(conn); @@ -96,8 +96,11 @@ static virDrvOpenStatus lxcOpen(virConne } else if (conn->uri->scheme == NULL || STRNEQ(conn->uri->scheme, "lxc")) { goto declineConnection; + } else if (!lxcProbe()) { + goto declineConnection; } + conn->privateData = lxc_driver; return VIR_DRV_OPEN_SUCCESS; @@ -1119,6 +1122,13 @@ static int lxcStartup(void) { uid_t uid = getuid(); unsigned int i; + char *ld; + + /* Valgrind gets very annoyed when we clone containers, so + * disable LXC when under valgrind */ + ld = getenv("LD_PRELOAD"); + if (ld && strstr(ld, "vgpreload")) + return -1; /* Check that the user is root */ if (0 != uid) { -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.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

[libvirt] libvirt for rhel-5?
by Farkas Levente 30 Jan '09

30 Jan '09

hi, is there any plan to be able to buils libvirt on rhel-5 ie. epel-5? currently all virt and kvm releated packages can be build on epel except libvirt since this dbus problem. thanks in advance. -------------------------------------- gcc -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR=\"/var\" -DSYSCONF_DIR=\"/etc\" -DQEMUD_PID_FILE=\"\" -DREMOTE_PID_FILE=\"/var/run/libvirtd.pid\" -DGETTEXT_PACKAGE=\"libvirt\" -D_REENTRANT -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -o .libs/libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o libvirtd-mdns.o ../gnulib/lib/.libs/libgnu.a ../src/.libs/libvirt_driver_qemu.a ../src/.libs/libvirt_driver_lxc.a ../src/.libs/libvirt_driver_uml.a ../src/.libs/libvirt_driver_storage.a ../src/.libs/libvirt_driver_network.a ../src/.libs/libvirt_driver_nodedev.a -L/lib64 -lhal -ldbus-1 ../src/.libs/libvirt.so -lxml2 -lz -lm -lselinux -lgnutls -lsasl2 -lxenstore -lavahi-common -lavahi-client -lpthread ../src/.libs/libvirt_driver_nodedev.a(libvirt_driver_nodedev_la-node_device_hal.o): In function `add_dbus_watch': /home/robot/rpm/BUILD/libvirt-0.5.1/src/node_device_hal.c:578: undefined reference to `dbus_watch_get_unix_fd' collect2: ld returned 1 exit status make[2]: *** [libvirtd] Error 1 make[2]: Leaving directory `/home/robot/rpm/BUILD/libvirt-0.5.1/qemud' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/robot/rpm/BUILD/libvirt-0.5.1' make: *** [all] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.39202 (%build) -------------------------------------- -- Levente "Si vis pacem para bellum!"

3 6

[libvirt] bug: libvirt hang while restore a domain
by Daniel Schwager 30 Jan '09

30 Jan '09

Hi, i try to restore a domain without a valid disk (I deleted the diskfile before restoring it ...). Normally, this must always produce an error. ** The first time, an error occurred - OK: [root@xen03 srv]# virsh restore /srv/save libvir: QEMU error : operation failed: failed to start VM error: Failed to restore domain from /srv/save ** But the second time, the command hang: [root@xen03 srv]# virsh restore /srv/save ^C [root@xen03 srv]# virsh list ^C [root@xen03 srv]# I can't use libvirt now, until restarting the daemon.... *** The domain looks like this (/tmp/winxp100 does NOT exist) <domain type='kvm' id='3'> <name>winxp100</name> <uuid>4e991a91-5db6-0584-3750-6a288ae01ee4</uuid> <memory>256000</memory> <currentMemory>256000</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/kvm/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu'/> <source dev='/tmp/winxp100'/> <target dev='hda' bus='ide'/> </disk> <interface type='bridge'> <mac address='52:54:00:cf:3e:66'/> <source bridge='br0'/> <script path='/etc/kvm/kvm-qemu-ipup.sh'/> <target dev='vnet1'/> <model type='e1000'/> </interface> <serial type='pty'> <source path='/dev/pts/6'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/6'> <source path='/dev/pts/6'/> <target port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5901' autoport='yes'/> </devices> </domain> Is this a bug ? regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

2 3

[libvirt] kvm, sync guest disk before saving ?
by Daniel Schwager 30 Jan '09

30 Jan '09

Hi, is there a way to get a consistent disk image of a domain running qemu-kvm before saving it ? I used " xm sysrq <id> s" with xen-hypervisor - but what's the way with kvm ? Or could I install drivers into the guest helping to solve this problem ? regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

2 1

[libvirt] invoking interface.script - missing interface name of domain
by Daniel Schwager 30 Jan '09

30 Jan '09

Hi, i would like to write a small script - bringing up my qemu-kvm interface and - connecting it to a bridge using the following XML domain-syntax : .... <interface type='ethernet'> <script path='/etc/kvm/qemu-ifup'/> </interface> .... The script will invoked (from qemu-kvm I thinkg) but I can't find any arguments like "interface name" - so my script cannot setup the bridge correctly because of missing information about the interface name. At the moment, I look to the PPID (parent pid of the script) and parse the qemu commandline (ps ef) to find out the interfacename - but it's only a workaround. Q: Is there a way to get informed about the interface libvirt/quemu used for the new domain ? regards Danny

2 4

[libvirt] bug: libvirt hang while restore a domain
by Daniel Schwager 30 Jan '09

30 Jan '09

Hi, i try to restore a domain [root@xen03 srv]# virsh restore /srv/save libvir: QEMU error : operation failed: failed to start VM error: Failed to restore domain from /srv/save [root@xen03 srv]# virsh restore /srv/save ^C [root@xen03 srv]# virsh list ^C [root@xen03 srv]# Viele Gruesse Daniel Schwager ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

1 0

[libvirt] PATCH: Fix save/restore for new KVM
by Daniel P. Berrange 29 Jan '09

29 Jan '09

This is a repost of the patch from: http://www.redhat.com/archives/libvir-list/2009-January/msg00583.html updated to take account of the changes commited since I first posted it. Daniel diff -r 7aa9f1c885e7 src/qemu_conf.c --- a/src/qemu_conf.c Tue Jan 27 15:42:39 2009 +0000 +++ b/src/qemu_conf.c Tue Jan 27 16:00:35 2009 +0000 @@ -412,6 +412,27 @@ int qemudExtractVersionInfo(const char * if (kvm_version >= 74) flags |= QEMUD_CMD_FLAG_VNET_HDR; + /* + * Handling of -incoming arg with varying features + * -incoming tcp (kvm >= 79) + * -incoming exec (kvm >= 80) + * -incoming stdio (all earlier kvm) + * + * NB, there was a pre-kvm-79 'tcp' support, but it + * was broken, because it blocked the monitor console + * while waiting for data, so pretend it doesn't exist + * + * XXX when next QEMU release after 0.9.1 arrives, + * we'll need to add MIGRATE_QEMU_TCP/EXEC here too + */ + if (kvm_version >= 79) { + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP; + if (kvm_version >= 80) + flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC; + } else if (kvm_version > 0) { + flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO; + } + if (retversion) *retversion = version; if (retflags) @@ -694,6 +715,33 @@ int qemudBuildCommandLine(virConnectPtr virUUIDFormat(vm->def->uuid, uuid); + /* Migration is very annoying due to wildly varying syntax & capabilities + * over time of KVM / QEMU codebases + */ + if (migrateFrom) { + if (STRPREFIX(migrateFrom, "tcp")) { + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP)) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, + "%s", _("TCP migration is not supported with this QEMU binary")); + return -1; + } + } else if (STREQ(migrateFrom, "stdio")) { + if (qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC) { + migrateFrom = "exec:cat"; + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO)) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, + "%s", _("STDIO migration is not supported with this QEMU binary")); + return -1; + } + } else if (STRPREFIX(migrateFrom, "exec")) { + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC)) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, + "%s", _("STDIO migration is not supported with this QEMU binary")); + return -1; + } + } + } + /* Need to explicitly disable KQEMU if * 1. Arch matches host arch * 2. Guest is 'qemu' diff -r 7aa9f1c885e7 src/qemu_conf.h --- a/src/qemu_conf.h Tue Jan 27 15:42:39 2009 +0000 +++ b/src/qemu_conf.h Tue Jan 27 16:00:35 2009 +0000 @@ -40,15 +40,19 @@ /* Internal flags to keep track of qemu command line capabilities */ enum qemud_cmd_flags { - QEMUD_CMD_FLAG_KQEMU = (1 << 0), - QEMUD_CMD_FLAG_VNC_COLON = (1 << 1), - QEMUD_CMD_FLAG_NO_REBOOT = (1 << 2), - QEMUD_CMD_FLAG_DRIVE = (1 << 3), - QEMUD_CMD_FLAG_DRIVE_BOOT = (1 << 4), - QEMUD_CMD_FLAG_NAME = (1 << 5), - QEMUD_CMD_FLAG_UUID = (1 << 6), - QEMUD_CMD_FLAG_DOMID = (1 << 7), /* Xenner only */ - QEMUD_CMD_FLAG_VNET_HDR = (1 << 8), + QEMUD_CMD_FLAG_KQEMU = (1 << 0), /* Whether KQEMU is compiled in */ + QEMUD_CMD_FLAG_VNC_COLON = (1 << 1), /* Does the VNC take just port, or address + display */ + QEMUD_CMD_FLAG_NO_REBOOT = (1 << 2), /* Is the -no-reboot flag available */ + QEMUD_CMD_FLAG_DRIVE = (1 << 3), /* Is the new -drive arg available */ + QEMUD_CMD_FLAG_DRIVE_BOOT = (1 << 4), /* Does -drive support boot=on */ + QEMUD_CMD_FLAG_NAME = (1 << 5), /* Is the -name flag available */ + QEMUD_CMD_FLAG_UUID = (1 << 6), /* Is the -uuid flag available */ + QEMUD_CMD_FLAG_DOMID = (1 << 7), /* Xenner only, special -domid flag available */ + QEMUD_CMD_FLAG_VNET_HDR = (1 << 8), + QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO = (1 << 9), /* Original migration code from KVM. Also had tcp, but we can't use that + * since it had a design bug blocking the entire monitor console */ + QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP = (1 << 10), /* New migration syntax after merge to QEMU with TCP transport */ + QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC = (1 << 11), /* New migration syntax after merge to QEMU with EXEC transport */ }; /* Main driver state */ diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-migrate.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-kvm -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -incoming tcp:10.0.0.1:5000 diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-migrate.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + </devices> +</domain> diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-kvm -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -incoming stdio diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,22 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + </devices> +</domain> diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-kvm -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -incoming exec:cat diff -r 7aa9f1c885e7 tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml Tue Jan 27 16:00:35 2009 +0000 @@ -0,0 +1,22 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + </devices> +</domain> diff -r 7aa9f1c885e7 tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c Tue Jan 27 15:42:39 2009 +0000 +++ b/tests/qemuxml2argvtest.c Tue Jan 27 16:00:35 2009 +0000 @@ -24,7 +24,8 @@ static struct qemud_driver driver; static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, - int extraFlags) { + int extraFlags, + const char *migrateFrom) { char argvData[MAX_FILE]; char *expectargv = &(argvData[0]); char *actualargv = NULL; @@ -56,7 +57,7 @@ static int testCompareXMLToArgvFiles(con if (qemudBuildCommandLine(NULL, &driver, &vm, flags, &argv, &qenv, - NULL, NULL, NULL) < 0) + NULL, NULL, migrateFrom) < 0) goto fail; len = 1; /* for trailing newline */ @@ -122,6 +123,7 @@ static int testCompareXMLToArgvFiles(con struct testInfo { const char *name; int extraFlags; + const char *migrateFrom; }; static int testCompareXMLToArgvHelper(const void *data) { @@ -132,7 +134,7 @@ static int testCompareXMLToArgvHelper(co abs_srcdir, info->name); snprintf(args, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.args", abs_srcdir, info->name); - return testCompareXMLToArgvFiles(xml, args, info->extraFlags); + return testCompareXMLToArgvFiles(xml, args, info->extraFlags, info->migrateFrom); } @@ -161,7 +163,15 @@ mymain(int argc, char **argv) #define DO_TEST(name, extraFlags) \ do { \ - struct testInfo info = { name, extraFlags }; \ + struct testInfo info = { name, extraFlags, NULL }; \ + if (virtTestRun("QEMU XML-2-ARGV " name, \ + 1, testCompareXMLToArgvHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST_MIGRATE(name, extraFlags, migrateFrom) \ + do { \ + struct testInfo info = { name, extraFlags, migrateFrom }; \ if (virtTestRun("QEMU XML-2-ARGV " name, \ 1, testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ @@ -228,6 +238,11 @@ mymain(int argc, char **argv) DO_TEST("hostdev-pci-address", 0); + DO_TEST_MIGRATE("restore-v1", QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO, "stdio"); + DO_TEST_MIGRATE("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "stdio"); + DO_TEST_MIGRATE("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat"); + DO_TEST_MIGRATE("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000"); + virCapabilitiesFree(driver.caps); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2