src/xenconfig: wrap common formatting code

Wrap formatting code common to xm and xl in xenFormatConfigCommon
and export it.

Signed-off-by: Kiarie Kahurani <davidkiarie4@gmail.com>
Signed-off-by: Jim Fehlig <jfehlig@suse.com>

src/xenconfig/xen_xm.c

@@ -2359,6 +2359,61 @@ xenFormatXMVif(virConfPtr conf,
 }
 
 
+int
+xenFormatConfigCommon(virConfPtr conf,
+                      virDomainDefPtr def,
+                      virConnectPtr conn,
+                      int xendConfigVersion)
+{
+    if (xenFormatXMGeneralMeta(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMMem(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMCPUAllocation(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMOS(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMCPUFeatures(conf, def, xendConfigVersion) < 0)
+        return -1;;
+
+    if (xenFormatXMCDROM(conf, def, xendConfigVersion) < 0)
+        return -1;
+
+    if (xenFormatXMTimeOffset(conf, def, xendConfigVersion) < 0)
+        return -1;
+
+    if (xenFormatXMEventActions(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMEmulator(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMInputDevs(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMVfb(conf, def, xendConfigVersion) < 0)
+        return -1;
+
+    if (xenFormatXMVif(conf, conn, def, xendConfigVersion) < 0)
+        return -1;
+
+    if (xenFormatXMPCI(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMCharDev(conf, def) < 0)
+        return -1;
+
+    if (xenFormatXMSound(conf, def) < 0)
+        return -1;
+
+    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);
@@ -2373,54 +2428,12 @@ xenFormatXM(virConnectPtr conn,
     if (!(conf = virConfNew()))
         goto cleanup;
 
-    if (xenFormatXMGeneralMeta(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMMem(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMCPUAllocation(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMOS(conf, def) < 0)
-         goto cleanup;
-
-    if (xenFormatXMCPUFeatures(conf, def, xendConfigVersion) < 0)
-        goto cleanup;
-
-    if (xenFormatXMCDROM(conf, def, xendConfigVersion) < 0)
-        goto cleanup;
-
-    if (xenFormatXMTimeOffset(conf, def, xendConfigVersion) < 0)
-        goto cleanup;
-
-    if (xenFormatXMEventActions(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMEmulator(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMInputDevs(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMVfb(conf, def, xendConfigVersion) < 0)
+    if (xenFormatConfigCommon(conf, def, conn, xendConfigVersion) < 0)
         goto cleanup;
 
     if (xenFormatXMDisks(conf, def, xendConfigVersion) < 0)
         goto cleanup;
 
-    if (xenFormatXMVif(conf, conn, def, xendConfigVersion) < 0)
-        goto cleanup;
-
-    if (xenFormatXMPCI(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMCharDev(conf, def) < 0)
-        goto cleanup;
-
-    if (xenFormatXMSound(conf, def) < 0)
-        goto cleanup;
-
     return conf;
 
  cleanup:

src/xenconfig/xen_xm.h

@@ -41,4 +41,9 @@ int xenParseConfigCommon(virConfPtr conf,
                          virCapsPtr caps,
                          int xendConfigVersion);
 
+int xenFormatConfigCommon(virConfPtr conf,
+                          virDomainDefPtr def,
+                          virConnectPtr conn,
+                          int xendConfigVersion);
+
 #endif /* __VIR_XEN_XM_H__ */

tests/xmconfigdata/test-escape-paths.cfg

@@ -19,8 +19,8 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", """phy:/dev/HostVG/XenGuest'",hdb,w""", "file:/root/boot.iso&test,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", """phy:/dev/HostVG/XenGuest'",hdb,w""", "file:/root/boot.iso&test,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-force-hpet.cfg

@@ -20,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-force-nohpet.cfg

@@ -20,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-localtime.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-net-ioemu.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-net-netfront.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=netfront" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-new-cdrom.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-old-cdrom.cfg

@@ -20,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ]

tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "tcp:127.0.0.1:7777"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = [ "/dev/ttyS0", "/dev/ttyS1" ]
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = [ "none", "/dev/ttyS1" ]
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-file.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "file:/tmp/serial.log"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-null.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "null"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-pipe.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pipe:/tmp/serial.pipe"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-pty.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pty"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-stdio.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "stdio"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "telnet:127.0.0.1:9999,server,nowait"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-tcp.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "tcp:127.0.0.1:7777"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-udp.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "udp:127.0.0.1:9999@0.0.0.0:99998"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-serial-unix.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "unix:/tmp/serial.sock,server,nowait"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-sound.cfg

@@ -19,8 +19,8 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-usbmouse.cfg

@@ -21,7 +21,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-usbtablet.cfg

@@ -21,7 +21,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-utc.cfg

@@ -19,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-no-source-cdrom.cfg

@@ -17,7 +17,7 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pty"
+disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]

tests/xmconfigdata/test-paravirt-net-e1000.cfg

@@ -9,5 +9,5 @@ on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-net-vifname.cfg

@@ -9,5 +9,5 @@ on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000,vifname=net0" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg

@@ -9,5 +9,5 @@ on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=0,vncdisplay=25,vnclisten=127.0.0.1,vncpasswd=123poi" ]
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-new-pvfb.cfg

@@ -9,5 +9,5 @@ on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg

@@ -14,5 +14,5 @@ vncunused = 0
 vncdisplay = 25
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-old-pvfb.cfg

@@ -13,5 +13,5 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-vcpu.cfg

@@ -9,5 +9,5 @@ localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
-disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-pci-devs.cfg

@@ -17,8 +17,8 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]
 vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
 pci = [ "0001:0c:1b.2", "0000:01:13.0" ]
 parallel = "none"
 serial = "pty"
+disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]