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

[libvirt] [PATCH V5 09/12] src/xenxs: Refactor code formating OS config



introduce function
   xenFormatXMOS(virConfPtr conf,........);
which formats OS config instead

Signed-off-by: Kiarie Kahurani <davidkiarie4 gmail com>
---
 src/xenxs/xen_xm.c                                 | 95 ++++++++++++----------
 tests/xmconfigdata/test-escape-paths.cfg           |  2 +-
 tests/xmconfigdata/test-fullvirt-force-hpet.cfg    |  2 +-
 tests/xmconfigdata/test-fullvirt-force-nohpet.cfg  |  2 +-
 tests/xmconfigdata/test-fullvirt-localtime.cfg     |  2 +-
 tests/xmconfigdata/test-fullvirt-net-ioemu.cfg     |  2 +-
 tests/xmconfigdata/test-fullvirt-net-netfront.cfg  |  2 +-
 tests/xmconfigdata/test-fullvirt-new-cdrom.cfg     |  2 +-
 tests/xmconfigdata/test-fullvirt-old-cdrom.cfg     |  2 +-
 tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg  |  2 +-
 .../test-fullvirt-serial-dev-2-ports.cfg           |  2 +-
 .../test-fullvirt-serial-dev-2nd-port.cfg          |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-file.cfg   |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-null.cfg   |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-pipe.cfg   |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-pty.cfg    |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-stdio.cfg  |  2 +-
 .../test-fullvirt-serial-tcp-telnet.cfg            |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-tcp.cfg    |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-udp.cfg    |  2 +-
 tests/xmconfigdata/test-fullvirt-serial-unix.cfg   |  2 +-
 tests/xmconfigdata/test-fullvirt-sound.cfg         |  2 +-
 tests/xmconfigdata/test-fullvirt-usbmouse.cfg      |  2 +-
 tests/xmconfigdata/test-fullvirt-usbtablet.cfg     |  2 +-
 tests/xmconfigdata/test-fullvirt-utc.cfg           |  2 +-
 tests/xmconfigdata/test-no-source-cdrom.cfg        |  2 +-
 tests/xmconfigdata/test-pci-devs.cfg               |  2 +-
 27 files changed, 80 insertions(+), 67 deletions(-)

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index a856698..9edfbbb 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -2017,43 +2017,20 @@ xenFormatXMCPUFeatures(virConfPtr conf, virDomainDefPtr def,
 }
 
 
-/* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
-   either 32, or 64 on a platform where long is big enough.  */
-verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT);
-
-virConfPtr
-xenFormatXM(virConnectPtr conn,
-            virDomainDefPtr def,
-            int xendConfigVersion)
+static int
+xenFormatXMOS(virConfPtr conf, virDomainDefPtr def,
+              int xendConfigVersion)
 {
-    virConfPtr conf = NULL;
-    int hvm = 0;
     size_t i;
-    char *cpus = NULL;
-    virConfValuePtr netVal = NULL;
-
-    if (!(conf = virConfNew()))
-        goto cleanup;
 
-    if (xenFormatXMGeneralMeta(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMMem(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMCPUFeatures(conf, def, xendConfigVersion) < 0)
-        goto cleanup;
-
-    hvm = STREQ(def->os.type, "hvm") ? 1 : 0;
-
-    if (hvm) {
+    if (STREQ(def->os.type, "hvm")) {
         char boot[VIR_DOMAIN_BOOT_LAST+1];
         if (xenXMConfigSetString(conf, "builder", "hvm") < 0)
-            goto cleanup;
+            return -1;
 
         if (def->os.loader &&
             xenXMConfigSetString(conf, "kernel", def->os.loader) < 0)
-            goto cleanup;
+            return -1;
 
         for (i = 0; i < def->os.nBootDevs; i++) {
             switch (def->os.bootDevs[i]) {
@@ -2080,7 +2057,7 @@ xenFormatXM(virConnectPtr conn,
         }
 
         if (xenXMConfigSetString(conf, "boot", boot) < 0)
-            goto cleanup;
+            return -1;
 
         if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) {
             for (i = 0; i < def->ndisks; i++) {
@@ -2090,31 +2067,72 @@ xenFormatXM(virConnectPtr conn,
                     virDomainDiskGetSource(def->disks[i])) {
                     if (xenXMConfigSetString(conf, "cdrom",
                                              virDomainDiskGetSource(def->disks[i])) < 0)
-                        goto cleanup;
+                        return -1;
+
                     break;
                 }
             }
         }
 
+        if (def->emulator &&
+            xenXMConfigSetString(conf, "device_model", def->emulator) < 0)
+            return -1;
         /* XXX floppy disks */
     } else {
         if (def->os.bootloader &&
             xenXMConfigSetString(conf, "bootloader", def->os.bootloader) < 0)
-            goto cleanup;
+            return -1;
+
         if (def->os.bootloaderArgs &&
             xenXMConfigSetString(conf, "bootargs", def->os.bootloaderArgs) < 0)
-            goto cleanup;
+            return -1;
+
         if (def->os.kernel &&
             xenXMConfigSetString(conf, "kernel", def->os.kernel) < 0)
-            goto cleanup;
+            return -1;
+
         if (def->os.initrd &&
             xenXMConfigSetString(conf, "ramdisk", def->os.initrd) < 0)
-            goto cleanup;
+            return -1;
+
         if (def->os.cmdline &&
             xenXMConfigSetString(conf, "extra", def->os.cmdline) < 0)
-            goto cleanup;
+            return -1;
     } /* !hvm */
 
+    return 0;
+}
+/* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
+   either 32, or 64 on a platform where long is big enough.  */
+verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT);
+
+virConfPtr
+xenFormatXM(virConnectPtr conn,
+            virDomainDefPtr def,
+            int xendConfigVersion)
+{
+    virConfPtr conf = NULL;
+    int hvm = 0;
+    size_t i;
+    virConfValuePtr netVal = NULL;
+
+    if (!(conf = virConfNew()))
+        goto cleanup;
+
+    if (xenFormatXMGeneralMeta(conf, def) < 0)
+        goto cleanup;
+
+    if (xenFormatXMMem(conf, def) < 0)
+        goto cleanup;
+
+    if (xenFormatXMCPUFeatures(conf, def, xendConfigVersion) < 0)
+        goto cleanup;
+
+    hvm = STREQ(def->os.type, "hvm");
+
+    if (xenFormatXMOS(conf, def, xendConfigVersion) < 0)
+        goto cleanup;
+
     if (xenFormatXMTimeOffset(conf, def, xendConfigVersion) < 0)
         goto cleanup;
 
@@ -2122,10 +2140,6 @@ xenFormatXM(virConnectPtr conn,
         goto cleanup;
 
     if (hvm) {
-        if (def->emulator &&
-            xenXMConfigSetString(conf, "device_model", def->emulator) < 0)
-            goto cleanup;
-
         for (i = 0; i < def->ninputs; i++) {
             if (def->inputs[i]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
                 if (xenXMConfigSetInt(conf, "usb", 1) < 0)
@@ -2294,7 +2308,6 @@ xenFormatXM(virConnectPtr conn,
 
  cleanup:
     virConfFreeValue(netVal);
-    VIR_FREE(cpus);
     if (conf)
         virConfFree(conf);
     return NULL;
diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
index 4a18cc1..68984da 100644
--- a/tests/xmconfigdata/test-escape-paths.cfg
+++ b/tests/xmconfigdata/test-escape-paths.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader&test"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm&test"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm&test"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
index c1afc08..f2377dc 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
@@ -10,11 +10,11 @@ hpet = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
index 397d8ef..093c8de 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
@@ -10,11 +10,11 @@ hpet = 0
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
index 7292e7f..34ea100 100755
--- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
+++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 1
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg b/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
index ef97329..a4f3aec 100644
--- a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
+++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
index 385f917..57cff7b 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
index ef97329..a4f3aec 100755
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
index 27407e7..9b74db4 100755
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
@@ -10,11 +10,11 @@ builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
 cdrom = "/root/boot.iso"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
index 86e0aa0..6a0e1ac 100755
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
index 8ada1fd..2021ac3 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
index 61e2af3..0200194 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
index ad4a874..4602516 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
index a11c42a..c8365e8 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
index 1ee0bc8..f30a072 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
index 10465a5..bb490b0 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
index 3733161..6583076 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
index 442309f..730b2e8 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
index f141269..3a15c11 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
index 3ccc4a7..5b7804d 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
index dd250ac..6cd7272 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
index d315f93..a12a30c 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.cfg
+++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
index 3d30bb1..be27f08 100755
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 usb = 1
 usbdevice = "mouse"
 sdl = 0
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
index 4463e31..5e84e7e 100755
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 usb = 1
 usbdevice = "tablet"
 sdl = 0
diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
index ef97329..a4f3aec 100755
--- a/tests/xmconfigdata/test-fullvirt-utc.cfg
+++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
index ee22632..27bec8d 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.cfg
+++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "c"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
index 6d19f21..a24a09c 100644
--- a/tests/xmconfigdata/test-pci-devs.cfg
+++ b/tests/xmconfigdata/test-pci-devs.cfg
@@ -9,11 +9,11 @@ apic = 1
 builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "c"
+device_model = "/usr/lib/xen/bin/qemu-dm"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
-device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-- 
1.8.4.5


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