[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Libvir] PATCH 0/4: QEMU test suite extensions



This patch updates the QEMU test suites to use the new virtTestDifference
function, and include tests for the serial/parallel device options.

 qemuxml2argvdata/qemuxml2argv-boot-cdrom.args        |    2 
 qemuxml2argvdata/qemuxml2argv-boot-floppy.args       |    2 
 qemuxml2argvdata/qemuxml2argv-boot-network.args      |    2 
 qemuxml2argvdata/qemuxml2argv-clock-localtime.args   |    2 
 qemuxml2argvdata/qemuxml2argv-clock-utc.args         |    2 
 qemuxml2argvdata/qemuxml2argv-console-compat.args    |    1 
 qemuxml2argvdata/qemuxml2argv-console-compat.xml     |   28 ++++
 qemuxml2argvdata/qemuxml2argv-disk-cdrom.args        |    2 
 qemuxml2argvdata/qemuxml2argv-disk-floppy.args       |    2 
 qemuxml2argvdata/qemuxml2argv-disk-many.args         |    2 
 qemuxml2argvdata/qemuxml2argv-graphics-sdl.args      |    2 
 qemuxml2argvdata/qemuxml2argv-graphics-vnc.args      |    2 
 qemuxml2argvdata/qemuxml2argv-input-usbmouse.args    |    2 
 qemuxml2argvdata/qemuxml2argv-input-usbtablet.args   |    2 
 qemuxml2argvdata/qemuxml2argv-minimal.args           |    2 
 qemuxml2argvdata/qemuxml2argv-misc-acpi.args         |    2 
 qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args    |    2 
 qemuxml2argvdata/qemuxml2argv-net-user.args          |    2 
 qemuxml2argvdata/qemuxml2argv-parallel-tcp.args      |    1 
 qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml       |   26 ++++
 qemuxml2argvdata/qemuxml2argv-serial-dev.args        |    1 
 qemuxml2argvdata/qemuxml2argv-serial-dev.xml         |   30 ++++
 qemuxml2argvdata/qemuxml2argv-serial-file.args       |    1 
 qemuxml2argvdata/qemuxml2argv-serial-file.xml        |   30 ++++
 qemuxml2argvdata/qemuxml2argv-serial-many.args       |    1 
 qemuxml2argvdata/qemuxml2argv-serial-many.xml        |   32 +++++
 qemuxml2argvdata/qemuxml2argv-serial-pty.args        |    1 
 qemuxml2argvdata/qemuxml2argv-serial-pty.xml         |   28 ++++
 qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args |    1 
 qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml  |   30 ++++
 qemuxml2argvdata/qemuxml2argv-serial-tcp.args        |    1 
 qemuxml2argvdata/qemuxml2argv-serial-tcp.xml         |   30 ++++
 qemuxml2argvdata/qemuxml2argv-serial-udp.args        |    1 
 qemuxml2argvdata/qemuxml2argv-serial-udp.xml         |   32 +++++
 qemuxml2argvdata/qemuxml2argv-serial-unix.args       |    1 
 qemuxml2argvdata/qemuxml2argv-serial-unix.xml        |   30 ++++
 qemuxml2argvdata/qemuxml2argv-serial-vc.args         |    1 
 qemuxml2argvdata/qemuxml2argv-serial-vc.xml          |   28 ++++
 qemuxml2argvtest.c                                   |  121 ++++++-------------
 qemuxml2xmltest.c                                    |  117 ++++++------------
 40 files changed, 437 insertions(+), 168 deletions(-)

Dan.

Index: tests/qemuxml2argvtest.c
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvtest.c,v
retrieving revision 1.14
diff -u -p -r1.14 qemuxml2argvtest.c
--- tests/qemuxml2argvtest.c	10 Apr 2008 16:53:29 -0000	1.14
+++ tests/qemuxml2argvtest.c	18 Apr 2008 20:01:37 -0000
@@ -15,7 +15,7 @@
 #include "qemu_conf.h"
 
 static char *progname;
-static char *abs_top_srcdir;
+static char *abs_srcdir;
 static struct qemud_driver driver;
 
 #define MAX_FILE 4096
@@ -71,11 +71,8 @@ static int testCompareXMLToArgvFiles(con
         tmp++;
     }
 
-    if (strcmp(expectargv, actualargv)) {
-        if (getenv("DEBUG_TESTS")) {
-            printf("Expect %4d '%s'\n", (int)strlen(expectargv), expectargv);
-            printf("Actual %4d '%s'\n", (int)strlen(actualargv), actualargv);
-        }
+    if (STRNEQ(expectargv, actualargv)) {
+        virtTestDifference(stderr, expectargv, actualargv);
         goto fail;
     }
 
@@ -100,10 +97,10 @@ static int testCompareXMLToArgvFiles(con
 static int testCompareXMLToArgvHelper(const void *data) {
     char xml[PATH_MAX];
     char args[PATH_MAX];
-    snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml",
-             abs_top_srcdir, (const char*)data);
-    snprintf(args, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.args",
-             abs_top_srcdir, (const char*)data);
+    snprintf(xml, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+             abs_srcdir, (const char*)data);
+    snprintf(args, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
+             abs_srcdir, (const char*)data);
     return testCompareXMLToArgvFiles(xml, args);
 }
 
@@ -113,6 +110,7 @@ int
 main(int argc, char **argv)
 {
     int ret = 0;
+    char cwd[PATH_MAX];
 
     progname = argv[0];
 
@@ -121,76 +119,45 @@ main(int argc, char **argv)
         exit(EXIT_FAILURE);
     }
 
-    abs_top_srcdir = getenv("abs_top_srcdir");
-    if (!abs_top_srcdir)
-      return 1;
+    abs_srcdir = getenv("abs_srcdir");
+    if (!abs_srcdir)
+        abs_srcdir = getcwd(cwd, sizeof(cwd));
 
     driver.caps = qemudCapsInit();
 
-    if (virtTestRun("QEMU XML-2-ARGV minimal",
-                    1, testCompareXMLToArgvHelper, "minimal") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot CDROM",
-                    1, testCompareXMLToArgvHelper, "boot-cdrom") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot Network",
-                    1, testCompareXMLToArgvHelper, "boot-network") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot Floppy",
-                    1, testCompareXMLToArgvHelper, "boot-floppy") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Clock UTC",
-                    1, testCompareXMLToArgvHelper, "clock-utc") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Clock Localtime",
-                    1, testCompareXMLToArgvHelper, "clock-localtime") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk CDROM",
-                    1, testCompareXMLToArgvHelper, "disk-cdrom") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk Floppy",
-                    1, testCompareXMLToArgvHelper, "disk-floppy") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk Many",
-                    1, testCompareXMLToArgvHelper, "disk-many") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Graphics VNC",
-                    1, testCompareXMLToArgvHelper, "graphics-vnc") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Graphics SDL",
-                    1, testCompareXMLToArgvHelper, "graphics-sdl") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Input USB Mouse",
-                    1, testCompareXMLToArgvHelper, "input-usbmouse") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Input USB Tablet",
-                    1, testCompareXMLToArgvHelper, "input-usbtablet") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Misc ACPI",
-                    1, testCompareXMLToArgvHelper, "misc-acpi") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Misc No Reboot",
-                    1, testCompareXMLToArgvHelper, "misc-no-reboot") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Net User",
-                    1, testCompareXMLToArgvHelper, "net-user") < 0)
-        ret = -1;
-
+#define DO_TEST(name) \
+    if (virtTestRun("QEMU XML-2-ARGV " name, \
+                    1, testCompareXMLToArgvHelper, (name)) < 0) \
+        ret = -1
+
+    DO_TEST("minimal");
+    DO_TEST("boot-cdrom");
+    DO_TEST("boot-network");
+    DO_TEST("boot-floppy");
+    DO_TEST("clock-utc");
+    DO_TEST("clock-localtime");
+    DO_TEST("disk-cdrom");
+    DO_TEST("disk-floppy");
+    DO_TEST("disk-many");
+    DO_TEST("graphics-vnc");
+    DO_TEST("graphics-sdl");
+    DO_TEST("input-usbmouse");
+    DO_TEST("input-usbtablet");
+    DO_TEST("misc-acpi");
+    DO_TEST("misc-no-reboot");
+    DO_TEST("net-user");
+
+    DO_TEST("serial-vc");
+    DO_TEST("serial-pty");
+    DO_TEST("serial-dev");
+    DO_TEST("serial-file");
+    DO_TEST("serial-unix");
+    DO_TEST("serial-tcp");
+    DO_TEST("serial-udp");
+    DO_TEST("serial-tcp-telnet");
+    DO_TEST("serial-many");
+    DO_TEST("parallel-tcp");
+    DO_TEST("console-compat");
 
     virCapabilitiesFree(driver.caps);
 
Index: tests/qemuxml2xmltest.c
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2xmltest.c,v
retrieving revision 1.12
diff -u -p -r1.12 qemuxml2xmltest.c
--- tests/qemuxml2xmltest.c	10 Apr 2008 16:53:29 -0000	1.12
+++ tests/qemuxml2xmltest.c	18 Apr 2008 20:01:37 -0000
@@ -15,7 +15,7 @@
 #include "qemu_conf.h"
 
 static char *progname;
-static char *abs_top_srcdir;
+static char *abs_srcdir;
 static struct qemud_driver driver;
 
 #define MAX_FILE 4096
@@ -47,11 +47,8 @@ static int testCompareXMLToXMLFiles(cons
     if (!(actual = qemudGenerateXML(NULL, &driver, &vm, vmdef, 0)))
         goto fail;
 
-    if (strcmp(xmlData, actual)) {
-        if (getenv("DEBUG_TESTS")) {
-            printf("Expect %4d '%s'\n", (int)strlen(xmlData), xmlData);
-            printf("Actual %4d '%s'\n", (int)strlen(actual), actual);
-        }
+    if (STRNEQ(xmlData, actual)) {
+        virtTestDifference(stderr, xmlData, actual);
         goto fail;
     }
 
@@ -66,8 +63,8 @@ static int testCompareXMLToXMLFiles(cons
 
 static int testCompareXMLToXMLHelper(const void *data) {
     char xml[PATH_MAX];
-    snprintf(xml, PATH_MAX, "%s/tests/qemuxml2argvdata/qemuxml2argv-%s.xml",
-             abs_top_srcdir, (const char*)data);
+    snprintf(xml, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+             abs_srcdir, (const char*)data);
     return testCompareXMLToXMLFiles(xml);
 }
 
@@ -76,6 +73,7 @@ int
 main(int argc, char **argv)
 {
     int ret = 0;
+    char cwd[PATH_MAX];
 
     progname = argv[0];
 
@@ -84,76 +82,45 @@ main(int argc, char **argv)
         exit(EXIT_FAILURE);
     }
 
-    abs_top_srcdir = getenv("abs_top_srcdir");
-    if (!abs_top_srcdir)
-      return 1;
-
+    abs_srcdir = getenv("abs_srcdir");
+    if (!abs_srcdir)
+        abs_srcdir = getcwd(cwd, sizeof(cwd));
 
     driver.caps = qemudCapsInit();
 
-    if (virtTestRun("QEMU XML-2-ARGV minimal",
-                    1, testCompareXMLToXMLHelper, "minimal") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot CDROM",
-                    1, testCompareXMLToXMLHelper, "boot-cdrom") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot Network",
-                    1, testCompareXMLToXMLHelper, "boot-network") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Boot Floppy",
-                    1, testCompareXMLToXMLHelper, "boot-floppy") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Clock UTC",
-                    1, testCompareXMLToXMLHelper, "clock-utc") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Clock Localtime",
-                    1, testCompareXMLToXMLHelper, "clock-localtime") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk CDROM",
-                    1, testCompareXMLToXMLHelper, "disk-cdrom") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk Floppy",
-                    1, testCompareXMLToXMLHelper, "disk-floppy") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Disk Many",
-                    1, testCompareXMLToXMLHelper, "disk-many") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Graphics VNC",
-                    1, testCompareXMLToXMLHelper, "graphics-vnc") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Graphics SDL",
-                    1, testCompareXMLToXMLHelper, "graphics-sdl") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Input USB Mouse",
-                    1, testCompareXMLToXMLHelper, "input-usbmouse") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Input USB Tablet",
-                    1, testCompareXMLToXMLHelper, "input-usbtablet") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Misc ACPI",
-                    1, testCompareXMLToXMLHelper, "misc-acpi") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Misc No Reboot",
-                    1, testCompareXMLToXMLHelper, "misc-no-reboot") < 0)
-        ret = -1;
-
-    if (virtTestRun("QEMU XML-2-ARGV Net User",
-                    1, testCompareXMLToXMLHelper, "net-user") < 0)
-        ret = -1;
+#define DO_TEST(name) \
+    if (virtTestRun("QEMU XML-2-XML " name, \
+                    1, testCompareXMLToXMLHelper, (name)) < 0) \
+        ret = -1
+
+    DO_TEST("minimal");
+    DO_TEST("boot-cdrom");
+    DO_TEST("boot-network");
+    DO_TEST("boot-floppy");
+    DO_TEST("clock-utc");
+    DO_TEST("clock-localtime");
+    DO_TEST("disk-cdrom");
+    DO_TEST("disk-floppy");
+    DO_TEST("disk-many");
+    DO_TEST("graphics-vnc");
+    DO_TEST("graphics-sdl");
+    DO_TEST("input-usbmouse");
+    DO_TEST("input-usbtablet");
+    DO_TEST("misc-acpi");
+    DO_TEST("misc-no-reboot");
+    DO_TEST("net-user");
+
+    DO_TEST("serial-vc");
+    DO_TEST("serial-pty");
+    DO_TEST("serial-dev");
+    DO_TEST("serial-file");
+    DO_TEST("serial-unix");
+    DO_TEST("serial-tcp");
+    DO_TEST("serial-udp");
+    DO_TEST("serial-tcp-telnet");
+    DO_TEST("serial-many");
+    DO_TEST("parallel-tcp");
+    DO_TEST("console-compat");
 
     virCapabilitiesFree(driver.caps);
 
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-boot-cdrom.args
--- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -cdrom /dev/cdrom -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -cdrom /dev/cdrom -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-boot-floppy.args
--- tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot a -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot a -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-boot-network.args
--- tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot n -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot n -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-clock-localtime.args
--- tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -localtime -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -localtime -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-clock-utc.args
--- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-console-compat.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,28 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-disk-cdrom.args
--- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-disk-floppy.args
--- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb /tmp/firmware.img -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb /tmp/firmware.img -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-disk-many.args
--- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc /tmp/data.img -hdd /tmp/logs.img -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc /tmp/data.img -hdd /tmp/logs.img -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-graphics-sdl.args
--- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args,v
retrieving revision 1.1
diff -u -p -r1.1 qemuxml2argv-graphics-vnc.args
--- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args	18 Jul 2007 21:34:22 -0000	1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -vnc 127.0.0.1:3
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-input-usbmouse.args
--- tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice mouse
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice mouse
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-input-usbtablet.args
--- tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice tablet
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice tablet
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-minimal.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-minimal.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-minimal.args
--- tests/qemuxml2argvdata/qemuxml2argv-minimal.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-minimal.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-misc-acpi.args
--- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-misc-no-reboot.args
--- tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-reboot -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-reboot -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-net-user.args
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-net-user.args,v
retrieving revision 1.2
diff -u -p -r1.2 qemuxml2argv-net-user.args
--- tests/qemuxml2argvdata/qemuxml2argv-net-user.args	24 Jul 2007 14:30:06 -0000	1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-net-user.args	18 Apr 2008 20:01:37 -0000
@@ -1 +1 @@
-/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -usb
\ No newline at end of file
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel tcp:127.0.0.1:9999,listen -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,26 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <parallel type='tcp'>
+      <source mode='bind' host='127.0.0.1' service='9999' wiremode='raw'/>
+      <target port='0'/>
+    </parallel>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial /dev/ttyS2 -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,30 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='dev'>
+      <source path='/dev/ttyS2'/>
+      <target port='0'/>
+    </serial>
+    <console type='dev'>
+      <source path='/dev/ttyS2'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-file.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial file:/tmp/serial.log -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,30 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='file'>
+      <source path='/tmp/serial.log'/>
+      <target port='0'/>
+    </serial>
+    <console type='file'>
+      <source path='/tmp/serial.log'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-many.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -serial file:/tmp/serial.log -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,32 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <serial type='file'>
+      <source path='/tmp/serial.log'/>
+      <target port='1'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,28 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial telnet:127.0.0.1:9999,listen -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,30 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='tcp'>
+      <source mode='bind' host='127.0.0.1' service='9999' wiremode='telnet'/>
+      <target port='0'/>
+    </serial>
+    <console type='tcp'>
+      <source mode='bind' host='127.0.0.1' service='9999' wiremode='telnet'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial tcp:127.0.0.1:9999 -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,30 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='tcp'>
+      <source mode='connect' host='127.0.0.1' service='9999' wiremode='raw'/>
+      <target port='0'/>
+    </serial>
+    <console type='tcp'>
+      <source mode='connect' host='127.0.0.1' service='9999' wiremode='raw'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial udp:127.0.0.1:9998 127 0 0 1:9999 -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,32 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='udp'>
+      <source mode='bind' host='127.0.0.1' service='9999'/>
+      <source mode='connect' host='127.0.0.1' service='9998'/>
+      <target port='0'/>
+    </serial>
+    <console type='udp'>
+      <source mode='bind' host='127.0.0.1' service='9999'/>
+      <source mode='connect' host='127.0.0.1' service='9998'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial unix:/tmp/serial.sock -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,30 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='unix'>
+      <source mode='connect' path='/tmp/serial.sock'/>
+      <target port='0'/>
+    </serial>
+    <console type='unix'>
+      <source mode='connect' path='/tmp/serial.sock'/>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial vc -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml	18 Apr 2008 20:01:37 -0000
@@ -0,0 +1,28 @@
+<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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda'/>
+    </disk>
+    <serial type='vc'>
+      <target port='0'/>
+    </serial>
+    <console type='vc'>
+      <target port='0'/>
+    </console>
+  </devices>
+</domain>


-- 
|: Red Hat, Engineering, Boston   -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 :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]