xenconfig: move <os> parsing/formating to config-specific files

xl and xm differ a bit in how <os> configuration is represented.
E.g. xl config supports <os><nvram .../></os> via its "bios"
setting.

Move the xenParseOS and xenFormatOS functions from xen_common.c
and copy to xen_xl.c and xen_xm.c so they can be customized for
xm vs xl config.  An unfortunate fallout is reordering of entries
in the test config files.

tests/xlconfigdata/test-fullvirt-multiusb.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -24,6 +21,9 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ]
 usb = 1
 usbdevice = [ "mouse", "tablet" ]

tests/xlconfigdata/test-new-disk.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vnclisten = "127.0.0.1"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,qcow2,hdb,w,backendtype=qdisk", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ]

tests/xlconfigdata/test-spice.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -19,6 +16,9 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ]
 sdl = 0
 vnc = 0

tests/xmconfigdata/test-escape-paths.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader&test"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader&test"
+boot = "d"
 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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-localtime.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=netfront" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 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"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = [ "/dev/ttyS0", "/dev/ttyS1" ]
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = [ "none", "/dev/ttyS1" ]
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "file:/tmp/serial.log"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "null"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pipe:/tmp/serial.pipe"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pty"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "stdio"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 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"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 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"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 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"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 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"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-sound.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -23,4 +20,7 @@ vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

tests/xmconfigdata/test-fullvirt-usbmouse.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,6 +19,9 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 usb = 1
 usbdevice = "mouse"

tests/xmconfigdata/test-fullvirt-usbtablet.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,6 +19,9 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
 usb = 1
 usbdevice = "tablet"

tests/xmconfigdata/test-fullvirt-utc.cfg

@@ -3,9 +3,6 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
 pae = 1
 acpi = 1
 apic = 1
@@ -22,4 +19,7 @@ vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "none"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "d"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]

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

@@ -3,9 +3,6 @@ uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c"
 maxmem = 382
 memory = 350
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "c"
 pae = 1
 acpi = 1
 apic = 1
@@ -20,4 +17,7 @@ vncunused = 1
 vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
 parallel = "none"
 serial = "pty"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "c"
 disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]

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

@@ -3,11 +3,11 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

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

@@ -3,11 +3,11 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=e1000,vifname=net0" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

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

@@ -3,11 +3,11 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=0,vncdisplay=25,vnclisten=127.0.0.1,vncpasswd=123poi" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

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

@@ -3,11 +3,11 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

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

@@ -3,7 +3,6 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -15,4 +14,5 @@ vncdisplay = 25
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

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

@@ -3,7 +3,6 @@ uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
 maxmem = 579
 memory = 394
 vcpus = 1
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -14,4 +13,5 @@ vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-paravirt-vcpu.cfg

@@ -4,10 +4,10 @@ maxmem = 579
 memory = 394
 vcpus = 4
 vcpu_avail = 3
-bootloader = "/usr/bin/pygrub"
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ]
+bootloader = "/usr/bin/pygrub"
 disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]

tests/xmconfigdata/test-pci-devs.cfg

@@ -3,9 +3,6 @@ uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c"
 maxmem = 382
 memory = 350
 vcpus = 1
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "c"
 pae = 1
 acpi = 1
 apic = 1
@@ -21,4 +18,7 @@ vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=
 pci = [ "0001:0c:1b.2", "0000:01:13.0" ]
 parallel = "none"
 serial = "pty"
+builder = "hvm"
+kernel = "/usr/lib/xen/boot/hvmloader"
+boot = "c"
 disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ]