7:37 a.m.
The formatter support was unused from the time we dropped xend support.
Let's drop the formatter too along with all the unused code.
Peter Krempa (14):
tests: Remove xml2sexprtest
xenconfig: Drop sxpr formatter
xenconfig: Move guts of xenFormatSxprSound into xenFormatSound
xen: Move xenFormatSxprChr to xen_common
libxl: Drop support for parsing sxpr format in
libxlConnectDomainXMLFromNative
tests: Drop sexpr2xmltest
xenconfig: Drop unused sexpr parsing infrastructure
xenconfig: Remove pointless label in xenParseSxprSound
xen: Inline xenParseSxprSound into the only caller
xen: Move xenParseSxprVifRate to xen_common
xen: Move xenParseSxprChar to xen_common
xen: drop xen_sxpr.(c|h)
util: Drop virsexpr module
news: Mention drop of xen sxpr support
docs/drvxen.html.in | 3 +-
docs/news.xml | 11 +
po/POTFILES | 1 -
src/libvirt_private.syms | 18 -
src/libvirt_xenconfig.syms | 15 -
src/libxl/libxl_driver.c | 14 +-
src/util/Makefile.inc.am | 2 -
src/util/virsexpr.c | 608 ----
src/util/virsexpr.h | 66 -
src/xenconfig/Makefile.inc.am | 2 -
src/xenconfig/xen_common.c | 390 ++-
src/xenconfig/xen_sxpr.c | 2486 -----------------
src/xenconfig/xen_sxpr.h | 66 -
src/xenconfig/xenxs_private.h | 1 -
tests/Makefile.am | 16 +-
tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 6 -
tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 30 -
.../sexpr2xml-bridge-ipaddr.sexpr | 10 -
.../sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 38 -
tests/sexpr2xmldata/sexpr2xml-curmem.sexpr | 50 -
tests/sexpr2xmldata/sexpr2xml-curmem.xml | 44 -
.../sexpr2xml-disk-block-shareable.sexpr | 6 -
.../sexpr2xml-disk-block-shareable.xml | 36 -
.../sexpr2xmldata/sexpr2xml-disk-block.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 31 -
.../sexpr2xml-disk-drv-blktap-qcow.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap-qcow.xml | 31 -
.../sexpr2xml-disk-drv-blktap-raw.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap-raw.xml | 31 -
.../sexpr2xml-disk-drv-blktap2-raw.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap2-raw.xml | 31 -
tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 31 -
.../sexpr2xmldata/sexpr2xml-fv-autoport.sexpr | 86 -
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 59 -
.../sexpr2xml-fv-empty-kernel.sexpr | 11 -
.../sexpr2xml-fv-empty-kernel.xml | 52 -
.../sexpr2xml-fv-force-hpet.sexpr | 11 -
.../sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 55 -
.../sexpr2xml-fv-force-nohpet.sexpr | 11 -
.../sexpr2xml-fv-force-nohpet.xml | 55 -
tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 36 -
.../sexpr2xml-fv-legacy-vfb.sexpr | 70 -
.../sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 37 -
.../sexpr2xml-fv-localtime.sexpr | 10 -
.../sexpr2xmldata/sexpr2xml-fv-localtime.xml | 52 -
.../sexpr2xml-fv-net-netfront.sexpr | 11 -
.../sexpr2xml-fv-net-netfront.xml | 53 -
.../sexpr2xml-fv-parallel-tcp.sexpr | 10 -
.../sexpr2xml-fv-parallel-tcp.xml | 57 -
.../sexpr2xml-fv-serial-dev-2-ports.sexpr | 12 -
.../sexpr2xml-fv-serial-dev-2-ports.xml | 64 -
.../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 11 -
.../sexpr2xml-fv-serial-dev-2nd-port.xml | 60 -
.../sexpr2xml-fv-serial-file.sexpr | 12 -
.../sexpr2xml-fv-serial-file.xml | 60 -
.../sexpr2xml-fv-serial-null.sexpr | 10 -
.../sexpr2xml-fv-serial-null.xml | 58 -
.../sexpr2xml-fv-serial-pipe.sexpr | 12 -
.../sexpr2xml-fv-serial-pipe.xml | 60 -
.../sexpr2xml-fv-serial-pty.sexpr | 11 -
.../sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 58 -
.../sexpr2xml-fv-serial-stdio.sexpr | 10 -
.../sexpr2xml-fv-serial-stdio.xml | 58 -
.../sexpr2xml-fv-serial-tcp-telnet.sexpr | 11 -
.../sexpr2xml-fv-serial-tcp-telnet.xml | 62 -
.../sexpr2xml-fv-serial-tcp.sexpr | 11 -
.../sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 62 -
.../sexpr2xml-fv-serial-udp.sexpr | 11 -
.../sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 62 -
.../sexpr2xml-fv-serial-unix.sexpr | 11 -
.../sexpr2xml-fv-serial-unix.xml | 60 -
.../sexpr2xml-fv-sound-all.sexpr | 11 -
.../sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 54 -
tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 10 -
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 54 -
.../sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 10 -
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 53 -
.../sexpr2xml-fv-usbtablet.sexpr | 10 -
.../sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 53 -
tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 11 -
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 52 -
tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 52 -
tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 11 -
tests/sexpr2xmldata/sexpr2xml-fv.xml | 52 -
.../sexpr2xmldata/sexpr2xml-net-bridged.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 37 -
tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr | 10 -
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 38 -
.../sexpr2xmldata/sexpr2xml-net-routed.sexpr | 10 -
tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 37 -
.../sexpr2xml-no-source-cdrom.sexpr | 66 -
.../sexpr2xml-no-source-cdrom.xml | 58 -
tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 10 -
tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 43 -
.../sexpr2xml-pv-bootloader-cmdline.sexpr | 5 -
.../sexpr2xml-pv-bootloader-cmdline.xml | 31 -
.../sexpr2xml-pv-bootloader.sexpr | 5 -
.../sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 30 -
.../sexpr2xml-pv-localtime.sexpr | 8 -
.../sexpr2xmldata/sexpr2xml-pv-localtime.xml | 31 -
tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 31 -
.../sexpr2xml-pv-vfb-new-vncdisplay.sexpr | 10 -
.../sexpr2xml-pv-vfb-new-vncdisplay.xml | 37 -
.../sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 37 -
.../sexpr2xml-pv-vfb-type-crash.sexpr | 83 -
.../sexpr2xml-pv-vfb-type-crash.xml | 42 -
tests/sexpr2xmldata/sexpr2xml-pv.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-pv.xml | 31 -
tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 11 -
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 56 -
tests/sexpr2xmltest.c | 170 --
tests/virschematest.c | 4 +-
tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 6 -
tests/xml2sexprdata/xml2sexpr-boot-grub.xml | 21 -
.../xml2sexpr-bridge-ipaddr.sexpr | 12 -
.../xml2sexprdata/xml2sexpr-bridge-ipaddr.xml | 29 -
tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 7 -
tests/xml2sexprdata/xml2sexpr-curmem.xml | 23 -
.../xml2sexpr-disk-block-shareable.sexpr | 9 -
.../xml2sexpr-disk-block-shareable.xml | 31 -
.../xml2sexprdata/xml2sexpr-disk-block.sexpr | 10 -
tests/xml2sexprdata/xml2sexpr-disk-block.xml | 22 -
.../xml2sexpr-disk-drv-blkback.sexpr | 10 -
.../xml2sexpr-disk-drv-blkback.xml | 23 -
.../xml2sexpr-disk-drv-blktap-qcow.sexpr | 10 -
.../xml2sexpr-disk-drv-blktap-qcow.xml | 23 -
.../xml2sexpr-disk-drv-blktap-raw.sexpr | 10 -
.../xml2sexpr-disk-drv-blktap-raw.xml | 23 -
.../xml2sexpr-disk-drv-blktap.sexpr | 10 -
.../xml2sexpr-disk-drv-blktap.xml | 23 -
.../xml2sexpr-disk-drv-blktap2-raw.sexpr | 10 -
.../xml2sexpr-disk-drv-blktap2-raw.xml | 23 -
.../xml2sexpr-disk-drv-blktap2.sexpr | 10 -
.../xml2sexpr-disk-drv-blktap2.xml | 23 -
.../xml2sexpr-disk-drv-loop.sexpr | 10 -
.../xml2sexprdata/xml2sexpr-disk-drv-loop.xml | 23 -
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 10 -
tests/xml2sexprdata/xml2sexpr-disk-file.xml | 22 -
tests/xml2sexprdata/xml2sexpr-escape.sexpr | 11 -
tests/xml2sexprdata/xml2sexpr-escape.xml | 24 -
.../xml2sexpr-fv-force-hpet.sexpr | 12 -
.../xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 39 -
.../xml2sexpr-fv-force-nohpet.sexpr | 12 -
.../xml2sexpr-fv-force-nohpet.xml | 39 -
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 12 -
tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 24 -
.../xml2sexpr-fv-localtime.sexpr | 12 -
.../xml2sexprdata/xml2sexpr-fv-localtime.xml | 37 -
.../xml2sexpr-fv-net-many-models.sexpr | 1 -
.../xml2sexpr-fv-net-many-models.xml | 43 -
.../xml2sexpr-fv-net-netfront.sexpr | 10 -
.../xml2sexpr-fv-net-netfront.xml | 31 -
.../xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 10 -
tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml | 34 -
.../xml2sexpr-fv-parallel-tcp.sexpr | 12 -
.../xml2sexpr-fv-parallel-tcp.xml | 40 -
.../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 -
.../xml2sexpr-fv-serial-dev-2-ports.xml | 44 -
.../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 12 -
.../xml2sexpr-fv-serial-dev-2nd-port.xml | 40 -
.../xml2sexpr-fv-serial-file.sexpr | 13 -
.../xml2sexpr-fv-serial-file.xml | 40 -
.../xml2sexpr-fv-serial-null.sexpr | 12 -
.../xml2sexpr-fv-serial-null.xml | 39 -
.../xml2sexpr-fv-serial-pipe.sexpr | 13 -
.../xml2sexpr-fv-serial-pipe.xml | 40 -
.../xml2sexpr-fv-serial-pty.sexpr | 12 -
.../xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 39 -
.../xml2sexpr-fv-serial-stdio.sexpr | 12 -
.../xml2sexpr-fv-serial-stdio.xml | 39 -
.../xml2sexpr-fv-serial-tcp-telnet.sexpr | 13 -
.../xml2sexpr-fv-serial-tcp-telnet.xml | 41 -
.../xml2sexpr-fv-serial-tcp.sexpr | 13 -
.../xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 40 -
.../xml2sexpr-fv-serial-udp.sexpr | 13 -
.../xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 41 -
.../xml2sexpr-fv-serial-unix.sexpr | 13 -
.../xml2sexpr-fv-serial-unix.xml | 40 -
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 12 -
tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 38 -
.../xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 12 -
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 37 -
.../xml2sexpr-fv-usbtablet.sexpr | 10 -
.../xml2sexprdata/xml2sexpr-fv-usbtablet.xml | 36 -
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 12 -
tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 37 -
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 11 -
.../xml2sexpr-fv-vncunused.sexpr | 11 -
.../xml2sexprdata/xml2sexpr-fv-vncunused.xml | 36 -
tests/xml2sexprdata/xml2sexpr-fv.sexpr | 12 -
tests/xml2sexprdata/xml2sexpr-fv.xml | 36 -
.../xml2sexprdata/xml2sexpr-net-bridged.sexpr | 11 -
tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 28 -
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 11 -
tests/xml2sexprdata/xml2sexpr-net-e1000.xml | 29 -
.../xml2sexprdata/xml2sexpr-net-routed.sexpr | 11 -
tests/xml2sexprdata/xml2sexpr-net-routed.xml | 28 -
.../xml2sexpr-no-source-cdrom.sexpr | 10 -
.../xml2sexpr-no-source-cdrom.xml | 37 -
tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 10 -
tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 32 -
.../xml2sexpr-pv-bootloader-cmdline.sexpr | 6 -
.../xml2sexpr-pv-bootloader-cmdline.xml | 22 -
.../xml2sexpr-pv-bootloader.sexpr | 7 -
.../xml2sexprdata/xml2sexpr-pv-bootloader.xml | 18 -
.../xml2sexpr-pv-localtime.sexpr | 8 -
.../xml2sexprdata/xml2sexpr-pv-localtime.xml | 25 -
tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 9 -
tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 -
.../xml2sexpr-pv-vfb-new-auto.sexpr | 11 -
.../xml2sexpr-pv-vfb-new-auto.xml | 23 -
.../xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 11 -
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml | 23 -
tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 -
tests/xml2sexprdata/xml2sexpr-pv.xml | 22 -
tests/xml2sexprtest.c | 167 --
221 files changed, 393 insertions(+), 8907 deletions(-)
delete mode 100644 src/util/virsexpr.c
delete mode 100644 src/util/virsexpr.h
delete mode 100644 src/xenconfig/xen_sxpr.c
delete mode 100644 src/xenconfig/xen_sxpr.h
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
delete mode 100644 tests/sexpr2xmltest.c
delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.xml
delete mode 100644 tests/xml2sexprtest.c
--
2.21.0
7:37 a.m.
New subject: [libvirt] [PATCH 01/14] tests: Remove xml2sexprtest
The test was the only place calling 'xenFormatSxpr'. Drop it as there
are no other users of that code since we've dropped xend support.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/Makefile.am | 10 +-
tests/virschematest.c | 2 +-
tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 6 -
tests/xml2sexprdata/xml2sexpr-boot-grub.xml | 21 ---
.../xml2sexpr-bridge-ipaddr.sexpr | 12 --
.../xml2sexprdata/xml2sexpr-bridge-ipaddr.xml | 29 ---
tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 7 -
tests/xml2sexprdata/xml2sexpr-curmem.xml | 23 ---
.../xml2sexpr-disk-block-shareable.sexpr | 9 -
.../xml2sexpr-disk-block-shareable.xml | 31 ----
.../xml2sexprdata/xml2sexpr-disk-block.sexpr | 10 --
tests/xml2sexprdata/xml2sexpr-disk-block.xml | 22 ---
.../xml2sexpr-disk-drv-blkback.sexpr | 10 --
.../xml2sexpr-disk-drv-blkback.xml | 23 ---
.../xml2sexpr-disk-drv-blktap-qcow.sexpr | 10 --
.../xml2sexpr-disk-drv-blktap-qcow.xml | 23 ---
.../xml2sexpr-disk-drv-blktap-raw.sexpr | 10 --
.../xml2sexpr-disk-drv-blktap-raw.xml | 23 ---
.../xml2sexpr-disk-drv-blktap.sexpr | 10 --
.../xml2sexpr-disk-drv-blktap.xml | 23 ---
.../xml2sexpr-disk-drv-blktap2-raw.sexpr | 10 --
.../xml2sexpr-disk-drv-blktap2-raw.xml | 23 ---
.../xml2sexpr-disk-drv-blktap2.sexpr | 10 --
.../xml2sexpr-disk-drv-blktap2.xml | 23 ---
.../xml2sexpr-disk-drv-loop.sexpr | 10 --
.../xml2sexprdata/xml2sexpr-disk-drv-loop.xml | 23 ---
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 10 --
tests/xml2sexprdata/xml2sexpr-disk-file.xml | 22 ---
tests/xml2sexprdata/xml2sexpr-escape.sexpr | 11 --
tests/xml2sexprdata/xml2sexpr-escape.xml | 24 ---
.../xml2sexpr-fv-force-hpet.sexpr | 12 --
.../xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 39 ----
.../xml2sexpr-fv-force-nohpet.sexpr | 12 --
.../xml2sexpr-fv-force-nohpet.xml | 39 ----
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 12 --
tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 24 ---
.../xml2sexpr-fv-localtime.sexpr | 12 --
.../xml2sexprdata/xml2sexpr-fv-localtime.xml | 37 ----
.../xml2sexpr-fv-net-many-models.sexpr | 1 -
.../xml2sexpr-fv-net-many-models.xml | 43 -----
.../xml2sexpr-fv-net-netfront.sexpr | 10 --
.../xml2sexpr-fv-net-netfront.xml | 31 ----
.../xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 10 --
tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml | 34 ----
.../xml2sexpr-fv-parallel-tcp.sexpr | 12 --
.../xml2sexpr-fv-parallel-tcp.xml | 40 -----
.../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 --
.../xml2sexpr-fv-serial-dev-2-ports.xml | 44 -----
.../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 12 --
.../xml2sexpr-fv-serial-dev-2nd-port.xml | 40 -----
.../xml2sexpr-fv-serial-file.sexpr | 13 --
.../xml2sexpr-fv-serial-file.xml | 40 -----
.../xml2sexpr-fv-serial-null.sexpr | 12 --
.../xml2sexpr-fv-serial-null.xml | 39 ----
.../xml2sexpr-fv-serial-pipe.sexpr | 13 --
.../xml2sexpr-fv-serial-pipe.xml | 40 -----
.../xml2sexpr-fv-serial-pty.sexpr | 12 --
.../xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 39 ----
.../xml2sexpr-fv-serial-stdio.sexpr | 12 --
.../xml2sexpr-fv-serial-stdio.xml | 39 ----
.../xml2sexpr-fv-serial-tcp-telnet.sexpr | 13 --
.../xml2sexpr-fv-serial-tcp-telnet.xml | 41 -----
.../xml2sexpr-fv-serial-tcp.sexpr | 13 --
.../xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 40 -----
.../xml2sexpr-fv-serial-udp.sexpr | 13 --
.../xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 41 -----
.../xml2sexpr-fv-serial-unix.sexpr | 13 --
.../xml2sexpr-fv-serial-unix.xml | 40 -----
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 12 --
tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 38 ----
.../xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 12 --
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 37 ----
.../xml2sexpr-fv-usbtablet.sexpr | 10 --
.../xml2sexprdata/xml2sexpr-fv-usbtablet.xml | 36 ----
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 12 --
tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 37 ----
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 11 --
.../xml2sexpr-fv-vncunused.sexpr | 11 --
.../xml2sexprdata/xml2sexpr-fv-vncunused.xml | 36 ----
tests/xml2sexprdata/xml2sexpr-fv.sexpr | 12 --
tests/xml2sexprdata/xml2sexpr-fv.xml | 36 ----
.../xml2sexprdata/xml2sexpr-net-bridged.sexpr | 11 --
tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 28 ---
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 11 --
tests/xml2sexprdata/xml2sexpr-net-e1000.xml | 29 ---
.../xml2sexprdata/xml2sexpr-net-routed.sexpr | 11 --
tests/xml2sexprdata/xml2sexpr-net-routed.xml | 28 ---
.../xml2sexpr-no-source-cdrom.sexpr | 10 --
.../xml2sexpr-no-source-cdrom.xml | 37 ----
tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 10 --
tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 32 ----
.../xml2sexpr-pv-bootloader-cmdline.sexpr | 6 -
.../xml2sexpr-pv-bootloader-cmdline.xml | 22 ---
.../xml2sexpr-pv-bootloader.sexpr | 7 -
.../xml2sexprdata/xml2sexpr-pv-bootloader.xml | 18 --
.../xml2sexpr-pv-localtime.sexpr | 8 -
.../xml2sexprdata/xml2sexpr-pv-localtime.xml | 25 ---
tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 9 -
tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 ---
.../xml2sexpr-pv-vfb-new-auto.sexpr | 11 --
.../xml2sexpr-pv-vfb-new-auto.xml | 23 ---
.../xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 11 --
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml | 23 ---
tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 -
tests/xml2sexprdata/xml2sexpr-pv.xml | 22 ---
tests/xml2sexprtest.c | 167 ------------------
106 files changed, 3 insertions(+), 2317 deletions(-)
delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.sexpr
delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.xml
delete mode 100644 tests/xml2sexprtest.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 115afa1c1a..c591a39631 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -158,7 +158,6 @@ EXTRA_DIST = \
vmx2xmldata \
xlconfigdata \
xmconfigdata \
- xml2sexprdata \
xml2vmxdata \
virstorageutildata \
virfilecachedata \
@@ -268,7 +267,7 @@ endif WITH_SECDRIVER_SELINUX
ssh_SOURCES = ssh.c
if WITH_LIBXL
-test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \
+test_programs += xlconfigtest sexpr2xmltest \
xmconfigtest libxlxml2domconfigtest
test_libraries += libxltestdriver.la libxlmock.la
endif WITH_LIBXL
@@ -504,11 +503,6 @@ xlconfigtest_SOURCES = \
testutils.c testutils.h
xlconfigtest_LDADD =$(libxl_LDADDS)
-xml2sexprtest_SOURCES = \
- xml2sexprtest.c testutilsxen.c testutilsxen.h \
- testutils.c testutils.h
-xml2sexprtest_LDADD = $(libxl_LDADDS)
-
sexpr2xmltest_SOURCES = \
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@@ -531,7 +525,7 @@ libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
libxlmock_la_LIBADD = $(MOCKLIBS_LIBS)
else ! WITH_LIBXL
-EXTRA_DIST += xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \
+EXTRA_DIST += xlconfigtest.c sexpr2xmltest.c \
xmconfigtest.c libxlxml2domconfigtest.c
endif ! WITH_LIBXL
diff --git a/tests/virschematest.c b/tests/virschematest.c
index ff25f7781e..e5bfcde729 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -217,7 +217,7 @@ mymain(void)
DO_TEST_DIR("capability.rng", "capabilityschemadata",
"vircaps2xmldata");
DO_TEST_DIR("domain.rng", "domainschemadata",
"qemuxml2argvdata", "sexpr2xmldata",
"xmconfigdata",
- "xml2sexprdata", "qemuxml2xmloutdata",
"lxcxml2xmldata",
+ "qemuxml2xmloutdata", "lxcxml2xmldata",
"lxcxml2xmloutdata", "bhyvexml2argvdata",
"genericxml2xmlindata",
"genericxml2xmloutdata", "xlconfigdata",
"libxlxml2domconfigdata",
"qemuhotplugtestdomains");
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
deleted file mode 100644
index 923d282e22..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(image (linux \
-(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args
'(hd0,0)/grub/menu.lst')\
-(localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode
'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml
b/tests/xml2sexprdata/xml2sexpr-boot-grub.xml
deleted file mode 100644
index c4b92dcd00..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
- <cmdline>(hd0,0)/grub/menu.lst</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <source dev='/dev/MainVG/GuestLV'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
deleted file mode 100644
index 68305074f8..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(image (linux \
-(kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(ip '192.0.2.1'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
deleted file mode 100644
index d72f986915..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <interface type="bridge">
- <mac address="00:11:22:33:44:55"/>
- <source bridge="xenbr2"/>
- <ip address="192.0.2.1"/>
- <script path="vif-bridge"/>
- <target dev="vif4.0"/>
- </interface>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
deleted file mode 100644
index 4b9fbb397b..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr
+++ /dev/null
@@ -1,7 +0,0 @@
-(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
-(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader
'/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash
'restart')\
-(image (linux (localtime 0)))(localtime 0)\
-(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode
'w')))\
-(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml
b/tests/xml2sexprdata/xml2sexpr-curmem.xml
deleted file mode 100644
index 826effb2a0..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-curmem.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='5'>
- <name>rhel5</name>
- <uuid>4f77abd2301958e83bab6fbf2118f880</uuid>
- <bootloader>/usr/bin/pygrub</bootloader>
- <memory unit='KiB'>394240</memory>
- <currentMemory unit='KiB'>179200</currentMemory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1d:06:15'/>
- <script path='vif-bridge'/>
- </interface>
- <disk type='file' device='disk'>
- <driver name='tap' type='aio'/>
- <source file='/xen/rhel5.img'/>
- <target dev='xvda'/>
- </disk>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
deleted file mode 100644
index e0131364bb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\
-(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader
'/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash
'restart')\
-(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')(uname
'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))\
-(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
deleted file mode 100644
index b7bb21438f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen'>
- <name>pvtest</name>
- <uuid>49a0c6ffc066539264983632d093c2e7</uuid>
- <bootloader>/usr/bin/pygrub</bootloader>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/boot_kernel.BCkYBN</kernel>
- <initrd>/var/lib/xen/boot_ramdisk.sjOK9_</initrd>
- <cmdline>ro root=/dev/VolGroup00/LogVol00</cmdline>
- </os>
- <currentMemory unit='KiB'>393216</currentMemory>
- <memory unit='KiB'>524288</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap' type='aio'/>
- <source file='/var/lib/xen/images/rhel5pv.img'/>
- <target dev='xvda'/>
- <shareable/>
- </disk>
- <interface type='bridge'>
- <mac address='00:16:3e:23:9e:eb'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- </interface>
- <console/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
deleted file mode 100644
index ce1fd23185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.xml
b/tests/xml2sexprdata/xml2sexpr-disk-block.xml
deleted file mode 100644
index c38717614a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <source dev='/dev/MainVG/GuestLV'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
deleted file mode 100644
index ce1fd23185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
deleted file mode 100644
index a1c528f507..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <driver name="phy"/>
- <source dev='/dev/MainVG/GuestLV'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
deleted file mode 100644
index d44de4f0cb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:qcow:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
deleted file mode 100644
index e6ad42b099..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="tap" type="qcow"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
deleted file mode 100644
index 47e00365d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
deleted file mode 100644
index f5670d2d20..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="tap" type="aio"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
deleted file mode 100644
index 47e00365d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
deleted file mode 100644
index a32cd278d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="tap"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
deleted file mode 100644
index bc6c9232ff..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
deleted file mode 100644
index f531250c9f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="tap2" type="aio"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
deleted file mode 100644
index bc6c9232ff..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
deleted file mode 100644
index e0384b2669..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="tap2"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
deleted file mode 100644
index be7ce1a653..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
deleted file mode 100644
index a7e662c8b1..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name="file"/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
deleted file mode 100644
index be7ce1a653..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.xml
b/tests/xml2sexprdata/xml2sexpr-disk-file.xml
deleted file mode 100644
index 828d450d24..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
deleted file mode 100644
index 75411ceb1a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os&version="devel" ')\
-(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(pae 1)(usb 1)(parallel
none)\
-(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')(rtc_timeoffset 0)\
-(localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda:disk')(uname 'file:/root/\'\\some.img')(mode
'w'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-escape.xml
b/tests/xml2sexprdata/xml2sexpr-escape.xml
deleted file mode 100644
index 7cc8477211..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-escape.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='xen' id='15'>
- <name>fvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>hvm</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <disk type='file' device='disk'>
- <source file='/root/'\some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
deleted file mode 100644
index 92ccfdfa1a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
deleted file mode 100644
index fbf360573e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <clock offset='utc'>
- <timer name='hpet' present='yes'/>
- </clock>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
deleted file mode 100644
index 4455c425a4..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
deleted file mode 100644
index e7144cf9bc..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <clock offset='utc'>
- <timer name='hpet' present='no'/>
- </clock>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
deleted file mode 100644
index 912ea32f72..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
-(boot c)(pae 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib/xen/bin/qemu-dm')\
-(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda:disk')(uname 'file:/root/some.img')(mode
'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
deleted file mode 100644
index 144e09f335..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='xen' id='15'>
- <name>fvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>hvm</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
deleted file mode 100644
index 75937fbd81..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 1)))\
-(localtime 1)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
b/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
deleted file mode 100644
index 2360ec7764..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <clock offset='localtime'/>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
deleted file mode 100644
index 118dfd87bb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
+++ /dev/null
@@ -1 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid
'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot
'restart')(on_crash 'destroy')(image (hvm (kernel
'/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(pae 1)(usb 1)(parallel
none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(rtc_timeoffset
0)(localtime 0)))(localtime 0)(device (vif (mac '00:11:22:33:44:55')(bridge
'xenbr0')(script 'vif-bridge')(model 'idontexist')))(device (vif
(mac '00:11:22:33:44:56')(bridge 'xenbr0')(script
'vif-bridge')(model 'vmxnet3')))(device (vif (mac
'00:11:22:33:44:57')(bridge 'xenbr0')(script 'vif-bridge')(type
netfront)))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script
'vif-bridge')(model 'virtio')))(device (vif (mac
'00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model
'ne2k_pci')))(device (vif (mac '00:11:22:33:44:58')(bridge
'xenbr0')(script 'vif-bridge')(model 'pcnet'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
deleted file mode 100644
index e95cba7f6a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:55'/>
- <model type='idontexist'/>
- </interface>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:56'/>
- <model type='vmxnet3'/>
- </interface>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:57'/>
- <model type='netfront'/>
- </interface>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:58'/>
- <model type='virtio'/>
- </interface>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:58'/>
- <model type='ne2k_pci'/>
- </interface>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:11:22:33:44:58'/>
- <model type='pcnet'/>
- </interface>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
deleted file mode 100644
index 429c1d057a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae
1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime
0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge
'xenbr0')\
-(script 'vif-bridge')(type netfront))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
deleted file mode 100644
index efabc36339..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='netfront'/>
- </interface>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
deleted file mode 100644
index 3c126efd30..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae
1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime
0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(rate
'10240KB/s')\
-(bridge 'xenbr0')(script 'vif-bridge')(type netfront))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
deleted file mode 100644
index caea525e58..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <bandwidth>
- <outbound average='10240'/>
- </bandwidth>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='netfront'/>
- </interface>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
deleted file mode 100644
index 60db1f9934..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
deleted file mode 100644
index 3f0176e768..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <parallel type='tcp'>
- <source mode='connect' host='localhost'
service='9999'/>
- <target port='0'/>
- </parallel>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
deleted file mode 100644
index 142377ea57..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
deleted file mode 100644
index 643db65e37..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='dev'>
- <source path='/dev/ttyS0'/>
- <target port='0'/>
- </serial>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
deleted file mode 100644
index f74ed39b46..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
deleted file mode 100644
index 3afaa4c29d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
deleted file mode 100644
index be8ccc3391..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
deleted file mode 100644
index 411530d824..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='file'>
- <source path='/tmp/serial.log'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
deleted file mode 100644
index 763ddf9437..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
deleted file mode 100644
index b8285bcf4f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='null'>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
deleted file mode 100644
index 6ece05f9be..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
deleted file mode 100644
index 4316cdef31..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='pipe'>
- <source path='/tmp/serial.pipe'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
deleted file mode 100644
index 73eed6489c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
deleted file mode 100644
index 9e162499d3..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
deleted file mode 100644
index 7f144bee02..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
deleted file mode 100644
index 068b188ce7..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='stdio'>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
deleted file mode 100644
index 68204e60db..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
deleted file mode 100644
index f510e40e74..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <protocol type='telnet'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
deleted file mode 100644
index 4bec5ec09c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
deleted file mode 100644
index 69603fea3a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
deleted file mode 100644
index c887edb9aa..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
deleted file mode 100644
index ec94ebf185..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='udp'>
- <source mode='connect' host='localhost'
service='9998'/>
- <source mode='bind' host='localhost'
service='9999'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
deleted file mode 100644
index 46c0905520..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+++ /dev/null
@@ -1,13 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)\
-(serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
deleted file mode 100644
index 6d87bea57c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <serial type='unix'>
- <source mode='bind' path='/tmp/serial.sock'/>
- <target port='0'/>
- </serial>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
deleted file mode 100644
index 8dfdaecf26..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc
1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
deleted file mode 100644
index ec55ef330d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- <sound model='sb16'/>
- <sound model='es1370'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
deleted file mode 100644
index 8b97b1033e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(usbdevice mouse)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
deleted file mode 100644
index 9af0df4f4e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <input type='mouse' bus='usb'/>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
deleted file mode 100644
index 6a192bbd44..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(rtc_timeoffset 0)(localtime 0)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(type ioemu))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
deleted file mode 100644
index d619e8f9fb..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <input type='tablet' bus='usb'/>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
deleted file mode 100644
index 8733764996..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
b/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
deleted file mode 100644
index a916e4147a..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <clock offset='utc'/>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
deleted file mode 100644
index 30b7596962..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae
1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime
0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
deleted file mode 100644
index 31b56ee04e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae
1)\
-(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 1)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)(device (vbd (dev 'hda:disk')\
-(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev
'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
deleted file mode 100644
index 92e7cf1be0..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <graphics type='vnc' port='-1' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
deleted file mode 100644
index 8733764996..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
-(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-fv.xml b/tests/xml2sexprdata/xml2sexpr-fv.xml
deleted file mode 100644
index 4e77f5d802..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-fv.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen'>
- <name>fvtest</name>
- <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>409600</memory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <features>
- <acpi/>
- </features>
- <devices>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1b:b1:47'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <disk type='file'>
- <source file='/root/foo.img'/>
- <target dev='ioemu:hda'/>
- </disk>
- <disk type='file' device='cdrom'>
- <source file='/root/boot.iso'/>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <graphics type='vnc' port='5917' keymap='ja'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
deleted file mode 100644
index a581fa0765..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
deleted file mode 100644
index d995d19c8d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <interface type="bridge">
- <mac address="00:11:22:33:44:55"/>
- <source bridge="xenbr2"/>
- <script path="vif-bridge"/>
- <target dev="vif4.0"/>
- </interface>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
deleted file mode 100644
index 4e650d4776..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
b/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
deleted file mode 100644
index e49518d875..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <interface type="bridge">
- <mac address="00:11:22:33:44:55"/>
- <source bridge="xenbr2"/>
- <script path="vif-bridge"/>
- <model type='e1000'/>
- <target dev="vif4.0"/>
- </interface>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
deleted file mode 100644
index adc2dd0a17..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\
-(ip '172.14.5.6'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.xml
b/tests/xml2sexprdata/xml2sexpr-net-routed.xml
deleted file mode 100644
index 2adc3a7941..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <interface type="ethernet">
- <mac address="00:11:22:33:44:55"/>
- <ip address="172.14.5.6"/>
- <script path="vif-routed"/>
- <target dev="vif4.0"/>
- </interface>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
deleted file mode 100644
index cff05a8cfa..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)\
-(uuid 'cc2315e7-d26a-307a-438c-6d188ec4c09c')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
-(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)\
-(rtc_timeoffset 0)(localtime 0)))(localtime 0)\
-(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(mode 'r')))\
-(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
deleted file mode 100644
index 65a6c019b4..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
- <name>test</name>
- <uuid>cc2315e7d26a307a438c6d188ec4c09c</uuid>
- <os>
- <type>hvm</type>
- <loader>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <memory unit='KiB'>391168</memory>
- <currentMemory unit='KiB'>358400</currentMemory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <interface type='ethernet'>
- <mac address='00:16:3e:0a:7b:39'/>
- <model type='e1000'/>
- </interface>
- <disk type='block' device='disk'>
- <driver name='phy'/>
- <source dev='/dev/sda8'/>
- <target dev='hda'/>
- </disk>
- <disk device='cdrom'>
- <target dev='hdc'/>
- <readonly/>
- </disk>
- <graphics type='vnc' port='5906'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
deleted file mode 100644
index 1ce3c1cd19..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))(localtime 0)(device (vbd (dev
'xvda')\
-(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\
-(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\
-(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
b/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
deleted file mode 100644
index a2d9d7e8e8..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <source dev='/dev/MainVG/GuestLV'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- <hostdev mode='subsystem' type='pci' managed='no'>
- <source>
- <address domain='0x0001' bus='0x0c' slot='0x1b'
function='0x2'/>
- </source>
- </hostdev>
- <hostdev mode='subsystem' type='pci' managed='no'>
- <source>
- <address domain='0x0000' bus='0x01' slot='0x13'
function='0x0'/>
- </source>
- </hostdev>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
deleted file mode 100644
index 7a592a4f35..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader
'/usr/bin/pygrub')\
-(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot
'destroy')\
-(on_crash 'destroy')(image (linux (args
'xenfb.video=8,1280,1024')(localtime 0)))\
-(localtime 0)\
-(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode
'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
deleted file mode 100644
index e4f468504b..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <bootloader>/usr/bin/pygrub</bootloader>
- <bootloader_args>-q</bootloader_args>
- <os>
- <type>linux</type>
- <cmdline>xenfb.video=8,1280,1024</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
deleted file mode 100644
index 7ecf6d2192..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
+++ /dev/null
@@ -1,7 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader
'/usr/bin/pypxeboot')\
-(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (localtime 0)))(localtime 0)\
-(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
deleted file mode 100644
index 98bd8ecf54..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <bootloader>/usr/bin/pypxeboot</bootloader>
- <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
deleted file mode 100644
index 4effc921ba..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
-(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader
'/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash
'restart')\
-(image (linux (localtime 1)))(localtime 1)\
-(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode
'w')))\
-(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
-(script 'vif-bridge')))\
-(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 5))))
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
deleted file mode 100644
index d4ea7ee2c5..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<domain type='xen' id='5'>
- <name>rhel5</name>
- <uuid>4f77abd2301958e83bab6fbf2118f880</uuid>
- <bootloader>/usr/bin/pygrub</bootloader>
- <memory unit='KiB'>394240</memory>
- <currentMemory unit='KiB'>179200</currentMemory>
- <vcpu>1</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <clock offset='localtime'/>
- <devices>
- <interface type='bridge'>
- <source bridge='xenbr0'/>
- <mac address='00:16:3e:1d:06:15'/>
- <script path='vif-bridge'/>
- </interface>
- <disk type='file' device='disk'>
- <driver name='tap' type='aio'/>
- <source file='/xen/rhel5.img'/>
- <target dev='xvda'/>
- </disk>
- <graphics type='vnc' port='5905'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
deleted file mode 100644
index 7dba66045d..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
deleted file mode 100644
index c416c5202c..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu current='2'>4</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
deleted file mode 100644
index 5d74e9485e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
-(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\
-(vncpasswd '123456')(keymap 'ja'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
deleted file mode 100644
index 0fb6ba067e..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file'/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <graphics type='vnc' port='-1' autoport='yes'
listen="127.0.0.1" passwd="123456" keymap="ja"/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
deleted file mode 100644
index 2ba35da7f2..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
-(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
-(vncpasswd '123456')(keymap 'ja'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
deleted file mode 100644
index f5f15a8b07..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file'/>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <graphics type='vnc' port='5906' listen="127.0.0.1"
passwd="123456" keymap="ja"/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprdata/xml2sexpr-pv.sexpr
b/tests/xml2sexprdata/xml2sexpr-pv.sexpr
deleted file mode 100644
index ea26f8c57f..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(localtime 0)))\
-(localtime 0)(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))\
diff --git a/tests/xml2sexprdata/xml2sexpr-pv.xml b/tests/xml2sexprdata/xml2sexpr-pv.xml
deleted file mode 100644
index 828d450d24..0000000000
--- a/tests/xml2sexprdata/xml2sexpr-pv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type='xen' id='15'>
- <name>pvtest</name>
- <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <memory unit='KiB'>430080</memory>
- <vcpu>2</vcpu>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <source file='/root/some.img'/>
- <target dev='xvda'/>
- </disk>
- <console tty='/dev/pts/4'/>
- </devices>
-</domain>
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
deleted file mode 100644
index 64383876ab..0000000000
--- a/tests/xml2sexprtest.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#include <config.h>
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "internal.h"
-#include "xenconfig/xen_sxpr.h"
-#include "testutils.h"
-#include "testutilsxen.h"
-#include "virstring.h"
-#include "libxl/libxl_conf.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-static virCapsPtr caps;
-static virDomainXMLOptionPtr xmlopt;
-
-static int
-testCompareFiles(const char *xml, const char *sexpr)
-{
- char *gotsexpr = NULL;
- int ret = -1;
- virDomainDefPtr def = NULL;
-
- if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
- VIR_DOMAIN_DEF_PARSE_INACTIVE)))
- goto fail;
-
- if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
- fprintf(stderr, "ABI stability check failed on %s", xml);
- goto fail;
- }
-
- if (!(gotsexpr = xenFormatSxpr(NULL, def)))
- goto fail;
-
- if (virTestCompareToFile(gotsexpr, sexpr) < 0)
- goto fail;
-
- ret = 0;
-
- fail:
- VIR_FREE(gotsexpr);
- virDomainDefFree(def);
-
- return ret;
-}
-
-struct testInfo {
- const char *input;
- const char *output;
- const char *name;
-};
-
-static int
-testCompareHelper(const void *data)
-{
- int result = -1;
- const struct testInfo *info = data;
- char *xml = NULL;
- char *args = NULL;
-
- if (virAsprintf(&xml, "%s/xml2sexprdata/xml2sexpr-%s.xml",
- abs_srcdir, info->input) < 0 ||
- virAsprintf(&args, "%s/xml2sexprdata/xml2sexpr-%s.sexpr",
- abs_srcdir, info->output) < 0) {
- goto cleanup;
- }
-
- result = testCompareFiles(xml, args);
-
- cleanup:
- VIR_FREE(xml);
- VIR_FREE(args);
-
- return result;
-}
-
-static int
-mymain(void)
-{
- int ret = 0;
-
-#define DO_TEST(in, out, name) \
- do { \
- struct testInfo info = { in, out, name }; \
- virResetLastError(); \
- if (virTestRun("Xen XML-2-SEXPR " in " -> " out, \
- testCompareHelper, &info) < 0) \
- ret = -1; \
- } while (0)
-
- if (!(caps = testXLInitCaps()))
- return EXIT_FAILURE;
-
- if (!(xmlopt = libxlCreateXMLConf()))
- return EXIT_FAILURE;
-
- DO_TEST("pv", "pv", "pvtest");
- DO_TEST("fv", "fv", "fvtest");
- DO_TEST("pv", "pv", "pvtest");
- DO_TEST("fv", "fv-v2", "fvtest");
- DO_TEST("fv-vncunused", "fv-vncunused", "fvtest");
- DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest");
- DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto",
"pvtest");
- DO_TEST("pv-bootloader", "pv-bootloader", "pvtest");
- DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline",
"pvtest");
- DO_TEST("pv-vcpus", "pv-vcpus", "pvtest");
-
- DO_TEST("disk-file", "disk-file", "pvtest");
- DO_TEST("disk-block", "disk-block", "pvtest");
- DO_TEST("disk-block-shareable", "disk-block-shareable",
"pvtest");
- DO_TEST("disk-drv-loop", "disk-drv-loop", "pvtest");
- DO_TEST("disk-drv-blkback", "disk-drv-blkback",
"pvtest");
- DO_TEST("disk-drv-blktap", "disk-drv-blktap",
"pvtest");
- DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw",
"pvtest");
- DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow",
"pvtest");
- DO_TEST("disk-drv-blktap2", "disk-drv-blktap2",
"pvtest");
- DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw",
"pvtest");
-
- DO_TEST("curmem", "curmem", "rhel5");
- DO_TEST("net-routed", "net-routed", "pvtest");
- DO_TEST("net-bridged", "net-bridged", "pvtest");
- DO_TEST("net-e1000", "net-e1000", "pvtest");
- DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest");
- DO_TEST("no-source-cdrom", "no-source-cdrom", "test");
- DO_TEST("pv-localtime", "pv-localtime", "pvtest");
- DO_TEST("pci-devs", "pci-devs", "pvtest");
-
- DO_TEST("fv-utc", "fv-utc", "fvtest");
- DO_TEST("fv-localtime", "fv-localtime", "fvtest");
- DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
- DO_TEST("fv-usbmouse", "fv-usbmouse", "fvtest");
- DO_TEST("fv-kernel", "fv-kernel", "fvtest");
- DO_TEST("fv-force-hpet", "fv-force-hpet", "fvtest");
- DO_TEST("fv-force-nohpet", "fv-force-nohpet",
"fvtest");
-
- DO_TEST("fv-serial-null", "fv-serial-null", "fvtest");
- DO_TEST("fv-serial-file", "fv-serial-file", "fvtest");
- DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports",
"fvtest");
- DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port",
"fvtest");
- DO_TEST("fv-serial-stdio", "fv-serial-stdio",
"fvtest");
- DO_TEST("fv-serial-pty", "fv-serial-pty", "fvtest");
- DO_TEST("fv-serial-pipe", "fv-serial-pipe", "fvtest");
- DO_TEST("fv-serial-tcp", "fv-serial-tcp", "fvtest");
- DO_TEST("fv-serial-udp", "fv-serial-udp", "fvtest");
- DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet",
"fvtest");
- DO_TEST("fv-serial-unix", "fv-serial-unix", "fvtest");
- DO_TEST("fv-parallel-tcp", "fv-parallel-tcp",
"fvtest");
-
- DO_TEST("fv-sound", "fv-sound", "fvtest");
-
- DO_TEST("fv-net-many-models", "fv-net-many-models",
"fvtest");
- DO_TEST("fv-net-netfront", "fv-net-netfront",
"fvtest");
- DO_TEST("fv-net-rate", "fv-net-rate", "fvtest");
-
- DO_TEST("boot-grub", "boot-grub", "fvtest");
- DO_TEST("escape", "escape", "fvtest");
-
- virObjectUnref(caps);
- virObjectUnref(xmlopt);
-
- return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
--
2.21.0
6:57 a.m.
New subject: [libvirt] [PATCH 01/14] tests: Remove xml2sexprtest
On Wed, Jul 03, 2019 at 02:37:53PM +0200, Peter Krempa wrote:
The test was the only place calling 'xenFormatSxpr'. Drop it
as there
are no other users of that code since we've dropped xend support.
commit 1dac5fbbbb06a0341e8087dc33af75c8352d77a4
CommitDate: 2018-04-09 11:38:05 -0600
Remove the xend driver
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/Makefile.am | 10 +-
tests/virschematest.c | 2 +-
[...]
tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 -
tests/xml2sexprdata/xml2sexpr-pv.xml | 22 ---
tests/xml2sexprtest.c | 167 ------------------
106 files changed, 3 insertions(+), 2317 deletions(-)
[...]
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 02/14] xenconfig: Drop sxpr formatter
It's no longer used. Remove the dead code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 4 -
src/xenconfig/xen_sxpr.c | 880 -------------------------------------
src/xenconfig/xen_sxpr.h | 12 -
3 files changed, 896 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index b69f2ab493..945f16e382 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -3,11 +3,7 @@
#
# xenconfig/xen_sxpr.h
-xenFormatSxpr;
xenFormatSxprChr;
-xenFormatSxprDisk;
-xenFormatSxprNet;
-xenFormatSxprOnePCI;
xenFormatSxprSound;
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 0bff94ead5..d67a89efee 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -28,7 +28,6 @@
#include "virerror.h"
#include "virconf.h"
#include "viralloc.h"
-#include "verify.h"
#include "viruuid.h"
#include "virlog.h"
#include "count-one-bits.h"
@@ -1493,121 +1492,6 @@ xenParseSxprString(const char *sexpr,
return def;
}
-/************************************************************************
- * *
- * Converter functions to go from the XML tree to an S-Expr for Xen *
- * *
- ************************************************************************/
-
-
-/**
- * xenFormatSxprGraphicsNew:
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- *
- * Convert the graphics part of the domain description into a S-expression
- * in buf. (HVM > 3.0.4 or PV > 3.0.3)
- *
- * Returns 0 in case of success, -1 in case of error
- */
-static int
-xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def,
- virBufferPtr buf)
-{
- virDomainGraphicsListenDefPtr glisten;
-
- if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
- def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected graphics type %d"),
- def->type);
- return -1;
- }
-
- virBufferAddLit(buf, "(device (vkbd))");
- virBufferAddLit(buf, "(device (vfb ");
-
- if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
- virBufferAddLit(buf, "(type sdl)");
- if (def->data.sdl.display)
- virBufferAsprintf(buf, "(display '%s')",
def->data.sdl.display);
- if (def->data.sdl.xauth)
- virBufferAsprintf(buf, "(xauthority '%s')",
def->data.sdl.xauth);
- } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
- virBufferAddLit(buf, "(type vnc)");
- if (def->data.vnc.autoport) {
- virBufferAddLit(buf, "(vncunused 1)");
- } else {
- virBufferAddLit(buf, "(vncunused 0)");
- virBufferAsprintf(buf, "(vncdisplay %d)",
def->data.vnc.port-5900);
- }
-
- if ((glisten = virDomainGraphicsGetListen(def, 0)) &&
- glisten->address)
- virBufferAsprintf(buf, "(vnclisten '%s')",
glisten->address);
- if (def->data.vnc.auth.passwd)
- virBufferAsprintf(buf, "(vncpasswd '%s')",
def->data.vnc.auth.passwd);
- if (def->data.vnc.keymap)
- virBufferAsprintf(buf, "(keymap '%s')",
def->data.vnc.keymap);
- }
-
- virBufferAddLit(buf, "))");
-
- return 0;
-}
-
-
-/**
- * xenFormatSxprGraphicsOld:
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- *
- * Convert the graphics part of the domain description into a S-expression
- * in buf. (HVM <= 3.0.4 or PV <= 3.0.3)
- *
- * Returns 0 in case of success, -1 in case of error
- */
-static int
-xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf)
-{
- virDomainGraphicsListenDefPtr glisten;
-
- if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
- def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected graphics type %d"),
- def->type);
- return -1;
- }
-
- if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
- virBufferAddLit(buf, "(sdl 1)");
- if (def->data.sdl.display)
- virBufferAsprintf(buf, "(display '%s')",
def->data.sdl.display);
- if (def->data.sdl.xauth)
- virBufferAsprintf(buf, "(xauthority '%s')",
def->data.sdl.xauth);
- } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
- virBufferAddLit(buf, "(vnc 1)");
- if (def->data.vnc.autoport) {
- virBufferAddLit(buf, "(vncunused 1)");
- } else {
- virBufferAddLit(buf, "(vncunused 0)");
- virBufferAsprintf(buf, "(vncdisplay %d)",
def->data.vnc.port-5900);
- }
-
- if ((glisten = virDomainGraphicsGetListen(def, 0)) &&
- glisten->address)
- virBufferAsprintf(buf, "(vnclisten '%s')",
glisten->address);
- if (def->data.vnc.auth.passwd)
- virBufferAsprintf(buf, "(vncpasswd '%s')",
def->data.vnc.auth.passwd);
- if (def->data.vnc.keymap)
- virBufferAsprintf(buf, "(keymap '%s')",
def->data.vnc.keymap);
- }
-
- return 0;
-}
-
-
/**
* xenFormatSxprChr:
* @def: the domain config
@@ -1687,382 +1571,6 @@ xenFormatSxprChr(virDomainChrDefPtr def,
}
-/**
- * xenFormatSxprDisk:
- * @node: node containing the disk description
- * @buf: a buffer for the result S-expression
- * @hvm: true or 1 if domain is HVM
- * @isAttach: create expression for device attach (1).
- *
- * Convert the disk device part of the domain config into a S-expression in buf.
- *
- * Returns 0 in case of success, -1 in case of error.
- */
-int
-xenFormatSxprDisk(virDomainDiskDefPtr def,
- virBufferPtr buf,
- int hvm,
- int isAttach)
-{
- const char *src = virDomainDiskGetSource(def);
- const char *driver = virDomainDiskGetDriver(def);
-
- /* Xend (all versions) put the floppy device config
- * under the hvm (image (os)) block
- */
- if (hvm &&
- def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
- if (isAttach) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("Cannot directly attach floppy %s"), src);
- return -1;
- }
- return 0;
- }
-
- if (!isAttach)
- virBufferAddLit(buf, "(device ");
-
- /* Normally disks are in a (device (vbd ...)) block
- * but blktap disks ended up in a differently named
- * (device (tap ....)) block.... */
- if (STREQ_NULLABLE(driver, "tap")) {
- virBufferAddLit(buf, "(tap ");
- } else if (STREQ_NULLABLE(driver, "tap2")) {
- virBufferAddLit(buf, "(tap2 ");
- } else {
- virBufferAddLit(buf, "(vbd ");
- }
-
- if (hvm) {
- virBufferEscapeSexpr(buf, "(dev '%s:", def->dst);
- virBufferAsprintf(buf, "%s')",
- def->device == VIR_DOMAIN_DISK_DEVICE_CDROM ?
- "cdrom" : "disk");
- } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
- virBufferEscapeSexpr(buf, "(dev '%s:cdrom')", def->dst);
- } else {
- virBufferEscapeSexpr(buf, "(dev '%s')", def->dst);
- }
-
- if (src) {
- if (driver) {
- if (STREQ(driver, "tap") ||
- STREQ(driver, "tap2")) {
- const char *type;
- int format = virDomainDiskGetFormat(def);
-
- if (!format || format == VIR_STORAGE_FILE_RAW)
- type = "aio";
- else
- type = virStorageFileFormatTypeToString(format);
- virBufferEscapeSexpr(buf, "(uname '%s:", driver);
- virBufferEscapeSexpr(buf, "%s:", type);
- virBufferEscapeSexpr(buf, "%s')", src);
- } else {
- virBufferEscapeSexpr(buf, "(uname '%s:", driver);
- virBufferEscapeSexpr(buf, "%s')", src);
- }
- } else {
- int type = virDomainDiskGetType(def);
-
- if (type == VIR_STORAGE_TYPE_FILE) {
- virBufferEscapeSexpr(buf, "(uname 'file:%s')", src);
- } else if (type == VIR_STORAGE_TYPE_BLOCK) {
- if (src[0] == '/')
- virBufferEscapeSexpr(buf, "(uname 'phy:%s')",
src);
- else
- virBufferEscapeSexpr(buf, "(uname 'phy:/dev/%s')",
- src);
- } else {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unsupported disk type %s"),
- virStorageTypeToString(type));
- return -1;
- }
- }
- }
-
- if (def->src->readonly)
- virBufferAddLit(buf, "(mode 'r')");
- else if (def->src->shared)
- virBufferAddLit(buf, "(mode 'w!')");
- else
- virBufferAddLit(buf, "(mode 'w')");
- if (def->transient) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("transient disks not supported yet"));
- return -1;
- }
-
- if (!isAttach)
- virBufferAddLit(buf, ")");
-
- virBufferAddLit(buf, ")");
-
- return 0;
-}
-
-/**
- * xenFormatSxprNet:
- * @conn: connection
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- * @hvm: true or 1 if domain is HVM
- * @isAttach: create expression for device attach (1).
- *
- * Convert the interface description of the domain config into a S-expression in buf.
- * This is a temporary interface as the S-Expr interface
- * will be replaced by XML-RPC in the future. However the XML format should
- * stay valid over time.
- *
- * Returns 0 in case of success, -1 in case of error.
- */
-int
-xenFormatSxprNet(virConnectPtr conn,
- virDomainNetDefPtr def,
- virBufferPtr buf,
- int hvm,
- int isAttach)
-{
- const char *script = DEFAULT_VIF_SCRIPT;
- char macaddr[VIR_MAC_STRING_BUFLEN];
-
- if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
- def->type != VIR_DOMAIN_NET_TYPE_NETWORK &&
- def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unsupported network type %d"), def->type);
- return -1;
- }
- if (def->script &&
- def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
- def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("scripts are not supported on interfaces of type
%s"),
- virDomainNetTypeToString(def->type));
- return -1;
- }
-
- if (!isAttach)
- virBufferAddLit(buf, "(device ");
-
- virBufferAddLit(buf, "(vif ");
-
- virBufferAsprintf(buf, "(mac '%s')",
virMacAddrFormat(&def->mac, macaddr));
-
- if (def->bandwidth && def->bandwidth->out &&
def->bandwidth->out->average)
- virBufferAsprintf(buf, "(rate '%lluKB/s')",
def->bandwidth->out->average);
-
- switch (def->type) {
- case VIR_DOMAIN_NET_TYPE_BRIDGE:
- virBufferEscapeSexpr(buf, "(bridge '%s')",
def->data.bridge.brname);
- if (def->script)
- script = def->script;
-
- virBufferEscapeSexpr(buf, "(script '%s')", script);
- if (def->guestIP.nips == 1) {
- char *ipStr = virSocketAddrFormat(&def->guestIP.ips[0]->address);
- virBufferEscapeSexpr(buf, "(ip '%s')", ipStr);
- VIR_FREE(ipStr);
- } else if (def->guestIP.nips > 1) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Driver does not support setting multiple IP
addresses"));
- return -1;
- }
- break;
-
- case VIR_DOMAIN_NET_TYPE_NETWORK:
- {
- virNetworkPtr network =
- virNetworkLookupByName(conn, def->data.network.name);
- char *bridge;
-
- if (!network) {
- virReportError(VIR_ERR_NO_NETWORK, "%s",
- def->data.network.name);
- return -1;
- }
-
- bridge = virNetworkGetBridgeName(network);
- virObjectUnref(network);
- if (!bridge) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("network %s is not active"),
- def->data.network.name);
- return -1;
- }
- virBufferEscapeSexpr(buf, "(bridge '%s')", bridge);
- virBufferEscapeSexpr(buf, "(script '%s')", script);
- VIR_FREE(bridge);
- }
- break;
-
- case VIR_DOMAIN_NET_TYPE_ETHERNET:
- if (def->script)
- virBufferEscapeSexpr(buf, "(script '%s')",
- def->script);
- if (def->guestIP.nips == 1) {
- char *ipStr = virSocketAddrFormat(&def->guestIP.ips[0]->address);
- virBufferEscapeSexpr(buf, "(ip '%s')", ipStr);
- VIR_FREE(ipStr);
- } else if (def->guestIP.nips > 1) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Driver does not support setting multiple IP
addresses"));
- return -1;
- }
- break;
-
- case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
- case VIR_DOMAIN_NET_TYPE_USER:
- case VIR_DOMAIN_NET_TYPE_SERVER:
- case VIR_DOMAIN_NET_TYPE_CLIENT:
- case VIR_DOMAIN_NET_TYPE_MCAST:
- case VIR_DOMAIN_NET_TYPE_UDP:
- case VIR_DOMAIN_NET_TYPE_INTERNAL:
- case VIR_DOMAIN_NET_TYPE_DIRECT:
- case VIR_DOMAIN_NET_TYPE_HOSTDEV:
- case VIR_DOMAIN_NET_TYPE_LAST:
- break;
- }
-
- if (def->ifname != NULL &&
- !STRPREFIX(def->ifname, "vif"))
- virBufferEscapeSexpr(buf, "(vifname '%s')", def->ifname);
-
- if (virDomainNetGetModelString(def)) {
- if (!hvm) {
- virBufferEscapeSexpr(buf, "(model '%s')",
- virDomainNetGetModelString(def));
- } else {
- if (def->model == VIR_DOMAIN_NET_MODEL_NETFRONT)
- virBufferAddLit(buf, "(type netfront)");
- else
- virBufferEscapeSexpr(buf, "(model '%s')",
- virDomainNetGetModelString(def));
- }
- }
-
- if (!isAttach)
- virBufferAddLit(buf, ")");
-
- virBufferAddLit(buf, ")");
-
- return 0;
-}
-
-
-/**
- * xenFormatSxprPCI:
- * @def: the device config
- * @buf: a buffer for the result S-expression
- *
- * Convert a single PCI device part of the domain config into a S-expression in buf.
- *
- * Returns 0 in case of success, -1 in case of error.
- */
-static void
-xenFormatSxprPCI(virDomainHostdevDefPtr def,
- virBufferPtr buf)
-{
- virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func
0x%x))",
- def->source.subsys.u.pci.addr.domain,
- def->source.subsys.u.pci.addr.bus,
- def->source.subsys.u.pci.addr.slot,
- def->source.subsys.u.pci.addr.function);
-}
-
-
-/**
- * xenFormatSxprOnePCI:
- * @def: the device config
- * @buf: a buffer for the result S-expression
- * @detach: create expression for device detach (1).
- *
- * Convert a single PCI device part of the domain config into a S-expression in buf.
- *
- * Returns 0 in case of success, -1 in case of error.
- */
-int
-xenFormatSxprOnePCI(virDomainHostdevDefPtr def,
- virBufferPtr buf,
- int detach)
-{
- if (def->managed) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("managed PCI devices not supported with XenD"));
- return -1;
- }
-
- virBufferAddLit(buf, "(pci ");
- xenFormatSxprPCI(def, buf);
- if (detach)
- virBufferAddLit(buf, "(state 'Closing')");
- else
- virBufferAddLit(buf, "(state 'Initialising')");
- virBufferAddLit(buf, ")");
-
- return 0;
-}
-
-
-/**
- * xenFormatSxprAllPCI:
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- *
- * Convert all PCI device parts of the domain config into a S-expression in buf.
- *
- * Returns 0 in case of success, -1 in case of error.
- */
-static int
-xenFormatSxprAllPCI(virDomainDefPtr def,
- virBufferPtr buf)
-{
- int hasPCI = 0;
- size_t i;
-
- for (i = 0; i < def->nhostdevs; i++)
- if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
- def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
- hasPCI = 1;
-
- if (!hasPCI)
- return 0;
-
- /*
- * With the (domain ...) block we have the following odd setup
- *
- * (device
- * (pci
- * (dev (domain 0x0000) (bus 0x00) (slot 0x1b) (func 0x0))
- * (dev (domain 0x0000) (bus 0x00) (slot 0x13) (func 0x0))
- * )
- * )
- *
- * Normally there is one (device ...) block per device, but in the
- * weird world of Xen PCI, one (device ...) covers multiple devices.
- */
-
- virBufferAddLit(buf, "(device (pci ");
- for (i = 0; i < def->nhostdevs; i++) {
- if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
- def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
- if (def->hostdevs[i]->managed) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("managed PCI devices not supported with
XenD"));
- return -1;
- }
-
- xenFormatSxprPCI(def->hostdevs[i], buf);
- }
- }
- virBufferAddLit(buf, "))");
-
- return 0;
-}
-
-
/**
* xenFormatSxprSound:
* @def: the domain config
@@ -2096,391 +1604,3 @@ xenFormatSxprSound(virDomainDefPtr def,
return 0;
}
-
-
-/**
- * xenFormatSxprInput:
- * @input: the input config
- * @buf: a buffer for the result S-expression
- *
- * Convert all input device parts of the domain config into S-expression in buf.
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenFormatSxprInput(virDomainInputDefPtr input,
- virBufferPtr buf)
-{
- if (input->bus != VIR_DOMAIN_INPUT_BUS_USB)
- return 0;
-
- if (input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
- input->type != VIR_DOMAIN_INPUT_TYPE_TABLET &&
- input->type != VIR_DOMAIN_INPUT_TYPE_KBD) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected input type %d"), input->type);
- return -1;
- }
-
- switch (input->type) {
- case VIR_DOMAIN_INPUT_TYPE_MOUSE:
- virBufferAsprintf(buf, "(usbdevice %s)", "mouse");
- break;
- case VIR_DOMAIN_INPUT_TYPE_TABLET:
- virBufferAsprintf(buf, "(usbdevice %s)", "tablet");
- break;
- case VIR_DOMAIN_INPUT_TYPE_KBD:
- virBufferAsprintf(buf, "(usbdevice %s)", "keyboard");
- break;
- }
-
- 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);
-
-/**
- * xenFormatSxpr:
- * @conn: pointer to the hypervisor connection
- * @def: domain config definition
- *
- * Generate an S-expression representing the domain configuration.
- *
- * Returns the 0 terminated S-Expr string or NULL in case of error.
- * the caller must free() the returned value.
- */
-char *
-xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def)
-{
- virBuffer buf = VIR_BUFFER_INITIALIZER;
- char uuidstr[VIR_UUID_STRING_BUFLEN];
- const char *tmp;
- char *bufout;
- int hvm = 0, vmlocaltime = -1;
- size_t i;
- bool in_image = false;
-
- VIR_DEBUG("Formatting domain sexpr");
-
- virBufferAddLit(&buf, "(vm ");
- virBufferEscapeSexpr(&buf, "(name '%s')", def->name);
- virBufferAsprintf(&buf, "(memory %llu)(maxmem %llu)",
- VIR_DIV_UP(def->mem.cur_balloon, 1024),
- VIR_DIV_UP(virDomainDefGetMemoryTotal(def), 1024));
- virBufferAsprintf(&buf, "(vcpus %u)", virDomainDefGetVcpusMax(def));
- /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
- either 32, or 64 on a platform where long is big enough. */
- if (virDomainDefHasVcpusOffline(def))
- virBufferAsprintf(&buf, "(vcpu_avail %lu)",
- (1UL << virDomainDefGetVcpus(def)) - 1);
-
- if (def->cpumask) {
- char *ranges = virBitmapFormat(def->cpumask);
- if (ranges == NULL)
- goto error;
- virBufferEscapeSexpr(&buf, "(cpus '%s')", ranges);
- VIR_FREE(ranges);
- }
-
- virUUIDFormat(def->uuid, uuidstr);
- virBufferAsprintf(&buf, "(uuid '%s')", uuidstr);
-
- if (def->description)
- virBufferEscapeSexpr(&buf, "(description '%s')",
def->description);
-
- if (def->os.bootloader) {
- if (def->os.bootloader[0])
- virBufferEscapeSexpr(&buf, "(bootloader '%s')",
def->os.bootloader);
- else
- virBufferAddLit(&buf, "(bootloader)");
-
- if (def->os.bootloaderArgs)
- virBufferEscapeSexpr(&buf, "(bootloader_args '%s')",
def->os.bootloaderArgs);
- }
-
- if (!(tmp = virDomainLifecycleActionTypeToString(def->onPoweroff))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected lifecycle value %d"),
def->onPoweroff);
- goto error;
- }
- virBufferAsprintf(&buf, "(on_poweroff '%s')", tmp);
-
- if (!(tmp = virDomainLifecycleActionTypeToString(def->onReboot))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected lifecycle value %d"), def->onReboot);
- goto error;
- }
- virBufferAsprintf(&buf, "(on_reboot '%s')", tmp);
-
- if (!(tmp = virDomainLifecycleActionTypeToString(def->onCrash))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected lifecycle value %d"), def->onCrash);
- goto error;
- }
- virBufferAsprintf(&buf, "(on_crash '%s')", tmp);
-
- if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
- hvm = 1;
-
- if (!def->os.bootloader) {
- if (hvm)
- virBufferAddLit(&buf, "(image (hvm ");
- else
- virBufferAddLit(&buf, "(image (linux ");
- in_image = true;
-
- if (hvm &&
- def->os.loader == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("no HVM domain loader"));
- goto error;
- }
-
- if (def->os.kernel)
- virBufferEscapeSexpr(&buf, "(kernel '%s')",
def->os.kernel);
- if (def->os.initrd)
- virBufferEscapeSexpr(&buf, "(ramdisk '%s')",
def->os.initrd);
- if (def->os.root)
- virBufferEscapeSexpr(&buf, "(root '%s')",
def->os.root);
- if (def->os.cmdline)
- virBufferEscapeSexpr(&buf, "(args '%s')",
def->os.cmdline);
-
- if (hvm) {
- char bootorder[VIR_DOMAIN_BOOT_LAST+1];
- if (def->os.kernel)
- virBufferEscapeSexpr(&buf, "(loader '%s')",
def->os.loader->path);
- else
- virBufferEscapeSexpr(&buf, "(kernel '%s')",
def->os.loader->path);
-
- virBufferAsprintf(&buf, "(vcpus %u)",
virDomainDefGetVcpusMax(def));
- if (virDomainDefHasVcpusOffline(def))
- virBufferAsprintf(&buf, "(vcpu_avail %lu)",
- (1UL << virDomainDefGetVcpus(def)) - 1);
-
- for (i = 0; i < def->os.nBootDevs; i++) {
- switch (def->os.bootDevs[i]) {
- case VIR_DOMAIN_BOOT_FLOPPY:
- bootorder[i] = 'a';
- break;
- default:
- case VIR_DOMAIN_BOOT_DISK:
- bootorder[i] = 'c';
- break;
- case VIR_DOMAIN_BOOT_CDROM:
- bootorder[i] = 'd';
- break;
- case VIR_DOMAIN_BOOT_NET:
- bootorder[i] = 'n';
- break;
- }
- }
- if (def->os.nBootDevs == 0) {
- bootorder[0] = 'c';
- bootorder[1] = '\0';
- } else {
- bootorder[def->os.nBootDevs] = '\0';
- }
- virBufferAsprintf(&buf, "(boot %s)", bootorder);
-
- if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON)
- virBufferAddLit(&buf, "(acpi 1)");
- if (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_TRISTATE_SWITCH_ON)
- virBufferAddLit(&buf, "(apic 1)");
- if (def->features[VIR_DOMAIN_FEATURE_PAE] == VIR_TRISTATE_SWITCH_ON)
- virBufferAddLit(&buf, "(pae 1)");
- if (def->features[VIR_DOMAIN_FEATURE_HAP] == VIR_TRISTATE_SWITCH_ON)
- virBufferAddLit(&buf, "(hap 1)");
- if (def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] == VIR_TRISTATE_SWITCH_ON)
- virBufferAddLit(&buf, "(viridian 1)");
-
- virBufferAddLit(&buf, "(usb 1)");
-
- for (i = 0; i < def->ninputs; i++)
- if (xenFormatSxprInput(def->inputs[i], &buf) < 0)
- goto error;
-
- if (def->parallels) {
- virBufferAddLit(&buf, "(parallel ");
- if (xenFormatSxprChr(def->parallels[0], &buf) < 0)
- goto error;
- virBufferAddLit(&buf, ")");
- } else {
- virBufferAddLit(&buf, "(parallel none)");
- }
- if (def->serials) {
- if ((def->nserials > 1) || (def->serials[0]->target.port !=
0)) {
- int maxport = -1, port;
- size_t j = 0;
-
- virBufferAddLit(&buf, "(serial (");
- for (i = 0; i < def->nserials; i++)
- if (def->serials[i]->target.port > maxport)
- maxport = def->serials[i]->target.port;
-
- for (port = 0; port <= maxport; port++) {
- virDomainChrDefPtr chr = NULL;
-
- if (port)
- virBufferAddLit(&buf, " ");
- for (j = 0; j < def->nserials; j++) {
- if (def->serials[j]->target.port == port) {
- chr = def->serials[j];
- break;
- }
- }
- if (chr) {
- if (xenFormatSxprChr(chr, &buf) < 0)
- goto error;
- } else {
- virBufferAddLit(&buf, "none");
- }
- }
- virBufferAddLit(&buf, "))");
- } else {
- virBufferAddLit(&buf, "(serial ");
- if (xenFormatSxprChr(def->serials[0], &buf) < 0)
- goto error;
- virBufferAddLit(&buf, ")");
- }
- } else {
- virBufferAddLit(&buf, "(serial none)");
- }
-
- if (def->sounds) {
- virBufferAddLit(&buf, "(soundhw '");
- if (xenFormatSxprSound(def, &buf) < 0)
- goto error;
- virBufferAddLit(&buf, "')");
- }
- } /* hvm */
-
- /* get the device emulation model */
- if (def->emulator && hvm)
- virBufferEscapeSexpr(&buf, "(device_model '%s')",
def->emulator);
-
- /* look for HPET in order to override the hypervisor/xend default */
- for (i = 0; i < def->clock.ntimers; i++) {
- if (def->clock.timers[i]->name == VIR_DOMAIN_TIMER_NAME_HPET
&&
- def->clock.timers[i]->present != -1) {
- virBufferAsprintf(&buf, "(hpet %d)",
- def->clock.timers[i]->present);
- break;
- }
- }
-
- /* PV graphics for xen <= 3.0.4, or HVM graphics */
- if (hvm) {
- if ((def->ngraphics == 1) &&
- xenFormatSxprGraphicsOld(def->graphics[0], &buf) < 0)
- goto error;
- }
- } else {
- /* PV domains accept kernel cmdline args */
- if (def->os.cmdline) {
- virBufferEscapeSexpr(&buf, "(image (linux (args '%s')",
def->os.cmdline);
- in_image = true;
- }
- } /* os.bootloader */
-
- if (!in_image) {
- if (hvm)
- virBufferAddLit(&buf, "(image (hvm ");
- else
- virBufferAddLit(&buf, "(image (linux ");
- in_image = true;
- }
- if (hvm) {
- /* >=3.1 HV: VARIABLE */
- int rtc_timeoffset;
- switch (def->clock.offset) {
- case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
- vmlocaltime = (int)def->clock.data.variable.basis;
- rtc_timeoffset = def->clock.data.variable.adjustment;
- break;
- case VIR_DOMAIN_CLOCK_OFFSET_UTC:
- if (def->clock.data.utc_reset) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("unsupported clock
adjustment='reset'"));
- goto error;
- }
- vmlocaltime = 0;
- rtc_timeoffset = 0;
- break;
- case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
- if (def->clock.data.utc_reset) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("unsupported clock
adjustment='reset'"));
- goto error;
- }
- vmlocaltime = 1;
- rtc_timeoffset = 0;
- break;
- default:
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unsupported clock offset='%s'"),
- virDomainClockOffsetTypeToString(def->clock.offset));
- goto error;
- }
- virBufferAsprintf(&buf, "(rtc_timeoffset %d)", rtc_timeoffset);
- } else {
- /* >=3.1 PV: UTC and LOCALTIME */
- switch (def->clock.offset) {
- case VIR_DOMAIN_CLOCK_OFFSET_UTC:
- vmlocaltime = 0;
- break;
- case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
- vmlocaltime = 1;
- break;
- default:
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unsupported clock offset='%s'"),
- virDomainClockOffsetTypeToString(def->clock.offset));
- goto error;
- }
- } /* !hvm */
- /* default post-XenD-3.1 location: */
- virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
-
- if (in_image) {
- /* closes (image(hvm|linux */
- virBufferAddLit(&buf, "))");
- in_image = false;
- }
- /* pre-XenD-3.1 and compatibility location */
- virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
-
-
- for (i = 0; i < def->ndisks; i++)
- if (xenFormatSxprDisk(def->disks[i], &buf, hvm, 0) < 0)
- goto error;
-
- for (i = 0; i < def->nnets; i++)
- if (xenFormatSxprNet(conn, def->nets[i], &buf, hvm, 0) < 0)
- goto error;
-
- if (xenFormatSxprAllPCI(def, &buf) < 0)
- goto error;
-
- /* New style PV graphics config xen >= 3.0.4 */
- if (!hvm) {
- if ((def->ngraphics == 1) &&
- xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0)
- goto error;
- }
-
- virBufferAddLit(&buf, ")"); /* closes (vm */
-
- if (virBufferCheckError(&buf) < 0)
- goto error;
-
- bufout = virBufferContentAndReset(&buf);
- VIR_DEBUG("Formatted sexpr: \n%s", bufout);
- return bufout;
-
- error:
- virBufferFreeAndReset(&buf);
- return NULL;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 019657380c..93af981544 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -50,17 +50,5 @@ virDomainChrDefPtr xenParseSxprChar(const char *value, const char
*tty);
int xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec);
-int xenFormatSxprDisk(virDomainDiskDefPtr def, virBufferPtr buf, int hvm,
- int isAttach);
-
-int xenFormatSxprNet(virConnectPtr conn,
- virDomainNetDefPtr def, virBufferPtr buf, int hvm,
- int isAttach);
-
-int xenFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf,
- int detach);
-
int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf);
int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf);
-
-char * xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def);
--
2.21.0
7:08 a.m.
New subject: [libvirt] [PATCH 02/14] xenconfig: Drop sxpr formatter
On Wed, Jul 03, 2019 at 02:37:54PM +0200, Peter Krempa wrote:
It's no longer used. Remove the dead code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 4 -
src/xenconfig/xen_sxpr.c | 880 -------------------------------------
src/xenconfig/xen_sxpr.h | 12 -
3 files changed, 896 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 03/14] xenconfig: Move guts of xenFormatSxprSound into xenFormatSound
Use new coding style to merge the only use of xenFormatSxprSound into
the caller.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 35 ++++++++++++++++++++++-------------
src/xenconfig/xen_sxpr.c | 35 -----------------------------------
src/xenconfig/xen_sxpr.h | 1 -
4 files changed, 22 insertions(+), 50 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index 945f16e382..e9fab0a8d0 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -4,7 +4,6 @@
# xenconfig/xen_sxpr.h
xenFormatSxprChr;
-xenFormatSxprSound;
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
xenParseSxpr;
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 69a6f53507..059bf785bb 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -2006,25 +2006,34 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
static int
xenFormatSound(virConfPtr conf, virDomainDefPtr def)
{
- if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
- if (def->sounds) {
- virBuffer buf = VIR_BUFFER_INITIALIZER;
- char *str = NULL;
- int ret = xenFormatSxprSound(def, &buf);
+ VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+ const char * model;
+ VIR_AUTOFREE(char *) str = NULL;
+ size_t i;
- str = virBufferContentAndReset(&buf);
- if (ret == 0)
- ret = xenConfigSetString(conf, "soundhw", str);
+ if (def->os.type != VIR_DOMAIN_OSTYPE_HVM ||
+ !def->sounds)
+ return 0;
- VIR_FREE(str);
- if (ret < 0)
- return -1;
+ for (i = 0; i < def->nsounds; i++) {
+ if (!(model = virDomainSoundModelTypeToString(def->sounds[i]->model))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unexpected sound model %d"),
+ def->sounds[i]->model);
+ return -1;
}
+ if (i)
+ virBufferAddChar(&buf, ',');
+ virBufferEscapeSexpr(&buf, "%s", model);
}
- return 0;
-}
+ if (virBufferCheckError(&buf) < 0)
+ return -1;
+ str = virBufferContentAndReset(&buf);
+
+ return xenConfigSetString(conf, "soundhw", str);
+}
static int
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index d67a89efee..3a1c912963 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1569,38 +1569,3 @@ xenFormatSxprChr(virDomainChrDefPtr def,
return 0;
}
-
-
-/**
- * xenFormatSxprSound:
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- *
- * Convert all sound device parts of the domain config into S-expression in buf.
- *
- * Returns 0 if successful or -1 if failed.
- */
-int
-xenFormatSxprSound(virDomainDefPtr def,
- virBufferPtr buf)
-{
- const char *str;
- size_t i;
-
- for (i = 0; i < def->nsounds; i++) {
- if (!(str = virDomainSoundModelTypeToString(def->sounds[i]->model))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unexpected sound model %d"),
- def->sounds[i]->model);
- return -1;
- }
- if (i)
- virBufferAddChar(buf, ',');
- virBufferEscapeSexpr(buf, "%s", str);
- }
-
- if (virBufferCheckError(buf) < 0)
- return -1;
-
- return 0;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 93af981544..7f66af6405 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -51,4 +51,3 @@ virDomainChrDefPtr xenParseSxprChar(const char *value, const char
*tty);
int xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec);
int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf);
-int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf);
--
2.21.0
7:13 a.m.
New subject: [libvirt] [PATCH 03/14] xenconfig: Move guts of xenFormatSxprSound into xenFormatSound
On Wed, Jul 03, 2019 at 02:37:55PM +0200, Peter Krempa wrote:
Use new coding style to merge the only use of xenFormatSxprSound into
the caller.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 35 ++++++++++++++++++++++-------------
src/xenconfig/xen_sxpr.c | 35 -----------------------------------
src/xenconfig/xen_sxpr.h | 1 -
4 files changed, 22 insertions(+), 50 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 04/14] xen: Move xenFormatSxprChr to xen_common
That's the only file using the helper function.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 79 ++++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 78 -------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 79 insertions(+), 81 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index e9fab0a8d0..d5b4115c5a 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -3,7 +3,6 @@
#
# xenconfig/xen_sxpr.h
-xenFormatSxprChr;
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
xenParseSxpr;
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 059bf785bb..41dffd605d 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1260,6 +1260,85 @@ xenParseConfigCommon(virConfPtr conf,
}
+/**
+ * xenFormatSxprChr:
+ * @def: the domain config
+ * @buf: a buffer for the result S-expression
+ *
+ * Convert the character device part of the domain config into a S-expression
+ * in buf.
+ *
+ * Returns 0 in case of success, -1 in case of error
+ */
+static int
+xenFormatSxprChr(virDomainChrDefPtr def,
+ virBufferPtr buf)
+{
+ const char *type = virDomainChrTypeToString(def->source->type);
+
+ if (!type) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("unexpected chr device type"));
+ return -1;
+ }
+
+ switch (def->source->type) {
+ case VIR_DOMAIN_CHR_TYPE_NULL:
+ case VIR_DOMAIN_CHR_TYPE_STDIO:
+ case VIR_DOMAIN_CHR_TYPE_VC:
+ case VIR_DOMAIN_CHR_TYPE_PTY:
+ virBufferAdd(buf, type, -1);
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_FILE:
+ case VIR_DOMAIN_CHR_TYPE_PIPE:
+ virBufferAsprintf(buf, "%s:", type);
+ virBufferEscapeSexpr(buf, "%s", def->source->data.file.path);
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_DEV:
+ virBufferEscapeSexpr(buf, "%s", def->source->data.file.path);
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_TCP:
+ virBufferAsprintf(buf, "%s:%s:%s%s",
+ (def->source->data.tcp.protocol
+ == VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW ?
+ "tcp" : "telnet"),
+ NULLSTR_EMPTY(def->source->data.tcp.host),
+ NULLSTR_EMPTY(def->source->data.tcp.service),
+ (def->source->data.tcp.listen ?
+ ",server,nowait" : ""));
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_UDP:
+ virBufferAsprintf(buf, "%s:%s:%s@%s:%s", type,
+ NULLSTR_EMPTY(def->source->data.udp.connectHost),
+ NULLSTR_EMPTY(def->source->data.udp.connectService),
+ NULLSTR_EMPTY(def->source->data.udp.bindHost),
+ NULLSTR_EMPTY(def->source->data.udp.bindService));
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_UNIX:
+ virBufferAsprintf(buf, "%s:", type);
+ virBufferEscapeSexpr(buf, "%s", def->source->data.nix.path);
+ if (def->source->data.nix.listen)
+ virBufferAddLit(buf, ",server,nowait");
+ break;
+
+ default:
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("unsupported chr device type '%s'"), type);
+ return -1;
+ }
+
+ if (virBufferCheckError(buf) < 0)
+ return -1;
+
+ return 0;
+}
+
+
static int
xenFormatSerial(virConfValuePtr list, virDomainChrDefPtr serial)
{
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 3a1c912963..a9a420ac3a 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1491,81 +1491,3 @@ xenParseSxprString(const char *sexpr,
return def;
}
-
-/**
- * xenFormatSxprChr:
- * @def: the domain config
- * @buf: a buffer for the result S-expression
- *
- * Convert the character device part of the domain config into a S-expression
- * in buf.
- *
- * Returns 0 in case of success, -1 in case of error
- */
-int
-xenFormatSxprChr(virDomainChrDefPtr def,
- virBufferPtr buf)
-{
- const char *type = virDomainChrTypeToString(def->source->type);
-
- if (!type) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("unexpected chr device type"));
- return -1;
- }
-
- switch (def->source->type) {
- case VIR_DOMAIN_CHR_TYPE_NULL:
- case VIR_DOMAIN_CHR_TYPE_STDIO:
- case VIR_DOMAIN_CHR_TYPE_VC:
- case VIR_DOMAIN_CHR_TYPE_PTY:
- virBufferAdd(buf, type, -1);
- break;
-
- case VIR_DOMAIN_CHR_TYPE_FILE:
- case VIR_DOMAIN_CHR_TYPE_PIPE:
- virBufferAsprintf(buf, "%s:", type);
- virBufferEscapeSexpr(buf, "%s", def->source->data.file.path);
- break;
-
- case VIR_DOMAIN_CHR_TYPE_DEV:
- virBufferEscapeSexpr(buf, "%s", def->source->data.file.path);
- break;
-
- case VIR_DOMAIN_CHR_TYPE_TCP:
- virBufferAsprintf(buf, "%s:%s:%s%s",
- (def->source->data.tcp.protocol
- == VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW ?
- "tcp" : "telnet"),
- NULLSTR_EMPTY(def->source->data.tcp.host),
- NULLSTR_EMPTY(def->source->data.tcp.service),
- (def->source->data.tcp.listen ?
- ",server,nowait" : ""));
- break;
-
- case VIR_DOMAIN_CHR_TYPE_UDP:
- virBufferAsprintf(buf, "%s:%s:%s@%s:%s", type,
- NULLSTR_EMPTY(def->source->data.udp.connectHost),
- NULLSTR_EMPTY(def->source->data.udp.connectService),
- NULLSTR_EMPTY(def->source->data.udp.bindHost),
- NULLSTR_EMPTY(def->source->data.udp.bindService));
- break;
-
- case VIR_DOMAIN_CHR_TYPE_UNIX:
- virBufferAsprintf(buf, "%s:", type);
- virBufferEscapeSexpr(buf, "%s", def->source->data.nix.path);
- if (def->source->data.nix.listen)
- virBufferAddLit(buf, ",server,nowait");
- break;
-
- default:
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unsupported chr device type '%s'"), type);
- return -1;
- }
-
- if (virBufferCheckError(buf) < 0)
- return -1;
-
- return 0;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 7f66af6405..c888d06950 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -49,5 +49,3 @@ int xenParseSxprSound(virDomainDefPtr def, const char *str);
virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);
int xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec);
-
-int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf);
--
2.21.0
7:14 a.m.
New subject: [libvirt] [PATCH 04/14] xen: Move xenFormatSxprChr to xen_common
On Wed, Jul 03, 2019 at 02:37:56PM +0200, Peter Krempa wrote:
That's the only file using the helper function.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 79 ++++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 78 -------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 79 insertions(+), 81 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 05/14] libxl: Drop support for parsing sxpr format in libxlConnectDomainXMLFromNative
We've dropped old xend support over a year ago. At this point we can
also drop support for parsing very old configs.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/drvxen.html.in | 3 +--
src/libxl/libxl_driver.c | 14 +++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index ff67291ec6..b2f41c1763 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -58,8 +58,7 @@ xen+ssh://root@example.com/system (remote access, SSH tunnelled)
original Xen virtual machine config format used by the legacy
xm/xend toolstack. The second, known as <code>xen-sxpr</code>,
is also one of the original formats that was used by xend's
- legacy HTTP RPC service. For compatibility, import and export
- of these legacy formats is supported by the libxl driver.
+ legacy HTTP RPC service (<span class='removed'>removed in
5.6.0</span>)
</p>
<p>
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 2adb604f0f..7c236383e4 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -45,7 +45,6 @@
#include "libxl_capabilities.h"
#include "libxl_migration.h"
#include "xen_xm.h"
-#include "xen_sxpr.h"
#include "xen_xl.h"
#include "virtypedparam.h"
#include "viruri.h"
@@ -2702,16 +2701,9 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
driver->xmlopt)))
goto cleanup;
} else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_SEXPR)) {
- /* only support latest xend config format */
- if (!(def = xenParseSxprString(nativeConfig,
- NULL,
- -1,
- cfg->caps,
- driver->xmlopt))) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("parsing sxpr config failed"));
- goto cleanup;
- }
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("conversion from 'xen-sxpr' format is no longer
supported"));
+ goto cleanup;
} else {
virReportError(VIR_ERR_INVALID_ARG,
_("unsupported config type %s"), nativeFormat);
--
2.21.0
7:20 a.m.
New subject: [libvirt] [PATCH 05/14] libxl: Drop support for parsing sxpr format in libxlConnectDomainXMLFromNative
On Wed, Jul 03, 2019 at 02:37:57PM +0200, Peter Krempa wrote:
We've dropped old xend support over a year ago. At this point we
can
also drop support for parsing very old configs.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/drvxen.html.in | 3 +--
src/libxl/libxl_driver.c | 14 +++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
@@ -2702,16 +2701,9 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
driver->xmlopt)))
goto cleanup;
} else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_SEXPR)) {
- /* only support latest xend config format */
- if (!(def = xenParseSxprString(nativeConfig,
- NULL,
- -1,
- cfg->caps,
- driver->xmlopt))) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("parsing sxpr config failed"));
- goto cleanup;
- }
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("conversion from 'xen-sxpr' format is no longer
supported"));
Maybe use XEN_CONFIG_FORMAT_SEXPR here too?
+ goto cleanup;
} else {
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 06/14] tests: Drop sexpr2xmltest
Now that we no longer support sexpr conversion to the internal config we
can drop the test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/Makefile.am | 10 +-
tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 6 -
tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 30 ----
.../sexpr2xml-bridge-ipaddr.sexpr | 10 --
.../sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 38 ----
tests/sexpr2xmldata/sexpr2xml-curmem.sexpr | 50 ------
tests/sexpr2xmldata/sexpr2xml-curmem.xml | 44 -----
.../sexpr2xml-disk-block-shareable.sexpr | 6 -
.../sexpr2xml-disk-block-shareable.xml | 36 ----
.../sexpr2xmldata/sexpr2xml-disk-block.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 31 ----
.../sexpr2xml-disk-drv-blktap-qcow.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap-qcow.xml | 31 ----
.../sexpr2xml-disk-drv-blktap-raw.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap-raw.xml | 31 ----
.../sexpr2xml-disk-drv-blktap2-raw.sexpr | 8 -
.../sexpr2xml-disk-drv-blktap2-raw.xml | 31 ----
tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 31 ----
.../sexpr2xmldata/sexpr2xml-fv-autoport.sexpr | 86 ---------
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 59 ------
.../sexpr2xml-fv-empty-kernel.sexpr | 11 --
.../sexpr2xml-fv-empty-kernel.xml | 52 ------
.../sexpr2xml-fv-force-hpet.sexpr | 11 --
.../sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 55 ------
.../sexpr2xml-fv-force-nohpet.sexpr | 11 --
.../sexpr2xml-fv-force-nohpet.xml | 55 ------
tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 36 ----
.../sexpr2xml-fv-legacy-vfb.sexpr | 70 --------
.../sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 37 ----
.../sexpr2xml-fv-localtime.sexpr | 10 --
.../sexpr2xmldata/sexpr2xml-fv-localtime.xml | 52 ------
.../sexpr2xml-fv-net-netfront.sexpr | 11 --
.../sexpr2xml-fv-net-netfront.xml | 53 ------
.../sexpr2xml-fv-parallel-tcp.sexpr | 10 --
.../sexpr2xml-fv-parallel-tcp.xml | 57 ------
.../sexpr2xml-fv-serial-dev-2-ports.sexpr | 12 --
.../sexpr2xml-fv-serial-dev-2-ports.xml | 64 -------
.../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 11 --
.../sexpr2xml-fv-serial-dev-2nd-port.xml | 60 -------
.../sexpr2xml-fv-serial-file.sexpr | 12 --
.../sexpr2xml-fv-serial-file.xml | 60 -------
.../sexpr2xml-fv-serial-null.sexpr | 10 --
.../sexpr2xml-fv-serial-null.xml | 58 ------
.../sexpr2xml-fv-serial-pipe.sexpr | 12 --
.../sexpr2xml-fv-serial-pipe.xml | 60 -------
.../sexpr2xml-fv-serial-pty.sexpr | 11 --
.../sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 58 ------
.../sexpr2xml-fv-serial-stdio.sexpr | 10 --
.../sexpr2xml-fv-serial-stdio.xml | 58 ------
.../sexpr2xml-fv-serial-tcp-telnet.sexpr | 11 --
.../sexpr2xml-fv-serial-tcp-telnet.xml | 62 -------
.../sexpr2xml-fv-serial-tcp.sexpr | 11 --
.../sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 62 -------
.../sexpr2xml-fv-serial-udp.sexpr | 11 --
.../sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 62 -------
.../sexpr2xml-fv-serial-unix.sexpr | 11 --
.../sexpr2xml-fv-serial-unix.xml | 60 -------
.../sexpr2xml-fv-sound-all.sexpr | 11 --
.../sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 54 ------
tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 10 --
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 54 ------
.../sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 10 --
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 53 ------
.../sexpr2xml-fv-usbtablet.sexpr | 10 --
.../sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 53 ------
tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 11 --
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 52 ------
tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 52 ------
tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 11 --
tests/sexpr2xmldata/sexpr2xml-fv.xml | 52 ------
.../sexpr2xmldata/sexpr2xml-net-bridged.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 37 ----
tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr | 10 --
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 38 ----
.../sexpr2xmldata/sexpr2xml-net-routed.sexpr | 10 --
tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 37 ----
.../sexpr2xml-no-source-cdrom.sexpr | 66 -------
.../sexpr2xml-no-source-cdrom.xml | 58 ------
tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 10 --
tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 43 -----
.../sexpr2xml-pv-bootloader-cmdline.sexpr | 5 -
.../sexpr2xml-pv-bootloader-cmdline.xml | 31 ----
.../sexpr2xml-pv-bootloader.sexpr | 5 -
.../sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 30 ----
.../sexpr2xml-pv-localtime.sexpr | 8 -
.../sexpr2xmldata/sexpr2xml-pv-localtime.xml | 31 ----
tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 31 ----
.../sexpr2xml-pv-vfb-new-vncdisplay.sexpr | 10 --
.../sexpr2xml-pv-vfb-new-vncdisplay.xml | 37 ----
.../sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr | 9 -
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 37 ----
.../sexpr2xml-pv-vfb-type-crash.sexpr | 83 ---------
.../sexpr2xml-pv-vfb-type-crash.xml | 42 -----
tests/sexpr2xmldata/sexpr2xml-pv.sexpr | 8 -
tests/sexpr2xmldata/sexpr2xml-pv.xml | 31 ----
tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 11 --
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 56 ------
tests/sexpr2xmltest.c | 170 ------------------
tests/virschematest.c | 2 +-
103 files changed, 3 insertions(+), 3298 deletions(-)
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.xml
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
delete mode 100644 tests/sexpr2xmltest.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c591a39631..4dbdd4f47c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,7 +125,6 @@ EXTRA_DIST = \
secretxml2xmlin \
securityselinuxhelperdata \
securityselinuxlabeldata \
- sexpr2xmldata \
storagepoolcapsschemadata \
storagepoolschemadata \
storagepoolxml2xmlin \
@@ -267,7 +266,7 @@ endif WITH_SECDRIVER_SELINUX
ssh_SOURCES = ssh.c
if WITH_LIBXL
-test_programs += xlconfigtest sexpr2xmltest \
+test_programs += xlconfigtest \
xmconfigtest libxlxml2domconfigtest
test_libraries += libxltestdriver.la libxlmock.la
endif WITH_LIBXL
@@ -503,11 +502,6 @@ xlconfigtest_SOURCES = \
testutils.c testutils.h
xlconfigtest_LDADD =$(libxl_LDADDS)
-sexpr2xmltest_SOURCES = \
- sexpr2xmltest.c testutilsxen.c testutilsxen.h \
- testutils.c testutils.h
-sexpr2xmltest_LDADD = $(libxl_LDADDS)
-
xmconfigtest_SOURCES = \
xmconfigtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@@ -525,7 +519,7 @@ libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
libxlmock_la_LIBADD = $(MOCKLIBS_LIBS)
else ! WITH_LIBXL
-EXTRA_DIST += xlconfigtest.c sexpr2xmltest.c \
+EXTRA_DIST += xlconfigtest.c \
xmconfigtest.c libxlxml2domconfigtest.c
endif ! WITH_LIBXL
diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
b/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
deleted file mode 100644
index c8c0cb1ef3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')\
-(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
deleted file mode 100644
index 0889c68ed0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
- <cmdline>(hd0,0)/grub/menu.lst</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/dev/MainVG/GuestVG'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
deleted file mode 100644
index cb9e3f8bf9..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(ip '192.0.2.1')))
diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
deleted file mode 100644
index 9c83847afe..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:11:22:33:44:55'/>
- <source bridge='xenbr2'/>
- <ip address='192.0.2.1' family='ipv4'/>
- <script path='vif-bridge'/>
- <target dev='vif6.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
b/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
deleted file mode 100644
index 486ebf3295..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.sexpr
+++ /dev/null
@@ -1,50 +0,0 @@
-(domain
- (domid 5)
- (uuid 4f77abd2-3019-58e8-3bab-6fbf2118f880)
- (vcpus 1)
- (cpu_weight 1.0)
- (memory 175)
- (shadow_memory 0)
- (maxmem 385)
- (bootloader /usr/bin/pygrub)
- (features )
- (name rhel5)
- (on_poweroff destroy)
- (on_reboot restart)
- (on_crash restart)
- (image
- (linux
- (ramdisk /var/lib/xen/initrd.gULTf1)
- (kernel /var/lib/xen/vmlinuz.blj7cs)
- (args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet')
- (vncunused 1)
- (vnc 1)
- (display localhost:10.0)
- (xauthority /root/.Xauthority)
- )
- )
- (device
- (vif
- (backend 0)
- (script vif-bridge)
- (bridge xenbr0)
- (mac 00:16:3e:1d:06:15)
- )
- )
- (device
- (tap
- (backend 0)
- (dev xvda:disk)
- (uname tap:aio:/xen/rhel5.img)
- (mode w)
- )
- )
- (state -b----)
- (shutdown_reason poweroff)
- (cpu_time 137.189121425)
- (online_vcpus 1)
- (up_time 66492.0194759)
- (start_time 1163083021.65)
- (store_mfn 74407)
- (console_mfn 198038)
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
deleted file mode 100644
index e091829444..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<domain type='xen' id='5'>
- <name>rhel5</name>
- <uuid>4f77abd2-3019-58e8-3bab-6fbf2118f880</uuid>
- <memory unit='KiB'>394240</memory>
- <currentMemory unit='KiB'>179200</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.blj7cs</kernel>
- <initrd>/var/lib/xen/initrd.gULTf1</initrd>
- <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap' type='raw'/>
- <source file='/xen/rhel5.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1d:06:15'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif5.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='xen' vram='4096' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
deleted file mode 100644
index 80d41672bf..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr
+++ /dev/null
@@ -1,6 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\
-(uuid '49a0c6ffc066539264983632d093c2e7')(bootloader '/usr/bin/pygrub')\
-(on_poweroff 'destroy')(on_reboot 'restart')(on_crash
'restart')\
-(device (tap (dev 'xvda')(uname
'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge
'xenbr0')\
-(script 'vif-bridge'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
deleted file mode 100644
index 800b583192..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>49a0c6ff-c066-5392-6498-3632d093c2e7</uuid>
- <memory unit='KiB'>524288</memory>
- <currentMemory unit='KiB'>393216</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
- <os>
- <type>linux</type>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap' type='raw'/>
- <source file='/var/lib/xen/images/rhel5pv.img'/>
- <target dev='xvda' bus='xen'/>
- <shareable/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:23:9e:eb'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif6.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
deleted file mode 100644
index 3f64ba6fdd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
deleted file mode 100644
index e8a236e3d1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/dev/MainVG/GuestVG'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
deleted file mode 100644
index b96fa61cf2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\
-(uname 'tap:qcow:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
deleted file mode 100644
index 57bb88cd2b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap' type='qcow'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
deleted file mode 100644
index ef7cb4b685..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\
-(uname 'tap:aio:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
deleted file mode 100644
index c390053e82..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
deleted file mode 100644
index a72a73334c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\
-(uname 'tap2:aio:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
deleted file mode 100644
index 3a44af0760..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='tap2' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
b/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
deleted file mode 100644
index d582ea0cb5..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
deleted file mode 100644
index 9aae240832..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
deleted file mode 100644
index cdbbaedeef..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr
+++ /dev/null
@@ -1,86 +0,0 @@
-(domain
- (domid 21)
- (on_crash destroy)
- (uuid e0c172e6-4ad8-7353-0ece-515d2f181365)
- (bootloader_args )
- (vcpus 1)
- (name domu-224)
- (on_poweroff destroy)
- (on_reboot destroy)
- (bootloader )
- (maxmem 512)
- (memory 512)
- (shadow_memory 5)
- (cpu_weight 256)
- (cpu_cap 0)
- (features )
- (on_xend_start ignore)
- (on_xend_stop shutdown)
- (start_time 1233108538.42)
- (cpu_time 907.159661051)
- (online_vcpus 1)
- (image
- (hvm
- (kernel /usr/lib/xen/boot/hvmloader)
- (boot d)
- (device_model /usr/lib/xen/bin/qemu-system-i386)
- (keymap en-us)
- (localtime 1)
- (pae 1)
- (serial pty)
- (usb 1)
- (usbdevice tablet)
- (notes (SUSPEND_CANCEL 1))
- )
- )
- (status 2)
- (state r-----)
- (store_mfn 131070)
- (device
- (vif
- (bridge e1000g0)
- (mac 00:16:3e:1b:e8:18)
- (script vif-vnic)
- (uuid 7da8c614-018b-dc87-6bfc-a296a95bca4f)
- (backend 0)
- )
- )
- (device
- (vbd
- (uname phy:/iscsi/winxp)
- (uuid 65e19258-f4a2-a9ff-3b31-469ceaf4ec8d)
- (mode w)
- (dev hda:disk)
- (backend 0)
- (bootable 1)
- )
- )
- (device
- (vbd
- (uname file:/net/heaped/export/netimage/windows/xp-sp2-vol.iso)
- (uuid 87d9383b-f0ad-11a4-d668-b965f55edc3f)
- (mode r)
- (dev hdc:cdrom)
- (backend 0)
- (bootable 0)
- )
- )
- (device (vkbd (backend 0)))
- (device
- (vfb
- (vncdisplay 25)
- (vncunused 1)
- (keymap en-us)
- (type vnc)
- (uuid 09666ad1-0c94-d79c-1439-99e05394ee51)
- (location localhost:5925)
- )
- )
- (device
- (console
- (protocol vt100)
- (location 3)
- (uuid cabfc0f5-1c9c-0e6f-aaa8-9974262aff66)
- )
- )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
deleted file mode 100644
index 20d60602d3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<domain type='xen' id='21'>
- <name>domu-224</name>
- <uuid>e0c172e6-4ad8-7353-0ece-515d2f181365</uuid>
- <memory unit='KiB'>524288</memory>
- <currentMemory unit='KiB'>524288</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
- <features>
- <pae/>
- </features>
- <clock offset='variable' adjustment='0'
basis='localtime'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/iscsi/winxp'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/net/heaped/export/netimage/windows/xp-sp2-vol.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:e8:18'/>
- <source bridge='e1000g0'/>
- <script path='vif-vnic'/>
- <target dev='vif21.0'/>
- </interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <input type='tablet' bus='usb'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='5925' autoport='yes'
keymap='en-us'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
deleted file mode 100644
index 1372025df3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot d)(cdrom
'/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
deleted file mode 100644
index 7cc4381885..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
deleted file mode 100644
index 8f31abf187..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 1)(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000')(type ioemu))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
deleted file mode 100644
index 831417107d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'>
- <timer name='hpet' present='yes'/>
- </clock>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- <model type='e1000'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
deleted file mode 100644
index 7fee66693e..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 0)(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(model 'e1000')(type ioemu))))\
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
deleted file mode 100644
index f1af499d07..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'>
- <timer name='hpet' present='no'/>
- </clock>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- <model type='e1000'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
deleted file mode 100644
index 25231adb6a..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
-(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
deleted file mode 100644
index 95fab2f9c1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<domain type='xen' id='15'>
- <name>fvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- <boot dev='hd'/>
- </os>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
deleted file mode 100644
index 8bc6cfacfe..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr
+++ /dev/null
@@ -1,70 +0,0 @@
-(domain
- (domid 1)
- (on_crash restart)
- (uuid fde0533d-d043-88c6-dfba-4822fa32f309)
- (bootloader_args )
- (vcpus 1)
- (name s10u4)
- (on_poweroff destroy)
- (on_reboot restart)
- (bootloader )
- (maxmem 1024)
- (memory 1024)
- (shadow_memory 9)
- (cpu_weight 256)
- (cpu_cap 0)
- (features )
- (on_xend_start ignore)
- (on_xend_stop shutdown)
- (start_time 1201894394.0)
- (cpu_time 17.253230349)
- (online_vcpus 1)
- (image
- (hvm
- (kernel /usr/lib/xen/boot/hvmloader)
- (boot c)
- (device_model /usr/lib/xen/bin/qemu-system-i386)
- (keymap en-us)
- (localtime 0)
- (pae 1)
- (vnc 1)
- (vncunused 1)
- (notes (SUSPEND_CANCEL 1))
- )
- )
- (status 2)
- (state -b----)
- (store_mfn 262142)
- (device
- (vif
- (mac 00:16:3e:3b:b9:d7)
- (script vif-vnic)
- (uuid 33b87cce-c187-4bdd-8301-6411a48be129)
- (backend 0)
- )
- )
- (device
- (vbd
- (uname phy:/dev/zvol/dsk/export/s10u4-root)
- (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd)
- (mode w)
- (dev hda:disk)
- (backend 0)
- (bootable 1)
- )
- )
- (device
- (vfb
- (vncunused 1)
- (uuid d45dfd90-c0e0-8851-8f14-f16ba9512d2d)
- (location localhost:5900)
- )
- )
- (device
- (console
- (protocol vt100)
- (location 3)
- (uuid 0248d3f7-f3ae-78e8-4829-ad51a6f94efd)
- )
- )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
deleted file mode 100644
index 659dcfd8a7..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='1'>
- <name>s10u4</name>
- <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <pae/>
- </features>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <interface type='ethernet'>
- <target dev='vif1.0'/>
- <mac address='00:16:3e:3b:b9:d7'/>
- <script path='vif-vnic'/>
- </interface>
- <disk type='block' device='disk'>
- <driver name='phy'/>
- <source dev='/dev/zvol/dsk/export/s10u4-root'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <input type='mouse' bus='ps2'/>
- <graphics type='vnc' port='-1' keymap='en-us'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
deleted file mode 100644
index 6673aef55d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(localtime 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
deleted file mode 100644
index d4bc171aed..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0'
basis='localtime'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
deleted file mode 100644
index 3516e72a04..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type 'netfront'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
deleted file mode 100644
index 058299af7c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- <model type='netfront'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
deleted file mode 100644
index 6628452915..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
-(serial none)(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
deleted file mode 100644
index 9af01d072c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <parallel type='tcp'>
- <source mode='connect' host='localhost'
service='9999'/>
- <protocol type='raw'/>
- <target port='0'/>
- </parallel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
deleted file mode 100644
index a8d08340ac..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
-(serial (/dev/ttyS0 /dev/ttyS1))(device_model
'/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
deleted file mode 100644
index e352250696..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='dev'>
- <source path='/dev/ttyS0'/>
- <target port='0'/>
- </serial>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <console type='dev'>
- <source path='/dev/ttyS0'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
deleted file mode 100644
index d9e7336aed..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial (none /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc
1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
deleted file mode 100644
index 51d2a7c2d7..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <console type='dev'>
- <source path='/dev/ttyS1'/>
- <target type='serial' port='1'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
deleted file mode 100644
index b52a5e4553..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial file:/tmp/serial.log)(device_model '/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
deleted file mode 100644
index cce3a9e0b4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='file'>
- <source path='/tmp/serial.log'/>
- <target port='0'/>
- </serial>
- <console type='file'>
- <source path='/tmp/serial.log'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
deleted file mode 100644
index caf8b4a87c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial null)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
deleted file mode 100644
index d68bfa89ae..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='null'>
- <target port='0'/>
- </serial>
- <console type='null'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
deleted file mode 100644
index be3e13cd76..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr
+++ /dev/null
@@ -1,12 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial pipe:/tmp/serial.pipe)(device_model
'/usr/lib/xen/bin/qemu-system-i386')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
-(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
deleted file mode 100644
index 5ab4048d29..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='pipe'>
- <source path='/tmp/serial.pipe'/>
- <target port='0'/>
- </serial>
- <console type='pipe'>
- <source path='/tmp/serial.pipe'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
deleted file mode 100644
index 3ac68630c4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial pty)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
deleted file mode 100644
index 89d371dc36..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
deleted file mode 100644
index e3eb554eaf..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial stdio)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script
'vif-bridge')\
-(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
deleted file mode 100644
index 9482ceccb2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='stdio'>
- <target port='0'/>
- </serial>
- <console type='stdio'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
deleted file mode 100644
index 8107efebbd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial telnet:localhost:9999,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
deleted file mode 100644
index ae7a4c54e0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <protocol type='telnet'/>
- <target port='0'/>
- </serial>
- <console type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <protocol type='telnet'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
deleted file mode 100644
index 32cb2ba071..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial tcp:localhost:9999,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
deleted file mode 100644
index 20cbdb6815..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <protocol type='raw'/>
- <target port='0'/>
- </serial>
- <console type='tcp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <protocol type='raw'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
deleted file mode 100644
index 3eea329959..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial udp:localhost:9998@localhost:9999)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
deleted file mode 100644
index ece6a2684e..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='udp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <source mode='connect' host='localhost'
service='9998'/>
- <target port='0'/>
- </serial>
- <console type='udp'>
- <source mode='bind' host='localhost'
service='9999'/>
- <source mode='connect' host='localhost'
service='9998'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
deleted file mode 100644
index aff06a67fc..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
-(serial unix:/tmp/serial.sock,server,nowait)\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
deleted file mode 100644
index 2740e99d70..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type='xen' id='1'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <serial type='unix'>
- <source mode='bind' path='/tmp/serial.sock'/>
- <target port='0'/>
- </serial>
- <console type='unix'>
- <source mode='bind' path='/tmp/serial.sock'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
deleted file mode 100644
index 6b0e822366..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev
'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
deleted file mode 100644
index d6f0bf0e67..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <sound model='sb16'/>
- <sound model='es1370'/>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
deleted file mode 100644
index 9552b9b727..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
deleted file mode 100644
index d6f0bf0e67..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <sound model='sb16'/>
- <sound model='es1370'/>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
deleted file mode 100644
index 7a10c496b3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
deleted file mode 100644
index f32754b88c..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='usb'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
deleted file mode 100644
index 3a2eec794a..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\
-(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode
'w')))\
-(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode
'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
deleted file mode 100644
index f16804d9ba..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='tablet' bus='usb'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
deleted file mode 100644
index 09b7ecd8f6..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(cdrom
'/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
deleted file mode 100644
index 135b374c28..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(acpi 1)(vnc 1)\
-(keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\
-(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname
'file:/root/boot.iso')\
-(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge
'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
deleted file mode 100644
index 46794a5a13..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type ioemu))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
deleted file mode 100644
index 0ef29a6f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
b/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
deleted file mode 100644
index 70a57c42d2..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script
'vif-bridge'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
deleted file mode 100644
index 2c07e15859..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:11:22:33:44:55'/>
- <source bridge='xenbr2'/>
- <script path='vif-bridge'/>
- <target dev='vif6.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
b/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
deleted file mode 100644
index a5603801a0..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
-(script 'vif-bridge')(model 'e1000'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
deleted file mode 100644
index 3f79e86444..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:11:22:33:44:55'/>
- <source bridge='xenbr2'/>
- <script path='vif-bridge'/>
- <target dev='vif6.0'/>
- <model type='e1000'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
b/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
deleted file mode 100644
index d0e4cd5f5d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))\
-(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script
'vif-routed')\
-(ip '172.14.5.6')))
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
deleted file mode 100644
index a2975fb31d..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='ethernet'>
- <mac address='00:11:22:33:44:55'/>
- <ip address='172.14.5.6' family='ipv4'/>
- <script path='vif-routed'/>
- <target dev='vif6.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
deleted file mode 100644
index bd75f61900..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
+++ /dev/null
@@ -1,66 +0,0 @@
-(domain
- (domid 6)
- (on_crash destroy)
- (memory 350)
- (uuid cc2315e7-d26a-307a-438c-6d188ec4c09c)
- (bootloader_args )
- (name test)
- (maxmem 382)
- (on_reboot destroy)
- (on_poweroff destroy)
- (localtime 0)
- (vcpus 1)
- (bootloader )
- (shadow_memory 4)
- (cpu_weight 256)
- (cpu_cap 0)
- (features )
- (on_xend_start ignore)
- (on_xend_stop ignore)
- (start_time 1175165307.38)
- (cpu_time 0.956663338)
- (online_vcpus 1)
- (image
- (hvm
- (kernel /usr/lib/xen/boot/hvmloader)
- (vnc 1)
- (vncunused 1)
- (device_model /usr/lib/xen/bin/qemu-system-i386)
- (pae 1)
- (apic 1)
- (acpi 1)
- (boot c)
- (serial pty)
- (vcpus 1)
- )
- )
- (status 0)
- (memory_dynamic_min 358)
- (memory_dynamic_max 382)
- (store_mfn 89598)
- (device
- (vif
- (bridge xenbr0)
- (mac 00:16:3e:0a:7b:39)
- (type ioemu)
- (uuid 127fee09-a0c8-c79b-4ee5-6c194efff73a)
- )
- )
- (device
- (vbd
- (uname phy:/dev/sda8)
- (driver paravirtualised)
- (mode w)
- (dev hda:disk)
- (uuid df6969ad-d312-deb1-8d36-223d71e4ce95)
- )
- )
- (device
- (vbd
- (driver paravirtualised)
- (mode r)
- (dev hdc:cdrom)
- (uuid fca3aa85-1d1f-2c31-2f0b-f2dff2311f7e)
- )
- )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
deleted file mode 100644
index ae61449a90..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='xen' id='6'>
- <name>test</name>
- <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid>
- <memory unit='KiB'>391168</memory>
- <currentMemory unit='KiB'>358400</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/dev/sda8'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver type='raw'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:0a:7b:39'/>
- <source bridge='xenbr0'/>
- <target dev='vif6.0'/>
- </interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
deleted file mode 100644
index 29f4665918..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (pci (backend 0)(dev (domain 0x0001)\
- (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13)\
- (func 0x0))))(device (vbd (dev 'xvda')\
-(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
deleted file mode 100644
index 4606b6ccbd..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/dev/MainVG/GuestVG'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <hostdev mode='subsystem' type='pci' managed='no'>
- <driver name='xen'/>
- <source>
- <address domain='0x0001' bus='0x0c' slot='0x1b'
function='0x2'/>
- </source>
- </hostdev>
- <hostdev mode='subsystem' type='pci' managed='no'>
- <driver name='xen'/>
- <source>
- <address domain='0x0000' bus='0x01' slot='0x13'
function='0x0'/>
- </source>
- </hostdev>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
deleted file mode 100644
index 67c9a6008b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr
+++ /dev/null
@@ -1,5 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pygrub')\
-(bootloader_args '-q')(image (linux (args 'xenfb.video=8,1280,1024')))\
-(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash
'destroy')\
-(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode
'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
deleted file mode 100644
index 5b8bedd788..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
- <bootloader_args>-q</bootloader_args>
- <os>
- <type>linux</type>
- <cmdline>xenfb.video=8,1280,1024</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
deleted file mode 100644
index 71615579e1..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr
+++ /dev/null
@@ -1,5 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader
'/usr/bin/pypxeboot')\
-(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev
'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
deleted file mode 100644
index cb4b051e35..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <bootloader>/usr/bin/pypxeboot</bootloader>
- <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args>
- <os>
- <type>linux</type>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
deleted file mode 100644
index e80259c2b3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(localtime 1)\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
deleted file mode 100644
index ce057d9538..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='localtime' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
deleted file mode 100644
index 200b8ca4d8..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)\
-(vcpu_avail 3)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff
'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
deleted file mode 100644
index 6d498325e3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static' current='2'>4</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
deleted file mode 100644
index 0a2c45c3ea..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
+++ /dev/null
@@ -1,10 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)\
-(vncunused 0)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)\
-(vncdisplay 25)))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
deleted file mode 100644
index 64e1423f78..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <graphics type='vnc' port='5925' autoport='no'
listen='0.0.0.0' keymap='ja'>
- <listen type='address' address='0.0.0.0'/>
- </graphics>
- <video>
- <model type='xen' vram='4096' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
deleted file mode 100644
index 3fdc8a5356..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type
vnc)(vncunused 1)\
-(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
deleted file mode 100644
index ccd6824af3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <graphics type='vnc' port='-1' autoport='yes'
listen='0.0.0.0' keymap='ja'>
- <listen type='address' address='0.0.0.0'/>
- </graphics>
- <video>
- <model type='xen' vram='4096' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
deleted file mode 100644
index b6511a96f3..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
+++ /dev/null
@@ -1,83 +0,0 @@
-(domain
- (domid 1)
- (bootloader /usr/bin/pygrub)
- (on_crash restart)
- (uuid a36f6e38-f498-b06c-5fad-b04947392dbe)
- (bootloader_args )
- (vcpus 1)
- (name test2vm)
- (cpus (()))
- (on_reboot restart)
- (on_poweroff destroy)
- (maxmem 512)
- (memory 512)
- (shadow_memory 0)
- (features )
- (on_xend_start ignore)
- (on_xend_stop ignore)
- (start_time 1250626179.35)
- (cpu_time 21.397345341)
- (online_vcpus 1)
- (image
- (linux
- (kernel )
- (device_model /usr/lib/xen/bin/qemu-system-i386)
- (notes
- (FEATURES
-'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel'
- )
- (VIRT_BASE 3221225472)
- (GUEST_VERSION 2.6)
- (PADDR_OFFSET 3221225472)
- (GUEST_OS linux)
- (HYPERCALL_PAGE 3225423872)
- (LOADER generic)
- (PAE_MODE yes)
- (ENTRY 3225419776)
- (XEN_VERSION xen-3.0)
- )
- )
- )
- (status 2)
- (state -b----)
- (store_mfn 262434)
- (console_mfn 262433)
- (device
- (vif
- (bridge virbr0)
- (mac 00:16:36:68:9f:5d)
- (script /etc/xen/scripts/vif-bridge)
- (uuid 6435a5d4-9b8e-1e82-6863-5a6b57a4438d)
- (backend 0)
- )
- )
- (device (vkbd (backend 0)))
- (device
- (console
- (protocol vt100)
- (location 2)
- (uuid 2e2c3247-5de1-7bd7-250a-41ab80030e72)
- )
- )
- (device
- (vbd
- (protocol x86_32-abi)
- (uuid 8f888aa8-a1c2-0c2b-0c70-4c3b96abe8c8)
- (bootable 1)
- (dev xvda:disk)
- (uname phy:/dev/vg_dom0test/test2vm)
- (mode w)
- (backend 0)
- (bootable 1)
- (VDI )
- )
- )
- (device
- (vfb
- (vncunused 1)
- (vnc 1)
- (uuid 5f61a036-660c-cdf3-8d20-16164b996e40)
- (location 127.0.0.1:5900)
- )
- )
-)
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
deleted file mode 100644
index 6ef05534e4..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type='xen' id='1'>
- <name>test2vm</name>
- <uuid>a36f6e38-f498-b06c-5fad-b04947392dbe</uuid>
- <memory unit='KiB'>524288</memory>
- <currentMemory unit='KiB'>524288</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
- <os>
- <type>linux</type>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='phy' type='raw'/>
- <source dev='/dev/vg_dom0test/test2vm'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:36:68:9f:5d'/>
- <source bridge='virbr0'/>
- <script path='/etc/xen/scripts/vif-bridge'/>
- <target dev='vif1.0'/>
- </interface>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <graphics type='vnc' port='-1' autoport='yes'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='xen' vram='4096' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
b/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
deleted file mode 100644
index d582ea0cb5..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
+++ /dev/null
@@ -1,8 +0,0 @@
-(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
-(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')\
-(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
-(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
-(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
deleted file mode 100644
index 9aae240832..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='xen' id='6'>
- <name>pvtest</name>
- <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
- <memory unit='KiB'>430080</memory>
- <currentMemory unit='KiB'>430080</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type>linux</type>
- <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
- <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
- <cmdline>
method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test...
</cmdline>
- </os>
- <clock offset='utc' adjustment='reset'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>destroy</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/some.img'/>
- <target dev='xvda' bus='xen'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <console type='pty'>
- <target type='xen' port='0'/>
- </console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
deleted file mode 100644
index dbaa57632b..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr
+++ /dev/null
@@ -1,11 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vbd (dev 'hdc:cdrom')\
-(uname 'file:/root/boot.iso')(mode 'r')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(type 'netfront')(rate '10240KB/s'))))
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
deleted file mode 100644
index 4b7cb21031..0000000000
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<domain type='xen' id='3'>
- <name>fvtest</name>
- <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
- <memory unit='KiB'>409600</memory>
- <currentMemory unit='KiB'>409600</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
- <disk type='file' device='disk'>
- <driver name='file' type='raw'/>
- <source file='/root/foo.img'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file' type='raw'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='xenbus' index='0'/>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:1b:b1:47'/>
- <source bridge='xenbr0'/>
- <bandwidth>
- <outbound average='10240'/>
- </bandwidth>
- <script path='vif-bridge'/>
- <target dev='vif3.0'/>
- <model type='netfront'/>
- </interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes'
keymap='ja'>
- <listen type='address'/>
- </graphics>
- <video>
- <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
deleted file mode 100644
index b2fc4d42fe..0000000000
--- a/tests/sexpr2xmltest.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include <config.h>
-
-#include <unistd.h>
-
-#include "internal.h"
-#include "virxml.h"
-#include "datatypes.h"
-#include "xenconfig/xen_sxpr.h"
-#include "testutils.h"
-#include "testutilsxen.h"
-#include "virstring.h"
-#include "libxl/libxl_conf.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-static virCapsPtr caps;
-static virDomainXMLOptionPtr xmlopt;
-
-static int
-testCompareFiles(const char *xml, const char *sexpr)
-{
- char *sexprData = NULL;
- char *gotxml = NULL;
- int ret = -1;
- virDomainDefPtr def = NULL;
-
- if (virTestLoadFile(sexpr, &sexprData) < 0)
- goto fail;
-
- if (!(def = xenParseSxprString(sexprData,
- NULL, -1, caps, xmlopt)))
- goto fail;
-
- if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
- fprintf(stderr, "ABI stability check failed on %s", xml);
- goto fail;
- }
-
- if (!(gotxml = virDomainDefFormat(def, caps, 0)))
- goto fail;
-
- if (virTestCompareToFile(gotxml, xml) < 0)
- goto fail;
-
- ret = 0;
-
- fail:
- VIR_FREE(sexprData);
- VIR_FREE(gotxml);
- virDomainDefFree(def);
-
- return ret;
-}
-
-struct testInfo {
- const char *input;
- const char *output;
-};
-
-static int
-testCompareHelper(const void *data)
-{
- int result = -1;
- const struct testInfo *info = data;
- char *xml = NULL;
- char *args = NULL;
-
- if (virAsprintf(&xml, "%s/sexpr2xmldata/sexpr2xml-%s.xml",
- abs_srcdir, info->input) < 0 ||
- virAsprintf(&args, "%s/sexpr2xmldata/sexpr2xml-%s.sexpr",
- abs_srcdir, info->output) < 0) {
- goto cleanup;
- }
-
- result = testCompareFiles(xml, args);
-
- cleanup:
- VIR_FREE(xml);
- VIR_FREE(args);
-
- return result;
-}
-
-static int
-mymain(void)
-{
- int ret = 0;
-
- if (!(caps = testXLInitCaps()))
- return EXIT_FAILURE;
-
- if (!(xmlopt = libxlCreateXMLConf()))
- return EXIT_FAILURE;
-
-#define DO_TEST(in, out) \
- do { \
- struct testInfo info = { in, out }; \
- virResetLastError(); \
- if (virTestRun("Xen SEXPR-2-XML " in " -> " out, \
- testCompareHelper, &info) < 0) \
- ret = -1; \
- } while (0)
-
- DO_TEST("pv", "pv");
- DO_TEST("fv", "fv");
- DO_TEST("pv", "pv");
- DO_TEST("fv-v2", "fv-v2");
- DO_TEST("pv-vfb-new", "pv-vfb-new");
- DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay");
- DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash");
- DO_TEST("fv-autoport", "fv-autoport");
- DO_TEST("pv-bootloader", "pv-bootloader");
- DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline");
- DO_TEST("pv-vcpus", "pv-vcpus");
-
- DO_TEST("disk-file", "disk-file");
- DO_TEST("disk-block", "disk-block");
- DO_TEST("disk-block-shareable", "disk-block-shareable");
- DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw");
- DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow");
- DO_TEST("disk-drv-blktap2-raw", "disk-drv-blktap2-raw");
-
- DO_TEST("curmem", "curmem");
- DO_TEST("net-routed", "net-routed");
- DO_TEST("net-bridged", "net-bridged");
- DO_TEST("net-e1000", "net-e1000");
- DO_TEST("bridge-ipaddr", "bridge-ipaddr");
- DO_TEST("no-source-cdrom", "no-source-cdrom");
- DO_TEST("pv-localtime", "pv-localtime");
- DO_TEST("pci-devs", "pci-devs");
-
- DO_TEST("fv-utc", "fv-utc");
- DO_TEST("fv-localtime", "fv-localtime");
- DO_TEST("fv-usbmouse", "fv-usbmouse");
- DO_TEST("fv-usbtablet", "fv-usbtablet");
- DO_TEST("fv-kernel", "fv-kernel");
- DO_TEST("fv-force-hpet", "fv-force-hpet");
- DO_TEST("fv-force-nohpet", "fv-force-nohpet");
-
- DO_TEST("fv-serial-null", "fv-serial-null");
- DO_TEST("fv-serial-file", "fv-serial-file");
- DO_TEST("fv-serial-dev-2-ports", "fv-serial-dev-2-ports");
- DO_TEST("fv-serial-dev-2nd-port", "fv-serial-dev-2nd-port");
- DO_TEST("fv-serial-stdio", "fv-serial-stdio");
- DO_TEST("fv-serial-pty", "fv-serial-pty");
- DO_TEST("fv-serial-pipe", "fv-serial-pipe");
- DO_TEST("fv-serial-tcp", "fv-serial-tcp");
- DO_TEST("fv-serial-udp", "fv-serial-udp");
- DO_TEST("fv-serial-tcp-telnet", "fv-serial-tcp-telnet");
- DO_TEST("fv-serial-unix", "fv-serial-unix");
- DO_TEST("fv-parallel-tcp", "fv-parallel-tcp");
-
- DO_TEST("fv-sound", "fv-sound");
- DO_TEST("fv-sound-all", "fv-sound-all");
-
- DO_TEST("fv-net-netfront", "fv-net-netfront");
-
- DO_TEST("fv-empty-kernel", "fv-empty-kernel");
-
- DO_TEST("boot-grub", "boot-grub");
-
- DO_TEST("vif-rate", "vif-rate");
-
- virObjectUnref(caps);
- virObjectUnref(xmlopt);
-
- return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index e5bfcde729..b706638087 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -216,7 +216,7 @@ mymain(void)
DO_TEST_DIR("capability.rng", "capabilityschemadata",
"vircaps2xmldata");
DO_TEST_DIR("domain.rng", "domainschemadata",
- "qemuxml2argvdata", "sexpr2xmldata",
"xmconfigdata",
+ "qemuxml2argvdata", "xmconfigdata",
"qemuxml2xmloutdata", "lxcxml2xmldata",
"lxcxml2xmloutdata", "bhyvexml2argvdata",
"genericxml2xmlindata",
"genericxml2xmloutdata", "xlconfigdata",
"libxlxml2domconfigdata",
--
2.21.0
7:21 a.m.
New subject: [libvirt] [PATCH 06/14] tests: Drop sexpr2xmltest
On Wed, Jul 03, 2019 at 02:37:58PM +0200, Peter Krempa wrote:
Now that we no longer support sexpr conversion to the internal config
we
can drop the test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/Makefile.am | 10 +-
tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 6 -
[...]
tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 11 --
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 56 ------
tests/sexpr2xmltest.c | 170 ------------------
tests/virschematest.c | 2 +-
103 files changed, 3 insertions(+), 3298 deletions(-)
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr
delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:37 a.m.
New subject: [libvirt] [PATCH 07/14] xenconfig: Drop unused sexpr parsing infrastructure
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 2 -
src/xenconfig/xen_sxpr.c | 1137 ------------------------------------
src/xenconfig/xen_sxpr.h | 13 -
3 files changed, 1152 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index d5b4115c5a..d182f54e2f 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -5,10 +5,8 @@
# xenconfig/xen_sxpr.h
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
-xenParseSxpr;
xenParseSxprChar;
xenParseSxprSound;
-xenParseSxprString;
xenParseSxprVifRate;
# xenconfig/xen_xm.h
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index a9a420ac3a..4328875475 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -66,103 +66,6 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int *id)
}
-/**
- * xenParseSxprOS:
- * @node: the root of the parsed S-Expression
- * @def: the domain config
- * @hvm: true or 1 if node contains HVM S-Expression
- *
- * Parse the xend sexp for description of os and append it to buf.
- *
- * Returns 0 in case of success and -1 in case of error
- */
-static int
-xenParseSxprOS(const struct sexpr *node,
- virDomainDefPtr def,
- int hvm)
-{
- if (hvm) {
- if (VIR_ALLOC(def->os.loader) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/hvm/loader",
&def->os.loader->path) < 0)
- goto error;
- if (def->os.loader->path == NULL) {
- if (sexpr_node_copy(node, "domain/image/hvm/kernel",
&def->os.loader->path) < 0)
- goto error;
-
- if (def->os.loader->path == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete,
missing HVM loader"));
- return -1;
- }
- } else {
- if (sexpr_node_copy(node, "domain/image/hvm/kernel",
&def->os.kernel) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/hvm/ramdisk",
&def->os.initrd) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/hvm/args",
&def->os.cmdline) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/hvm/root",
&def->os.root) < 0)
- goto error;
- }
- } else {
- if (sexpr_node_copy(node, "domain/image/linux/kernel",
&def->os.kernel) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/linux/ramdisk",
&def->os.initrd) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/linux/args",
&def->os.cmdline) < 0)
- goto error;
- if (sexpr_node_copy(node, "domain/image/linux/root",
&def->os.root) < 0)
- goto error;
- }
-
- /* If HVM kenrel == loader, then old xend, so kill off kernel */
- if (hvm &&
- def->os.kernel &&
- STREQ(def->os.kernel, def->os.loader->path)) {
- VIR_FREE(def->os.kernel);
- }
- /* Drop kernel argument that has no value */
- if (hvm &&
- def->os.kernel && *def->os.kernel == '\0' &&
- def->os.loader) {
- VIR_FREE(def->os.kernel);
- }
-
- if (!def->os.kernel &&
- hvm) {
- const char *boot = sexpr_node(node, "domain/image/hvm/boot");
- if ((boot != NULL) && (boot[0] != 0)) {
- while (*boot &&
- def->os.nBootDevs < VIR_DOMAIN_BOOT_LAST) {
- if (*boot == 'a')
- def->os.bootDevs[def->os.nBootDevs++] =
VIR_DOMAIN_BOOT_FLOPPY;
- else if (*boot == 'c')
- def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_DISK;
- else if (*boot == 'd')
- def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_CDROM;
- else if (*boot == 'n')
- def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_NET;
- boot++;
- }
- }
- }
-
- if (!hvm &&
- !def->os.kernel &&
- !def->os.bootloader) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete, missing
kernel & bootloader"));
- return -1;
- }
-
- return 0;
-
- error:
- return -1;
-}
-
-
/**
* xenParseSxprChar:
* @value: A string describing a character device.
@@ -369,320 +272,6 @@ xenParseSxprVifRate(const char *rate, unsigned long long
*kbytes_per_sec)
}
-/**
- * xenParseSxprDisks:
- * @def: the domain config
- * @root: root S-expression
- * @hvm: true or 1 if node contains HVM S-Expression
- *
- * This parses out block devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprDisks(virDomainDefPtr def,
- const struct sexpr *root,
- int hvm)
-{
- const struct sexpr *cur, *node;
- virDomainDiskDefPtr disk = NULL;
-
- for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
- /* Normally disks are in a (device (vbd ...)) block
- but blktap disks ended up in a differently named
- (device (tap ....)) block.... */
- if (sexpr_lookup(node, "device/vbd") ||
- sexpr_lookup(node, "device/tap") ||
- sexpr_lookup(node, "device/tap2")) {
- char *offset;
- const char *src = NULL;
- const char *dst = NULL;
- const char *mode = NULL;
- const char *bootable = NULL;
-
- /* Again dealing with (vbd...) vs (tap ...) differences */
- if (sexpr_lookup(node, "device/vbd")) {
- src = sexpr_node(node, "device/vbd/uname");
- dst = sexpr_node(node, "device/vbd/dev");
- mode = sexpr_node(node, "device/vbd/mode");
- bootable = sexpr_node(node, "device/vbd/bootable");
- } else if (sexpr_lookup(node, "device/tap2")) {
- src = sexpr_node(node, "device/tap2/uname");
- dst = sexpr_node(node, "device/tap2/dev");
- mode = sexpr_node(node, "device/tap2/mode");
- bootable = sexpr_node(node, "device/tap2/bootable");
- } else {
- src = sexpr_node(node, "device/tap/uname");
- dst = sexpr_node(node, "device/tap/dev");
- mode = sexpr_node(node, "device/tap/mode");
- bootable = sexpr_node(node, "device/tap/bootable");
- }
-
- if (!(disk = virDomainDiskDefNew(NULL)))
- goto error;
-
- if (dst == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete, vbd
has no dev"));
- goto error;
- }
-
- if (src == NULL) {
- /* There is a case without the uname to the CD-ROM device */
- offset = strchr(dst, ':');
- if (!offset ||
- !hvm ||
- STRNEQ(offset, ":cdrom")) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete,
vbd has no src"));
- goto error;
- }
- }
-
- if (src != NULL) {
- offset = strchr(src, ':');
- if (!offset) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("cannot parse vbd filename,
missing driver name"));
- goto error;
- }
-
- if (sexpr_lookup(node, "device/tap2") &&
- STRPREFIX(src, "tap:")) {
- if (virDomainDiskSetDriver(disk, "tap2") < 0)
- goto error;
- } else {
- char *tmp;
- if (VIR_STRNDUP(tmp, src, offset - src) < 0)
- goto error;
- if (virDomainDiskSetDriver(disk, tmp) < 0) {
- VIR_FREE(tmp);
- goto error;
- }
- VIR_FREE(tmp);
- }
-
- src = offset + 1;
-
- if (STREQ(virDomainDiskGetDriver(disk), "tap") ||
- STREQ(virDomainDiskGetDriver(disk), "tap2")) {
- char *driverType = NULL;
-
- offset = strchr(src, ':');
- if (!offset) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("cannot parse vbd filename,
missing driver type"));
- goto error;
- }
-
- if (VIR_STRNDUP(driverType, src, offset - src) < 0)
- goto error;
- if (STREQ(driverType, "aio"))
- virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW);
- else
- virDomainDiskSetFormat(disk,
-
virStorageFileFormatTypeFromString(driverType));
- VIR_FREE(driverType);
- if (virDomainDiskGetFormat(disk) <= 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unknown driver type %s"), src);
- goto error;
- }
-
- src = offset + 1;
- /* Its possible to use blktap driver for block devs
- too, but kinda pointless because blkback is better,
- so we assume common case here. If blktap becomes
- omnipotent, we can revisit this, perhaps stat()'ing
- the src file in question */
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
- } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) {
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
- } else if (STREQ(virDomainDiskGetDriver(disk), "file")) {
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
- }
- } else {
- /* No CDROM media so can't really tell. We'll just
- call if a FILE for now and update when media
- is inserted later */
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
- }
-
- if (STREQLEN(dst, "ioemu:", 6))
- dst += 6;
-
- disk->device = VIR_DOMAIN_DISK_DEVICE_DISK;
- offset = strrchr(dst, ':');
- if (offset) {
- if (STREQ(offset, ":cdrom")) {
- disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
- } else if (STREQ(offset, ":disk")) {
- /* The default anyway */
- } else {
- /* Unknown, lets pretend its a disk too */
- }
- offset[0] = '\0';
- }
-
- if (VIR_STRDUP(disk->dst, dst) < 0)
- goto error;
- if (virDomainDiskSetSource(disk, src) < 0)
- goto error;
-
- if (STRPREFIX(disk->dst, "xvd"))
- disk->bus = VIR_DOMAIN_DISK_BUS_XEN;
- else if (STRPREFIX(disk->dst, "hd"))
- disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
- else if (STRPREFIX(disk->dst, "sd"))
- disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
- else
- disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
-
- if (mode &&
- strchr(mode, 'r'))
- disk->src->readonly = true;
- if (mode &&
- strchr(mode, '!'))
- disk->src->shared = true;
-
- if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
- goto error;
-
- /* re-order disks if there is a bootable device */
- if (STREQ_NULLABLE(bootable, "1")) {
- def->disks[def->ndisks++] = def->disks[0];
- def->disks[0] = disk;
- } else {
- def->disks[def->ndisks++] = disk;
- }
- disk = NULL;
- }
- }
-
- return 0;
-
- error:
- virDomainDiskDefFree(disk);
- return -1;
-}
-
-
-/**
- * xenParseSxprNets:
- * @def: the domain config
- * @root: root S-expression
- *
- * This parses out network devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprNets(virDomainDefPtr def,
- const struct sexpr *root)
-{
- virDomainNetDefPtr net = NULL;
- const struct sexpr *cur, *node;
- const char *tmp;
- int vif_index = 0;
-
- for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
- if (sexpr_lookup(node, "device/vif")) {
- const char *tmp2, *model, *type;
- tmp2 = sexpr_node(node, "device/vif/script");
- tmp = sexpr_node(node, "device/vif/bridge");
- model = sexpr_node(node, "device/vif/model");
- type = sexpr_node(node, "device/vif/type");
-
- if (VIR_ALLOC(net) < 0)
- goto cleanup;
-
- if (tmp != NULL ||
- (tmp2 != NULL && STREQ(tmp2, DEFAULT_VIF_SCRIPT))) {
- net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
- /* XXX virtual network reverse resolve */
-
- if (VIR_STRDUP(net->data.bridge.brname, tmp) < 0)
- goto cleanup;
- if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
- VIR_STRDUP(net->script, tmp2) < 0)
- goto cleanup;
- tmp = sexpr_node(node, "device/vif/ip");
- if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0)
< 0)
- goto cleanup;
- } else {
- net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
- if (VIR_STRDUP(net->script, tmp2) < 0)
- goto cleanup;
- tmp = sexpr_node(node, "device/vif/ip");
- if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0)
< 0)
- goto cleanup;
- }
-
- tmp = sexpr_node(node, "device/vif/vifname");
- /* If vifname is specified in xend config, include it in net
- * definition regardless of domain state. If vifname is not
- * specified, only generate one if domain is active (id != -1). */
- if (tmp) {
- if (VIR_STRDUP(net->ifname, tmp) < 0)
- goto cleanup;
- } else if (def->id != -1) {
- if (virAsprintf(&net->ifname, "vif%d.%d", def->id,
vif_index) < 0)
- goto cleanup;
- }
-
- tmp = sexpr_node(node, "device/vif/mac");
- if (tmp) {
- if (virMacAddrParse(tmp, &net->mac) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("malformed mac address '%s'"),
tmp);
- goto cleanup;
- }
- }
-
- if (model) {
- if (virDomainNetSetModelString(net, model) < 0)
- goto cleanup;
- } else {
- if (type && STREQ(type, "netfront"))
- net->model = VIR_DOMAIN_NET_MODEL_NETFRONT;
- }
-
- tmp = sexpr_node(node, "device/vif/rate");
- if (tmp) {
- virNetDevBandwidthPtr bandwidth;
- unsigned long long kbytes_per_sec;
-
- if (xenParseSxprVifRate(tmp, &kbytes_per_sec) < 0)
- goto cleanup;
-
- if (VIR_ALLOC(bandwidth) < 0)
- goto cleanup;
- if (VIR_ALLOC(bandwidth->out) < 0) {
- VIR_FREE(bandwidth);
- goto cleanup;
- }
-
- bandwidth->out->average = kbytes_per_sec;
- net->bandwidth = bandwidth;
- }
-
- if (VIR_APPEND_ELEMENT(def->nets, def->nnets, net) < 0)
- goto cleanup;
-
- vif_index++;
- }
- }
-
- return 0;
-
- cleanup:
- virDomainNetDefFree(net);
- return -1;
-}
-
-
/**
* xenParseSxprSound:
* @def: the domain config
@@ -765,729 +354,3 @@ xenParseSxprSound(virDomainDefPtr def,
error:
return -1;
}
-
-
-/**
- * xenParseSxprUSB:
- * @def: the domain config
- * @root: root S-expression
- *
- * This parses out USB devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprUSB(virDomainDefPtr def,
- const struct sexpr *root)
-{
- struct sexpr *cur, *node;
- const char *tmp;
-
- for (cur = sexpr_lookup(root, "domain/image/hvm"); cur &&
cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
- if (sexpr_lookup(node, "usbdevice")) {
- tmp = sexpr_node(node, "usbdevice");
- if (tmp && *tmp) {
- if (STREQ(tmp, "tablet") ||
- STREQ(tmp, "mouse") ||
- STREQ(tmp, "keyboard")) {
- virDomainInputDefPtr input;
- if (VIR_ALLOC(input) < 0)
- goto error;
- input->bus = VIR_DOMAIN_INPUT_BUS_USB;
- if (STREQ(tmp, "tablet"))
- input->type = VIR_DOMAIN_INPUT_TYPE_TABLET;
- else if (STREQ(tmp, "mouse"))
- input->type = VIR_DOMAIN_INPUT_TYPE_MOUSE;
- else
- input->type = VIR_DOMAIN_INPUT_TYPE_KBD;
-
- if (VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input) <
0) {
- VIR_FREE(input);
- goto error;
- }
- } else {
- /* XXX Handle other non-input USB devices later */
- }
- }
- }
- }
- return 0;
-
- error:
- return -1;
-}
-
-
-/*
- * xenParseSxprGraphicsOld:
- * @def: the domain config
- * @root: root S-expression
- * @hvm: true or 1 if root contains HVM S-Expression
- * @vncport: VNC port number
- *
- * This parses out VNC devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprGraphicsOld(virDomainDefPtr def,
- const struct sexpr *root,
- int hvm,
- int vncport)
-{
- const char *tmp;
- virDomainGraphicsDefPtr graphics = NULL;
-
- if ((tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ?
"hvm" : "linux")) &&
- tmp[0] == '1') {
- /* Graphics device (HVM, or old (pre-3.0.4) style PV VNC config) */
- int port;
- const char *listenAddr = sexpr_fmt_node(root,
"domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
- const char *vncPasswd = sexpr_fmt_node(root,
"domain/image/%s/vncpasswd", hvm ? "hvm" : "linux");
- const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm
? "hvm" : "linux");
- const char *unused = sexpr_fmt_node(root, "domain/image/%s/vncunused",
hvm ? "hvm" : "linux");
-
- port = vncport;
-
- if (VIR_ALLOC(graphics) < 0)
- goto error;
-
- graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
- if ((unused && STREQ(unused, "1")) || port == -1)
- graphics->data.vnc.autoport = true;
- graphics->data.vnc.port = port;
-
- if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
- goto error;
-
- if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0)
- goto error;
-
- if (VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0)
- goto error;
-
- if (VIR_ALLOC_N(def->graphics, 1) < 0)
- goto error;
- def->graphics[0] = graphics;
- def->ngraphics = 1;
- graphics = NULL;
- } else if ((tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ?
"hvm" : "linux")) &&
- tmp[0] == '1') {
- /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
- const char *display = sexpr_fmt_node(root, "domain/image/%s/display",
hvm ? "hvm" : "linux");
- const char *xauth = sexpr_fmt_node(root, "domain/image/%s/xauthority",
hvm ? "hvm" : "linux");
-
- if (VIR_ALLOC(graphics) < 0)
- goto error;
-
- graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
- if (VIR_STRDUP(graphics->data.sdl.display, display) < 0)
- goto error;
- if (VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0)
- goto error;
-
- if (VIR_ALLOC_N(def->graphics, 1) < 0)
- goto error;
- def->graphics[0] = graphics;
- def->ngraphics = 1;
- graphics = NULL;
- }
-
- return 0;
-
- error:
- virDomainGraphicsDefFree(graphics);
- return -1;
-}
-
-
-/*
- * xenParseSxprGraphicsNew:
- * @def: the domain config
- * @root: root S-expression
- * @vncport: VNC port number
- *
- * This parses out VNC devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprGraphicsNew(virDomainDefPtr def,
- const struct sexpr *root, int vncport)
-{
- virDomainGraphicsDefPtr graphics = NULL;
- const struct sexpr *cur, *node;
- const char *tmp;
- int typeVal;
-
- /* append network devices and framebuffer */
- for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
- if (sexpr_lookup(node, "device/vfb")) {
- /* New style graphics config for PV guests in >= 3.0.4,
- * or for HVM guests in >= 3.0.5 */
- if (sexpr_node(node, "device/vfb/type")) {
- tmp = sexpr_node(node, "device/vfb/type");
- } else if (sexpr_node(node, "device/vfb/vnc")) {
- tmp = "vnc";
- } else if (sexpr_node(node, "device/vfb/sdl")) {
- tmp = "sdl";
- } else {
- tmp = "unknown";
- }
-
- if (VIR_ALLOC(graphics) < 0)
- goto error;
-
- if ((typeVal = virDomainGraphicsTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown graphics type '%s'"), tmp);
- goto error;
- }
- graphics->type = typeVal;
-
- if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
- const char *display = sexpr_node(node, "device/vfb/display");
- const char *xauth = sexpr_node(node, "device/vfb/xauthority");
- if (VIR_STRDUP(graphics->data.sdl.display, display) < 0)
- goto error;
- if (VIR_STRDUP(graphics->data.sdl.xauth, xauth) < 0)
- goto error;
- } else {
- int port;
- const char *listenAddr = sexpr_node(node,
"device/vfb/vnclisten");
- const char *vncPasswd = sexpr_node(node,
"device/vfb/vncpasswd");
- const char *keymap = sexpr_node(node, "device/vfb/keymap");
- const char *unused = sexpr_node(node, "device/vfb/vncunused");
-
- port = vncport;
-
- /* Didn't find port entry in xenstore */
- if (port == -1) {
- const char *str = sexpr_node(node,
"device/vfb/vncdisplay");
- int val;
- if (str != NULL && virStrToLong_i(str, NULL, 0, &val) ==
0)
- port = val;
- }
-
- if ((unused && STREQ(unused, "1")) || port == -1)
- graphics->data.vnc.autoport = true;
-
- if (port >= 0 && port < 5900)
- port += 5900;
- graphics->data.vnc.port = port;
-
- if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
- goto error;
-
- if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0)
- goto error;
-
- if (VIR_STRDUP(graphics->data.vnc.keymap, keymap) < 0)
- goto error;
- }
-
- if (VIR_ALLOC_N(def->graphics, 1) < 0)
- goto error;
- def->graphics[0] = graphics;
- def->ngraphics = 1;
- graphics = NULL;
- break;
- }
- }
-
- return 0;
-
- error:
- virDomainGraphicsDefFree(graphics);
- return -1;
-}
-
-
-/**
- * xenParseSxprPCI:
- * @def: the domain config
- * @root: root sexpr
- *
- * This parses out PCI devices from the domain sexpr
- *
- * Returns 0 if successful or -1 if failed.
- */
-static int
-xenParseSxprPCI(virDomainDefPtr def,
- const struct sexpr *root)
-{
- const struct sexpr *cur, *tmp = NULL, *node;
- virDomainHostdevDefPtr dev = NULL;
-
- /*
- * With the (domain ...) block we have the following odd setup
- *
- * (device
- * (pci
- * (dev (domain 0x0000) (bus 0x00) (slot 0x1b) (func 0x0))
- * (dev (domain 0x0000) (bus 0x00) (slot 0x13) (func 0x0))
- * )
- * )
- *
- * Normally there is one (device ...) block per device, but in
- * weird world of Xen PCI, once (device ...) covers multiple
- * devices.
- */
-
- for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
- if ((tmp = sexpr_lookup(node, "device/pci")) != NULL)
- break;
- }
-
- if (!tmp)
- return 0;
-
- for (cur = tmp; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- const char *domain = NULL;
- const char *bus = NULL;
- const char *slot = NULL;
- const char *func = NULL;
- int domainID;
- int busID;
- int slotID;
- int funcID;
-
- node = cur->u.s.car;
- if (!sexpr_lookup(node, "dev"))
- continue;
-
- if (!(domain = sexpr_node(node, "dev/domain"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("missing PCI domain"));
- goto error;
- }
- if (!(bus = sexpr_node(node, "dev/bus"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("missing PCI bus"));
- goto error;
- }
- if (!(slot = sexpr_node(node, "dev/slot"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("missing PCI slot"));
- goto error;
- }
- if (!(func = sexpr_node(node, "dev/func"))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("missing PCI func"));
- goto error;
- }
-
- if (virStrToLong_i(domain, NULL, 0, &domainID) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot parse PCI domain '%s'"), domain);
- goto error;
- }
- if (virStrToLong_i(bus, NULL, 0, &busID) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot parse PCI bus '%s'"), bus);
- goto error;
- }
- if (virStrToLong_i(slot, NULL, 0, &slotID) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot parse PCI slot '%s'"), slot);
- goto error;
- }
- if (virStrToLong_i(func, NULL, 0, &funcID) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot parse PCI func '%s'"), func);
- goto error;
- }
-
- if (!(dev = virDomainHostdevDefNew()))
- goto error;
-
- dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
- dev->managed = false;
- dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
- dev->source.subsys.u.pci.addr.domain = domainID;
- dev->source.subsys.u.pci.addr.bus = busID;
- dev->source.subsys.u.pci.addr.slot = slotID;
- dev->source.subsys.u.pci.addr.function = funcID;
-
- if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, dev) < 0)
- goto error;
- }
-
- return 0;
-
- error:
- virDomainHostdevDefFree(dev);
- return -1;
-}
-
-
-/**
- * xenParseSxpr:
- * @root: the root of the parsed S-Expression
- * @cpus: set of cpus the domain may be pinned to
- * @tty: the console pty path
- * @vncport: VNC port number
- *
- * Parse the xend S-expression description and turn it into a virDomainDefPtr
- * representing these settings as closely as is practical.
- *
- * Returns the domain config or NULL in case of error.
- * The caller must free() the returned value.
- */
-virDomainDefPtr
-xenParseSxpr(const struct sexpr *root,
- const char *cpus,
- char *tty,
- int vncport,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt)
-{
- const char *tmp;
- virDomainDefPtr def;
- int hvm = 0, vmlocaltime;
- unsigned int vcpus;
-
- if (!(def = virDomainDefNew()))
- goto error;
-
- tmp = sexpr_node(root, "domain/domid");
- def->virtType = VIR_DOMAIN_VIRT_XEN;
- if (tmp)
- def->id = sexpr_int(root, "domain/domid");
- else
- def->id = -1;
-
- if (sexpr_node_copy(root, "domain/name", &def->name) < 0)
- goto error;
- if (def->name == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete, missing
name"));
- goto error;
- }
-
- tmp = sexpr_node(root, "domain/uuid");
- if (tmp == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("domain information incomplete, missing
name"));
- goto error;
- }
- if (virUUIDParse(tmp, def->uuid) < 0)
- goto error;
-
- if (sexpr_node_copy(root, "domain/description", &def->description)
< 0)
- goto error;
-
- hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
- if (!hvm) {
- if (sexpr_node_copy(root, "domain/bootloader",
- &def->os.bootloader) < 0)
- goto error;
-
- if (!def->os.bootloader &&
- sexpr_has(root, "domain/bootloader") &&
- VIR_STRDUP(def->os.bootloader, "") < 0)
- goto error;
-
- if (def->os.bootloader &&
- sexpr_node_copy(root, "domain/bootloader_args",
- &def->os.bootloaderArgs) < 0)
- goto error;
- }
-
- def->os.type = (hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_LINUX);
-
- if (def->id != 0) {
- if (sexpr_lookup(root, "domain/image")) {
- if (xenParseSxprOS(root, def, hvm) < 0)
- goto error;
- }
- }
-
- virDomainDefSetMemoryTotal(def, (sexpr_u64(root, "domain/maxmem") <<
10));
- def->mem.cur_balloon = (sexpr_u64(root, "domain/memory") << 10);
-
- if (def->mem.cur_balloon > virDomainDefGetMemoryTotal(def))
- def->mem.cur_balloon = virDomainDefGetMemoryTotal(def);
-
- if (cpus != NULL) {
- if (virBitmapParse(cpus, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
- goto error;
-
- if (virBitmapIsAllClear(def->cpumask)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Invalid value of 'cpumask': %s"),
- cpus);
- goto error;
- }
- }
-
- if (virDomainDefSetVcpusMax(def, sexpr_int(root, "domain/vcpus"), xmlopt)
< 0)
- goto error;
-
- vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail"));
- if (!vcpus || virDomainDefGetVcpusMax(def) < vcpus)
- vcpus = virDomainDefGetVcpusMax(def);
-
- if (virDomainDefSetVcpus(def, vcpus) < 0)
- goto error;
-
- tmp = sexpr_node(root, "domain/on_poweroff");
- if (tmp != NULL) {
- if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown lifecycle type %s"), tmp);
- goto error;
- }
- } else {
- def->onPoweroff = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
- }
-
- tmp = sexpr_node(root, "domain/on_reboot");
- if (tmp != NULL) {
- if ((def->onReboot = virDomainLifecycleActionTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown lifecycle type %s"), tmp);
- goto error;
- }
- } else {
- def->onReboot = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
- }
-
- tmp = sexpr_node(root, "domain/on_crash");
- if (tmp != NULL) {
- if ((def->onCrash = virDomainLifecycleActionTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown lifecycle type %s"), tmp);
- goto error;
- }
- } else {
- def->onCrash = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
- }
-
- if (hvm) {
- if (sexpr_int(root, "domain/image/hvm/acpi"))
- def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
- if (sexpr_int(root, "domain/image/hvm/apic"))
- def->features[VIR_DOMAIN_FEATURE_APIC] = VIR_TRISTATE_SWITCH_ON;
- if (sexpr_int(root, "domain/image/hvm/pae"))
- def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON;
- if (sexpr_int(root, "domain/image/hvm/hap"))
- def->features[VIR_DOMAIN_FEATURE_HAP] = VIR_TRISTATE_SWITCH_ON;
- if (sexpr_int(root, "domain/image/hvm/viridian"))
- def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] = VIR_TRISTATE_SWITCH_ON;
- }
-
- /* 12aaf4a2486b (3.0.3) added a second low-priority 'localtime' setting */
- vmlocaltime = sexpr_int(root, "domain/localtime");
- if (hvm) {
- const char *value = sexpr_node(root, "domain/image/hvm/localtime");
- int rtc_offset;
-
- if (value) {
- if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown localtime offset %s"), value);
- goto error;
- }
- }
- def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
- rtc_offset = sexpr_int(root, "domain/image/hvm/rtc_timeoffset");
- def->clock.data.variable.adjustment = rtc_offset;
- def->clock.data.variable.basis = vmlocaltime ?
- VIR_DOMAIN_CLOCK_BASIS_LOCALTIME :
- VIR_DOMAIN_CLOCK_BASIS_UTC;
-
- if (sexpr_lookup(root, "domain/image/hvm/hpet")) {
- virDomainTimerDefPtr timer;
-
- if (VIR_ALLOC_N(def->clock.timers, 1) < 0 ||
- VIR_ALLOC(timer) < 0)
- goto error;
-
- timer->name = VIR_DOMAIN_TIMER_NAME_HPET;
- timer->present = sexpr_int(root, "domain/image/hvm/hpet");
- timer->tickpolicy = -1;
- timer->mode = -1;
- timer->track = -1;
-
- def->clock.ntimers = 1;
- def->clock.timers[0] = timer;
- }
- } else {
- const char *value = sexpr_node(root, "domain/image/linux/localtime");
- if (value) {
- if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown localtime offset %s"), value);
- goto error;
- }
- }
- /* PV domains do not have an emulated RTC and the offset is fixed. */
- if (vmlocaltime)
- def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
- else
- def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
- def->clock.data.utc_reset = true;
- } /* !hvm */
-
- if (sexpr_node_copy(root, hvm ?
- "domain/image/hvm/device_model" :
- "domain/image/linux/device_model",
- &def->emulator) < 0)
- goto error;
-
- /* append block devices */
- if (xenParseSxprDisks(def, root, hvm) < 0)
- goto error;
-
- if (xenParseSxprNets(def, root) < 0)
- goto error;
-
- if (xenParseSxprPCI(def, root) < 0)
- goto error;
-
- /* New style graphics device config */
- if (xenParseSxprGraphicsNew(def, root, vncport) < 0)
- goto error;
-
- /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
- if ((def->ngraphics == 0) &&
- xenParseSxprGraphicsOld(def, root, hvm, vncport) < 0)
- goto error;
-
- /* in case of HVM we have USB device emulation */
- if (hvm &&
- xenParseSxprUSB(def, root) < 0)
- goto error;
-
- /* Character device config */
- if (hvm) {
- const struct sexpr *serial_root;
- bool have_multiple_serials = false;
-
- serial_root = sexpr_lookup(root, "domain/image/hvm/serial");
- if (serial_root) {
- const struct sexpr *cur, *node, *cur2;
- int ports_skipped = 0;
-
- for (cur = serial_root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
- node = cur->u.s.car;
-
- for (cur2 = node; cur2->kind == SEXPR_CONS; cur2 = cur2->u.s.cdr)
{
- tmp = cur2->u.s.car->u.value;
-
- if (tmp && STRNEQ(tmp, "none")) {
- virDomainChrDefPtr chr;
- if ((chr = xenParseSxprChar(tmp, tty)) == NULL)
- goto error;
- chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
- chr->target.port = def->nserials + ports_skipped;
- if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr)
< 0) {
- virDomainChrDefFree(chr);
- goto error;
- }
- }
- else
- ports_skipped++;
-
- have_multiple_serials = true;
- }
- }
- }
-
- if (!have_multiple_serials) {
- tmp = sexpr_node(root, "domain/image/hvm/serial");
- if (tmp && STRNEQ(tmp, "none")) {
- virDomainChrDefPtr chr;
- if ((chr = xenParseSxprChar(tmp, tty)) == NULL)
- goto error;
- chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
- chr->target.port = 0;
- if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) {
- virDomainChrDefFree(chr);
- goto error;
- }
- }
- }
-
- tmp = sexpr_node(root, "domain/image/hvm/parallel");
- if (tmp && STRNEQ(tmp, "none")) {
- virDomainChrDefPtr chr;
- /* XXX does XenD stuff parallel port tty info into xenstore somewhere ? */
- if ((chr = xenParseSxprChar(tmp, NULL)) == NULL)
- goto error;
- chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL;
- chr->target.port = 0;
- if (VIR_APPEND_ELEMENT(def->parallels, def->nparallels, chr) < 0) {
- virDomainChrDefFree(chr);
- goto error;
- }
- }
- } else if (def->id != 0) {
- if (VIR_ALLOC_N(def->consoles, 1) < 0)
- goto error;
- def->nconsoles = 1;
- /* Fake a paravirt console, since that's not in the sexpr */
- if (!(def->consoles[0] = xenParseSxprChar("pty", tty)))
- goto error;
- def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE;
- def->consoles[0]->target.port = 0;
- def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
- }
- VIR_FREE(tty);
-
-
- /* Sound device config */
- if (hvm &&
- (tmp = sexpr_node(root, "domain/image/hvm/soundhw")) != NULL
&&
- *tmp) {
- if (xenParseSxprSound(def, tmp) < 0)
- goto error;
- }
-
- if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
- xmlopt, NULL) < 0)
- goto error;
-
- return def;
-
- error:
- VIR_FREE(tty);
- virDomainDefFree(def);
- return NULL;
-}
-
-
-/**
- * xenParseSxprString:
- * @sexpr: the root of the parsed S-Expression
- * @tty: the console pty path
- * @vncport: VNC port number
- *
- * Parse the xend S-expression description and turn it into a virDomainDefPtr
- * representing these settings as closely as is practical.
- *
- * Returns the domain config or NULL in case of error.
- * The caller must free() the returned value.
- */
-virDomainDefPtr
-xenParseSxprString(const char *sexpr,
- char *tty,
- int vncport,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt)
-{
- struct sexpr *root = string2sexpr(sexpr);
- virDomainDefPtr def;
-
- if (!root)
- return NULL;
-
- def = xenParseSxpr(root, NULL, tty, vncport, caps, xmlopt);
- sexpr_free(root);
-
- return def;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index c888d06950..0081354688 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -31,19 +31,6 @@
int xenGetDomIdFromSxprString(const char *sexpr, int *id);
int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
-virDomainDefPtr xenParseSxprString(const char *sexpr,
- char *tty,
- int vncport,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt);
-
-virDomainDefPtr xenParseSxpr(const struct sexpr *root,
- const char *cpus,
- char *tty,
- int vncport,
- virCapsPtr caps,
- virDomainXMLOptionPtr xmlopt);
-
int xenParseSxprSound(virDomainDefPtr def, const char *str);
virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);
--
2.21.0
7:22 a.m.
New subject: [libvirt] [PATCH 07/14] xenconfig: Drop unused sexpr parsing infrastructure
On Wed, Jul 03, 2019 at 02:37:59PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 2 -
src/xenconfig/xen_sxpr.c | 1137 ------------------------------------
src/xenconfig/xen_sxpr.h | 13 -
3 files changed, 1152 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 08/14] xenconfig: Remove pointless label in xenParseSxprSound
The 'error' label just returned -1. Inline it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/xenconfig/xen_sxpr.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 4328875475..7404aac071 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -303,13 +303,13 @@ xenParseSxprSound(virDomainDefPtr def,
if (VIR_ALLOC_N(def->sounds,
VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0)
- goto error;
+ return -1;
for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
virDomainSoundDefPtr sound;
if (VIR_ALLOC(sound) < 0)
- goto error;
+ return -1;
sound->model = i;
def->sounds[def->nsounds++] = sound;
}
@@ -329,20 +329,20 @@ xenParseSxprSound(virDomainDefPtr def,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Sound model %s too big for destination"),
offset);
- goto error;
+ return -1;
}
if (VIR_ALLOC(sound) < 0)
- goto error;
+ return -1;
if ((sound->model = virDomainSoundModelTypeFromString(model)) < 0) {
VIR_FREE(sound);
- goto error;
+ return -1;
}
if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) < 0) {
virDomainSoundDefFree(sound);
- goto error;
+ return -1;
}
offset = offset2 ? offset2 + 1 : NULL;
@@ -350,7 +350,4 @@ xenParseSxprSound(virDomainDefPtr def,
}
return 0;
-
- error:
- return -1;
}
--
2.21.0
7:23 a.m.
New subject: [libvirt] [PATCH 08/14] xenconfig: Remove pointless label in xenParseSxprSound
On Wed, Jul 03, 2019 at 02:38:00PM +0200, Peter Krempa wrote:
The 'error' label just returned -1. Inline it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/xenconfig/xen_sxpr.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 09/14] xen: Inline xenParseSxprSound into the only caller
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 68 ++++++++++++++++++++++++++++++--
src/xenconfig/xen_sxpr.c | 81 --------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 65 insertions(+), 87 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index d182f54e2f..77701c14d9 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -6,7 +6,6 @@
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
xenParseSxprChar;
-xenParseSxprSound;
xenParseSxprVifRate;
# xenconfig/xen_xm.h
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 41dffd605d..a8905ad049 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1146,9 +1146,71 @@ xenParseEmulatedDevices(virConfPtr conf, virDomainDefPtr def)
if (xenConfigGetString(conf, "soundhw", &str, NULL) < 0)
return -1;
- if (str &&
- xenParseSxprSound(def, str) < 0)
- return -1;
+ if (str) {
+ if (STREQ(str, "all")) {
+ size_t i;
+
+ /*
+ * Special compatibility code for Xen with a bogus
+ * sound=all in config.
+ *
+ * NB deliberately, don't include all possible
+ * sound models anymore, just the 2 that were
+ * historically present in Xen's QEMU.
+ *
+ * ie just es1370 + sb16.
+ *
+ * Hence use of MODEL_ES1370 + 1, instead of MODEL_LAST
+ */
+
+ if (VIR_ALLOC_N(def->sounds,
+ VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0)
+ return -1;
+
+
+ for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
+ virDomainSoundDefPtr sound;
+ if (VIR_ALLOC(sound) < 0)
+ return -1;
+ sound->model = i;
+ def->sounds[def->nsounds++] = sound;
+ }
+ } else {
+ char model[10];
+ const char *offset = str, *offset2;
+
+ do {
+ int len;
+ virDomainSoundDefPtr sound;
+ offset2 = strchr(offset, ',');
+ if (offset2)
+ len = (offset2 - offset);
+ else
+ len = strlen(offset);
+ if (virStrncpy(model, offset, len, sizeof(model)) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Sound model %s too big for
destination"),
+ offset);
+ return -1;
+ }
+
+ if (VIR_ALLOC(sound) < 0)
+ return -1;
+
+ if ((sound->model = virDomainSoundModelTypeFromString(model)) <
0) {
+ VIR_FREE(sound);
+ return -1;
+ }
+
+ if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) <
0) {
+ virDomainSoundDefFree(sound);
+ return -1;
+ }
+
+ offset = offset2 ? offset2 + 1 : NULL;
+ } while (offset);
+ }
+ }
}
return 0;
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 7404aac071..8876350b8f 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -270,84 +270,3 @@ xenParseSxprVifRate(const char *rate, unsigned long long
*kbytes_per_sec)
VIR_FREE(trate);
return ret;
}
-
-
-/**
- * xenParseSxprSound:
- * @def: the domain config
- * @str: comma separated list of sound models
- *
- * This parses out sound devices from the domain S-expression
- *
- * Returns 0 if successful or -1 if failed.
- */
-int
-xenParseSxprSound(virDomainDefPtr def,
- const char *str)
-{
- if (STREQ(str, "all")) {
- size_t i;
-
- /*
- * Special compatibility code for Xen with a bogus
- * sound=all in config.
- *
- * NB deliberately, don't include all possible
- * sound models anymore, just the 2 that were
- * historically present in Xen's QEMU.
- *
- * ie just es1370 + sb16.
- *
- * Hence use of MODEL_ES1370 + 1, instead of MODEL_LAST
- */
-
- if (VIR_ALLOC_N(def->sounds,
- VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0)
- return -1;
-
-
- for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
- virDomainSoundDefPtr sound;
- if (VIR_ALLOC(sound) < 0)
- return -1;
- sound->model = i;
- def->sounds[def->nsounds++] = sound;
- }
- } else {
- char model[10];
- const char *offset = str, *offset2;
-
- do {
- int len;
- virDomainSoundDefPtr sound;
- offset2 = strchr(offset, ',');
- if (offset2)
- len = (offset2 - offset);
- else
- len = strlen(offset);
- if (virStrncpy(model, offset, len, sizeof(model)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Sound model %s too big for destination"),
- offset);
- return -1;
- }
-
- if (VIR_ALLOC(sound) < 0)
- return -1;
-
- if ((sound->model = virDomainSoundModelTypeFromString(model)) < 0) {
- VIR_FREE(sound);
- return -1;
- }
-
- if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) < 0) {
- virDomainSoundDefFree(sound);
- return -1;
- }
-
- offset = offset2 ? offset2 + 1 : NULL;
- } while (offset);
- }
-
- return 0;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 0081354688..54dfcbb53d 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -31,8 +31,6 @@
int xenGetDomIdFromSxprString(const char *sexpr, int *id);
int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
-int xenParseSxprSound(virDomainDefPtr def, const char *str);
-
virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);
int xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec);
--
2.21.0
7:27 a.m.
New subject: [libvirt] [PATCH 09/14] xen: Inline xenParseSxprSound into the only caller
On Wed, Jul 03, 2019 at 02:38:01PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 68 ++++++++++++++++++++++++++++++--
src/xenconfig/xen_sxpr.c | 81 --------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 65 insertions(+), 87 deletions(-)
It is the only caller but inlining it increases the indentation level
too much for my taste.
Can you just move the function?
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 10/14] xen: Move xenParseSxprVifRate to xen_common
It's the only place where it's used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 62 ++++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 62 --------------------------------------
src/xenconfig/xen_sxpr.h | 2 --
4 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index 77701c14d9..603f1ce420 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -6,7 +6,6 @@
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
xenParseSxprChar;
-xenParseSxprVifRate;
# xenconfig/xen_xm.h
xenFormatXM;
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index a8905ad049..8eaa64a4e9 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -24,6 +24,8 @@
#include <config.h>
+#include <regex.h>
+
#include "internal.h"
#include "virerror.h"
#include "virconf.h"
@@ -926,6 +928,66 @@ xenParseVifBridge(virDomainNetDefPtr net, char *bridge)
}
+static const char *vif_bytes_per_sec_re = "^[0-9]+[GMK]?[Bb]/s$";
+
+static int
+xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec)
+{
+ char *trate = NULL;
+ char *p;
+ regex_t rec;
+ int err;
+ char *suffix;
+ unsigned long long tmp;
+ int ret = -1;
+
+ if (VIR_STRDUP(trate, rate) < 0)
+ return -1;
+
+ p = strchr(trate, '@');
+ if (p != NULL)
+ *p = 0;
+
+ err = regcomp(&rec, vif_bytes_per_sec_re, REG_EXTENDED|REG_NOSUB);
+ if (err != 0) {
+ char error[100];
+ regerror(err, &rec, error, sizeof(error));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to compile regular expression '%s':
%s"),
+ vif_bytes_per_sec_re, error);
+ goto cleanup;
+ }
+
+ if (regexec(&rec, trate, 0, NULL, 0)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Invalid rate '%s' specified"), rate);
+ goto cleanup;
+ }
+
+ if (virStrToLong_ull(rate, &suffix, 10, &tmp)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to parse rate '%s'"), rate);
+ goto cleanup;
+ }
+
+ if (*suffix == 'G')
+ tmp *= 1024 * 1024;
+ else if (*suffix == 'M')
+ tmp *= 1024;
+
+ if (*suffix == 'b' || *(suffix + 1) == 'b')
+ tmp /= 8;
+
+ *kbytes_per_sec = tmp;
+ ret = 0;
+
+ cleanup:
+ regfree(&rec);
+ VIR_FREE(trate);
+ return ret;
+}
+
+
static virDomainNetDefPtr
xenParseVif(char *entry, const char *vif_typename)
{
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 8876350b8f..953909e7b4 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -22,8 +22,6 @@
#include <config.h>
-#include <regex.h>
-
#include "internal.h"
#include "virerror.h"
#include "virconf.h"
@@ -210,63 +208,3 @@ xenParseSxprChar(const char *value,
virDomainChrDefFree(def);
return NULL;
}
-
-
-static const char *vif_bytes_per_sec_re = "^[0-9]+[GMK]?[Bb]/s$";
-
-int
-xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec)
-{
- char *trate = NULL;
- char *p;
- regex_t rec;
- int err;
- char *suffix;
- unsigned long long tmp;
- int ret = -1;
-
- if (VIR_STRDUP(trate, rate) < 0)
- return -1;
-
- p = strchr(trate, '@');
- if (p != NULL)
- *p = 0;
-
- err = regcomp(&rec, vif_bytes_per_sec_re, REG_EXTENDED|REG_NOSUB);
- if (err != 0) {
- char error[100];
- regerror(err, &rec, error, sizeof(error));
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Failed to compile regular expression '%s':
%s"),
- vif_bytes_per_sec_re, error);
- goto cleanup;
- }
-
- if (regexec(&rec, trate, 0, NULL, 0)) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Invalid rate '%s' specified"), rate);
- goto cleanup;
- }
-
- if (virStrToLong_ull(rate, &suffix, 10, &tmp)) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Failed to parse rate '%s'"), rate);
- goto cleanup;
- }
-
- if (*suffix == 'G')
- tmp *= 1024 * 1024;
- else if (*suffix == 'M')
- tmp *= 1024;
-
- if (*suffix == 'b' || *(suffix + 1) == 'b')
- tmp /= 8;
-
- *kbytes_per_sec = tmp;
- ret = 0;
-
- cleanup:
- regfree(&rec);
- VIR_FREE(trate);
- return ret;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 54dfcbb53d..f7112bc6ee 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -32,5 +32,3 @@ int xenGetDomIdFromSxprString(const char *sexpr, int *id);
int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);
-
-int xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec);
--
2.21.0
7:27 a.m.
New subject: [libvirt] [PATCH 10/14] xen: Move xenParseSxprVifRate to xen_common
On Wed, Jul 03, 2019 at 02:38:02PM +0200, Peter Krempa wrote:
It's the only place where it's used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 62 ++++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 62 --------------------------------------
src/xenconfig/xen_sxpr.h | 2 --
4 files changed, 62 insertions(+), 65 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 11/14] xen: Move xenParseSxprChar to xen_common
It's the only place where it's used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 146 +++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 146 -------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 146 insertions(+), 149 deletions(-)
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index 603f1ce420..ddaecd6850 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -5,7 +5,6 @@
# xenconfig/xen_sxpr.h
xenGetDomIdFromSxpr;
xenGetDomIdFromSxprString;
-xenParseSxprChar;
# xenconfig/xen_xm.h
xenFormatXM;
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 8eaa64a4e9..aa069fb74e 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -763,6 +763,152 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
}
+/**
+ * xenParseSxprChar:
+ * @value: A string describing a character device.
+ * @tty: the console pty path
+ *
+ * Parse the xend S-expression for description of a character device.
+ *
+ * Returns a character device object or NULL in case of failure.
+ */
+static virDomainChrDefPtr
+xenParseSxprChar(const char *value,
+ const char *tty)
+{
+ const char *prefix;
+ char *tmp;
+ virDomainChrDefPtr def;
+
+ if (!(def = virDomainChrDefNew(NULL)))
+ return NULL;
+
+ prefix = value;
+
+ if (value[0] == '/') {
+ def->source->type = VIR_DOMAIN_CHR_TYPE_DEV;
+ if (VIR_STRDUP(def->source->data.file.path, value) < 0)
+ goto error;
+ } else {
+ if ((tmp = strchr(value, ':')) != NULL) {
+ *tmp = '\0';
+ value = tmp + 1;
+ }
+
+ if (STRPREFIX(prefix, "telnet")) {
+ def->source->type = VIR_DOMAIN_CHR_TYPE_TCP;
+ def->source->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET;
+ } else {
+ if ((def->source->type = virDomainChrTypeFromString(prefix)) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unknown chr device type '%s'"),
prefix);
+ goto error;
+ }
+ }
+ }
+
+ switch (def->source->type) {
+ case VIR_DOMAIN_CHR_TYPE_PTY:
+ if (VIR_STRDUP(def->source->data.file.path, tty) < 0)
+ goto error;
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_FILE:
+ case VIR_DOMAIN_CHR_TYPE_PIPE:
+ if (VIR_STRDUP(def->source->data.file.path, value) < 0)
+ goto error;
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_TCP:
+ {
+ const char *offset = strchr(value, ':');
+ const char *offset2;
+
+ if (offset == NULL) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("malformed char device string"));
+ goto error;
+ }
+
+ if (offset != value &&
+ VIR_STRNDUP(def->source->data.tcp.host, value, offset - value) < 0)
+ goto error;
+
+ offset2 = strchr(offset, ',');
+ offset++;
+ if (VIR_STRNDUP(def->source->data.tcp.service, offset,
+ offset2 ? offset2 - offset : -1) < 0)
+ goto error;
+
+ if (offset2 && strstr(offset2, ",server"))
+ def->source->data.tcp.listen = true;
+ }
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_UDP:
+ {
+ const char *offset = strchr(value, ':');
+ const char *offset2, *offset3;
+
+ if (offset == NULL) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("malformed char device string"));
+ goto error;
+ }
+
+ if (offset != value &&
+ VIR_STRNDUP(def->source->data.udp.connectHost, value, offset - value)
< 0)
+ goto error;
+
+ offset2 = strchr(offset, '@');
+ if (offset2 != NULL) {
+ if (VIR_STRNDUP(def->source->data.udp.connectService,
+ offset + 1, offset2 - offset - 1) < 0)
+ goto error;
+
+ offset3 = strchr(offset2, ':');
+ if (offset3 == NULL) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("malformed char device
string"));
+ goto error;
+ }
+
+ if (offset3 > (offset2 + 1) &&
+ VIR_STRNDUP(def->source->data.udp.bindHost,
+ offset2 + 1, offset3 - offset2 - 1) < 0)
+ goto error;
+
+ if (VIR_STRDUP(def->source->data.udp.bindService, offset3 + 1) < 0)
+ goto error;
+ } else {
+ if (VIR_STRDUP(def->source->data.udp.connectService, offset + 1) <
0)
+ goto error;
+ }
+ }
+ break;
+
+ case VIR_DOMAIN_CHR_TYPE_UNIX:
+ {
+ const char *offset = strchr(value, ',');
+ if (VIR_STRNDUP(def->source->data.nix.path, value,
+ offset ? offset - value : -1) < 0)
+ goto error;
+
+ if (offset != NULL &&
+ strstr(offset, ",server") != NULL)
+ def->source->data.nix.listen = true;
+ }
+ break;
+ }
+
+ return def;
+
+ error:
+ virDomainChrDefFree(def);
+ return NULL;
+}
+
+
static int
xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
{
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 953909e7b4..f087464c4d 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -62,149 +62,3 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int *id)
*id = tmp ? sexpr_int(root, "domain/domid") : -1;
return 0;
}
-
-
-/**
- * xenParseSxprChar:
- * @value: A string describing a character device.
- * @tty: the console pty path
- *
- * Parse the xend S-expression for description of a character device.
- *
- * Returns a character device object or NULL in case of failure.
- */
-virDomainChrDefPtr
-xenParseSxprChar(const char *value,
- const char *tty)
-{
- const char *prefix;
- char *tmp;
- virDomainChrDefPtr def;
-
- if (!(def = virDomainChrDefNew(NULL)))
- return NULL;
-
- prefix = value;
-
- if (value[0] == '/') {
- def->source->type = VIR_DOMAIN_CHR_TYPE_DEV;
- if (VIR_STRDUP(def->source->data.file.path, value) < 0)
- goto error;
- } else {
- if ((tmp = strchr(value, ':')) != NULL) {
- *tmp = '\0';
- value = tmp + 1;
- }
-
- if (STRPREFIX(prefix, "telnet")) {
- def->source->type = VIR_DOMAIN_CHR_TYPE_TCP;
- def->source->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET;
- } else {
- if ((def->source->type = virDomainChrTypeFromString(prefix)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("unknown chr device type '%s'"),
prefix);
- goto error;
- }
- }
- }
-
- switch (def->source->type) {
- case VIR_DOMAIN_CHR_TYPE_PTY:
- if (VIR_STRDUP(def->source->data.file.path, tty) < 0)
- goto error;
- break;
-
- case VIR_DOMAIN_CHR_TYPE_FILE:
- case VIR_DOMAIN_CHR_TYPE_PIPE:
- if (VIR_STRDUP(def->source->data.file.path, value) < 0)
- goto error;
- break;
-
- case VIR_DOMAIN_CHR_TYPE_TCP:
- {
- const char *offset = strchr(value, ':');
- const char *offset2;
-
- if (offset == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("malformed char device string"));
- goto error;
- }
-
- if (offset != value &&
- VIR_STRNDUP(def->source->data.tcp.host, value, offset - value) < 0)
- goto error;
-
- offset2 = strchr(offset, ',');
- offset++;
- if (VIR_STRNDUP(def->source->data.tcp.service, offset,
- offset2 ? offset2 - offset : -1) < 0)
- goto error;
-
- if (offset2 && strstr(offset2, ",server"))
- def->source->data.tcp.listen = true;
- }
- break;
-
- case VIR_DOMAIN_CHR_TYPE_UDP:
- {
- const char *offset = strchr(value, ':');
- const char *offset2, *offset3;
-
- if (offset == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("malformed char device string"));
- goto error;
- }
-
- if (offset != value &&
- VIR_STRNDUP(def->source->data.udp.connectHost, value, offset - value)
< 0)
- goto error;
-
- offset2 = strchr(offset, '@');
- if (offset2 != NULL) {
- if (VIR_STRNDUP(def->source->data.udp.connectService,
- offset + 1, offset2 - offset - 1) < 0)
- goto error;
-
- offset3 = strchr(offset2, ':');
- if (offset3 == NULL) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("malformed char device
string"));
- goto error;
- }
-
- if (offset3 > (offset2 + 1) &&
- VIR_STRNDUP(def->source->data.udp.bindHost,
- offset2 + 1, offset3 - offset2 - 1) < 0)
- goto error;
-
- if (VIR_STRDUP(def->source->data.udp.bindService, offset3 + 1) < 0)
- goto error;
- } else {
- if (VIR_STRDUP(def->source->data.udp.connectService, offset + 1) <
0)
- goto error;
- }
- }
- break;
-
- case VIR_DOMAIN_CHR_TYPE_UNIX:
- {
- const char *offset = strchr(value, ',');
- if (VIR_STRNDUP(def->source->data.nix.path, value,
- offset ? offset - value : -1) < 0)
- goto error;
-
- if (offset != NULL &&
- strstr(offset, ",server") != NULL)
- def->source->data.nix.listen = true;
- }
- break;
- }
-
- return def;
-
- error:
- virDomainChrDefFree(def);
- return NULL;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index f7112bc6ee..ad6e293e57 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -30,5 +30,3 @@
/* helper functions to get the dom id from a sexpr */
int xenGetDomIdFromSxprString(const char *sexpr, int *id);
int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
-
-virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty);
--
2.21.0
7:28 a.m.
New subject: [libvirt] [PATCH 11/14] xen: Move xenParseSxprChar to xen_common
On Wed, Jul 03, 2019 at 02:38:03PM +0200, Peter Krempa wrote:
It's the only place where it's used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 1 -
src/xenconfig/xen_common.c | 146 +++++++++++++++++++++++++++++++++++++
src/xenconfig/xen_sxpr.c | 146 -------------------------------------
src/xenconfig/xen_sxpr.h | 2 -
4 files changed, 146 insertions(+), 149 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 12/14] xen: drop xen_sxpr.(c|h)
The files are now completely unused. Remove them.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 4 ---
src/xenconfig/Makefile.inc.am | 2 --
src/xenconfig/xen_sxpr.c | 64 -----------------------------------
src/xenconfig/xen_sxpr.h | 32 ------------------
src/xenconfig/xenxs_private.h | 1 -
5 files changed, 103 deletions(-)
delete mode 100644 src/xenconfig/xen_sxpr.c
delete mode 100644 src/xenconfig/xen_sxpr.h
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index ddaecd6850..6e2e578b15 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -2,10 +2,6 @@
# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via
WITH_LIBXL.
#
-# xenconfig/xen_sxpr.h
-xenGetDomIdFromSxpr;
-xenGetDomIdFromSxprString;
-
# xenconfig/xen_xm.h
xenFormatXM;
xenParseXM;
diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
index cd751029d2..5785b49268 100644
--- a/src/xenconfig/Makefile.inc.am
+++ b/src/xenconfig/Makefile.inc.am
@@ -4,8 +4,6 @@ XENCONFIG_SOURCES = \
xenconfig/xenxs_private.h \
xenconfig/xen_common.c \
xenconfig/xen_common.h \
- xenconfig/xen_sxpr.c \
- xenconfig/xen_sxpr.h \
xenconfig/xen_xm.c \
xenconfig/xen_xm.h \
$(NULL)
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
deleted file mode 100644
index f087464c4d..0000000000
--- a/src/xenconfig/xen_sxpr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * xen_sxpr.c: Xen SEXPR parsing functions
- *
- * Copyright (C) 2010-2016 Red Hat, Inc.
- * Copyright (C) 2011 Univention GmbH
- * Copyright (C) 2005 Anthony Liguori <aliguori(a)us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- */
-
-#include <config.h>
-
-#include "internal.h"
-#include "virerror.h"
-#include "virconf.h"
-#include "viralloc.h"
-#include "viruuid.h"
-#include "virlog.h"
-#include "count-one-bits.h"
-#include "xenxs_private.h"
-#include "xen_sxpr.h"
-#include "virstoragefile.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_SEXPR
-
-VIR_LOG_INIT("xenconfig.xen_sxpr");
-
-/* Get a domain id from a S-expression string */
-int xenGetDomIdFromSxprString(const char *sexpr, int *id)
-{
- struct sexpr *root = string2sexpr(sexpr);
- int ret;
-
- *id = -1;
-
- if (!root)
- return -1;
-
- ret = xenGetDomIdFromSxpr(root, id);
- sexpr_free(root);
- return ret;
-}
-
-/* Get a domain id from a S-expression */
-int xenGetDomIdFromSxpr(const struct sexpr *root, int *id)
-{
- const char * tmp = sexpr_node(root, "domain/domid");
-
- *id = tmp ? sexpr_int(root, "domain/domid") : -1;
- return 0;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
deleted file mode 100644
index ad6e293e57..0000000000
--- a/src/xenconfig/xen_sxpr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * xen_sxpr.h: Xen SEXPR parsing functions
- *
- * Copyright (C) 2006-2008, 2010, 2012 Red Hat, Inc.
- * Copyright (C) 2011 Univention GmbH
- * Copyright (C) 2005,2006
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- */
-
-#pragma once
-
-#include "internal.h"
-#include "virconf.h"
-#include "domain_conf.h"
-#include "virsexpr.h"
-
-/* helper functions to get the dom id from a sexpr */
-int xenGetDomIdFromSxprString(const char *sexpr, int *id);
-int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h
index 79909aba2f..2b0877d67e 100644
--- a/src/xenconfig/xenxs_private.h
+++ b/src/xenconfig/xenxs_private.h
@@ -24,7 +24,6 @@
#include "internal.h"
#include <xen/xen.h>
-#include "xen_sxpr.h"
/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
* headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS.
--
2.21.0
7:30 a.m.
New subject: [libvirt] [PATCH 12/14] xen: drop xen_sxpr.(c|h)
On Wed, Jul 03, 2019 at 02:38:04PM +0200, Peter Krempa wrote:
The files are now completely unused. Remove them.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 4 ---
src/xenconfig/Makefile.inc.am | 2 --
src/xenconfig/xen_sxpr.c | 64 -----------------------------------
src/xenconfig/xen_sxpr.h | 32 ------------------
src/xenconfig/xenxs_private.h | 1 -
5 files changed, 103 deletions(-)
delete mode 100644 src/xenconfig/xen_sxpr.c
delete mode 100644 src/xenconfig/xen_sxpr.h
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 13/14] util: Drop virsexpr module
There are no users any more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
po/POTFILES | 1 -
src/libvirt_private.syms | 18 --
src/util/Makefile.inc.am | 2 -
src/util/virsexpr.c | 608 ---------------------------------------
src/util/virsexpr.h | 66 -----
5 files changed, 695 deletions(-)
delete mode 100644 src/util/virsexpr.c
delete mode 100644 src/util/virsexpr.h
diff --git a/po/POTFILES b/po/POTFILES
index 8017712ff4..23f24ed76f 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -256,7 +256,6 @@ src/util/virscsi.c
src/util/virscsihost.c
src/util/virscsivhost.c
src/util/virsecret.c
-src/util/virsexpr.c
src/util/virsocketaddr.c
src/util/virstorageencryption.c
src/util/virstoragefile.c
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b8772d2895..0545c08428 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2878,24 +2878,6 @@ virSecretLookupFormatSecret;
virSecretLookupParseSecret;
-# util/virsexpr.h
-sexpr2string;
-sexpr_append;
-sexpr_cons;
-sexpr_float;
-sexpr_fmt_node;
-sexpr_free;
-sexpr_has;
-sexpr_int;
-sexpr_lookup;
-sexpr_nil;
-sexpr_node;
-sexpr_node_copy;
-sexpr_string;
-sexpr_u64;
-string2sexpr;
-
-
# util/virsocketaddr.h
virSocketAddrBroadcast;
virSocketAddrBroadcastByPrefix;
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index c757f5a6ae..a47f333a98 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -179,8 +179,6 @@ UTIL_SOURCES = \
util/virseclabel.h \
util/virsecret.c \
util/virsecret.h \
- util/virsexpr.c \
- util/virsexpr.h \
util/virsocketaddr.c \
util/virsocketaddr.h \
util/virstorageencryption.c \
diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
deleted file mode 100644
index bfac747f63..0000000000
--- a/src/util/virsexpr.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * virsexpr.c : S-Expression routines to communicate with the Xen Daemon
- *
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * Copyright (C) 2005 Anthony Liguori <aliguori(a)us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- */
-
-#include <config.h>
-
-#include "c-ctype.h"
-
-#include "virerror.h"
-#include "virsexpr.h"
-#include "viralloc.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_SEXPR
-
-
-/**
- * sexpr_new:
- *
- * Create a new S-Expression
- *
- * Returns the new node or NULL in case of memory allocation error
- */
-static struct sexpr *
-sexpr_new(void)
-{
- struct sexpr *ret;
-
- if (VIR_ALLOC(ret) < 0)
- return NULL;
- ret->kind = SEXPR_NIL;
- return ret;
-}
-
-/**
- * sexpr_free:
- * @sexpr: the S-Expression pointer
- *
- * Free an S-Expression
- */
-void
-sexpr_free(struct sexpr *sexpr)
-{
- int serrno = errno;
-
- if (sexpr == NULL)
- return;
-
- switch (sexpr->kind) {
- case SEXPR_CONS:
- sexpr_free(sexpr->u.s.car);
- sexpr_free(sexpr->u.s.cdr);
- break;
- case SEXPR_VALUE:
- VIR_FREE(sexpr->u.value);
- break;
- case SEXPR_NIL:
- break;
- }
-
- VIR_FREE(sexpr);
-
- errno = serrno;
-}
-
-/**
- * sexpr_nil:
- *
- * Provide a NIL S-Expression (the pointer is not shared so NIL equality
- * testing won't work at the pointer level).
- *
- * Returns a new NIL S-Expression of NULL in case of error.
- */
-struct sexpr *
-sexpr_nil(void)
-{
- return sexpr_new();
-}
-
-/**
- * sexpr_string:
- * @str: the input string, assumed to be UTF-8
- * @len: the length in bytes of the input
- *
- * Parse the input S-Expression and return a pointer to the result
- *
- * Returns the S-Expression pointer or NULL in case of error
- */
-struct sexpr *
-sexpr_string(const char *str, ssize_t len)
-{
- struct sexpr *ret = sexpr_new();
-
- if (ret == NULL)
- return ret;
- ret->kind = SEXPR_VALUE;
-
- if (VIR_STRNDUP(ret->u.value, str, len) < 0)
- VIR_FREE(ret);
-
- return ret;
-}
-
-/**
- * sexpr_cons:
- * @car: the left operand
- * @cdr: the right operand
- *
- * Implement the CONS operation assembling 2 existing S-Expressions.
- * Note that in case of error the input data are not freed.
- *
- * Returns the resulting S-Expression pointer or NULL in case of error.
- */
-struct sexpr *
-sexpr_cons(const struct sexpr *car, const struct sexpr *cdr)
-{
- struct sexpr *ret = sexpr_new();
-
- if (ret == NULL)
- return ret;
- ret->kind = SEXPR_CONS;
- ret->u.s.car = (struct sexpr *) car;
- ret->u.s.cdr = (struct sexpr *) cdr;
-
- return ret;
-}
-
-/**
- * append:
- * @lst: an existing list
- * @value: the value
- *
- * Internal operation appending a value at the end of an existing list
- */
-static int
-append(struct sexpr *lst, const struct sexpr *value)
-{
- struct sexpr *nil = sexpr_nil();
-
- if (nil == NULL)
- return -1;
-
- while (lst->kind != SEXPR_NIL)
- lst = lst->u.s.cdr;
-
- lst->kind = SEXPR_CONS;
- lst->u.s.car = (struct sexpr *) value;
- lst->u.s.cdr = nil;
-
- return 0;
-}
-
-/**
- * @lst: an existing list
- * @value: the value
- *
- * Append a value at the end of an existing list
- *
- * Returns lst or NULL in case of error
- */
-struct sexpr *
-sexpr_append(struct sexpr *lst, const struct sexpr *value)
-{
- if (lst == NULL)
- return NULL;
- if (value == NULL)
- return lst;
- if (append(lst, value) < 0)
- return NULL;
- return lst;
-}
-
-/**
- * sexpr2string:
- * @sexpr: an S-Expression pointer
- * @buffer: the output buffer
- *
- * Serialize the S-Expression in the buffer.
- *
- * Returns 0 on success, -1 on error.
- */
-int
-sexpr2string(const struct sexpr *sexpr, virBufferPtr buffer)
-{
- if ((sexpr == NULL) || (buffer == NULL))
- return -1;
-
- switch (sexpr->kind) {
- case SEXPR_CONS:
- virBufferAddChar(buffer, '(');
-
- if (sexpr2string(sexpr->u.s.car, buffer) < 0)
- return -1;
-
- while (sexpr->u.s.cdr->kind != SEXPR_NIL) {
- sexpr = sexpr->u.s.cdr;
-
- virBufferAddChar(buffer, ' ');
-
- if (sexpr2string(sexpr->u.s.car, buffer) < 0)
- return -1;
- }
-
- virBufferAddChar(buffer, ')');
- break;
- case SEXPR_VALUE:
- if (strchr(sexpr->u.value, ' ') ||
- strchr(sexpr->u.value, ')') ||
- strchr(sexpr->u.value, '('))
- virBufferAsprintf(buffer, "'%s'", sexpr->u.value);
- else
- virBufferAdd(buffer, sexpr->u.value, -1);
-
- break;
- case SEXPR_NIL:
- virBufferAddLit(buffer, "()");
- break;
- default:
- virReportError(VIR_ERR_SEXPR_SERIAL,
- _("unknown s-expression kind %d"), sexpr->kind);
- return -1;
- }
-
- return 0;
-}
-
-#define IS_SPACE(c) ((c == 0x20) || (c == 0x9) || (c == 0xD) || (c == 0xA))
-
-static const char *
-trim(const char *string)
-{
- while (IS_SPACE(*string))
- string++;
- return string;
-}
-
-/**
- * _string2sexpr:
- * @buffer: a zero terminated buffer containing an S-Expression in UTF-8
- * @end: pointer to an index in the buffer for the already parsed bytes
- *
- * Internal routine implementing the parse of S-Expression
- * Note that failure in this function is catastrophic. If it returns
- * NULL, you've leaked memory and you're currently OOM. It will always
- * parse an SEXPR given a buffer
- *
- * Returns a pointer to the resulting parsed S-Expression, or NULL in case of
- * hard error.
- */
-static struct sexpr *
-_string2sexpr(const char *buffer, size_t * end)
-{
- const char *ptr = buffer + *end;
- struct sexpr *ret = sexpr_new();
-
- if (ret == NULL)
- return NULL;
-
- ptr = trim(ptr);
-
- if (ptr[0] == '(') {
- ret->kind = SEXPR_NIL;
-
- ptr = trim(ptr + 1);
- while (*ptr && *ptr != ')') {
- struct sexpr *tmp;
- size_t tmp_len = 0;
-
- tmp = _string2sexpr(ptr, &tmp_len);
- if (tmp == NULL)
- goto error;
- if (append(ret, tmp) < 0) {
- sexpr_free(tmp);
- goto error;
- }
- ptr = trim(ptr + tmp_len);
- }
-
- if (*ptr == ')')
- ptr++;
- } else {
- const char *start;
-
- if (*ptr == '\'') {
- ptr++;
- start = ptr;
-
- while (*ptr && *ptr != '\'') {
- if (*ptr == '\\' && ptr[1])
- ptr++;
- ptr++;
- }
-
- if (VIR_STRNDUP(ret->u.value, start, ptr - start) < 0)
- goto error;
-
- if (*ptr == '\'')
- ptr++;
- } else {
- start = ptr;
-
- while (*ptr && !c_isspace(*ptr)
- && *ptr != ')' && *ptr != '(') {
- ptr++;
- }
-
- if (VIR_STRNDUP(ret->u.value, start, ptr - start) < 0)
- goto error;
- }
-
- ret->kind = SEXPR_VALUE;
- if (ret->u.value == NULL)
- goto error;
- }
-
- *end = ptr - buffer;
-
- return ret;
-
- error:
- sexpr_free(ret);
- return NULL;
-}
-
-/**
- * string2sexpr:
- * @buffer: a zero terminated buffer containing an S-Expression in UTF-8
- *
- * Parse the S-Expression in the buffer.
- * Note that failure in this function is catastrophic. If it returns
- * NULL, you've leaked memory and you're currently OOM. It will always
- * parse an SEXPR given a buffer
- *
- * Returns a pointer to the resulting parsed S-Expression, or NULL in case of
- * hard error.
- */
-struct sexpr *
-string2sexpr(const char *buffer)
-{
- size_t dummy = 0;
-
- return _string2sexpr(buffer, &dummy);
-}
-
-
-/**
- * sexpr_lookup_key:
- * @sexpr: a pointer to a parsed S-Expression
- * @node: a path for the sub expression to lookup in the S-Expression
- *
- * Search a sub expression in the S-Expression based on its path
- * Returns the key node, rather than the data node.
- * NOTE: path are limited to 4096 bytes.
- *
- * Returns the pointer to the sub expression or NULL if not found.
- */
-static struct sexpr *
-sexpr_lookup_key(const struct sexpr *sexpr, const char *node)
-{
- struct sexpr *result = NULL;
- char *buffer, *ptr, *token;
-
- if ((node == NULL) || (sexpr == NULL))
- return NULL;
-
- if (VIR_STRDUP(buffer, node) < 0)
- return NULL;
-
- ptr = buffer;
- token = strsep(&ptr, "/");
-
- if (sexpr->kind != SEXPR_CONS || sexpr->u.s.car->kind != SEXPR_VALUE)
- goto cleanup;
-
- if (STRNEQ(sexpr->u.s.car->u.value, token))
- goto cleanup;
-
- for (token = strsep(&ptr, "/"); token; token = strsep(&ptr,
"/")) {
- const struct sexpr *i;
-
- sexpr = sexpr->u.s.cdr;
- for (i = sexpr; i->kind != SEXPR_NIL; i = i->u.s.cdr) {
- if (i->kind != SEXPR_CONS ||
- i->u.s.car->kind != SEXPR_CONS ||
- i->u.s.car->u.s.car->kind != SEXPR_VALUE) {
- continue;
- }
-
- if (STREQ(i->u.s.car->u.s.car->u.value, token)) {
- sexpr = i->u.s.car;
- break;
- }
- }
-
- if (i->kind == SEXPR_NIL)
- break;
- }
-
- if (token != NULL)
- goto cleanup;
-
- result = (struct sexpr *) sexpr;
-
- cleanup:
- VIR_FREE(buffer);
-
- return result;
-}
-
-/**
- * sexpr_lookup:
- * @sexpr: a pointer to a parsed S-Expression
- * @node: a path for the sub expression to lookup in the S-Expression
- *
- * Search a sub expression in the S-Expression based on its path.
- * NOTE: path are limited to 4096 bytes.
- *
- * Returns the pointer to the sub expression or NULL if not found.
- */
-struct sexpr *
-sexpr_lookup(const struct sexpr *sexpr, const char *node)
-{
- struct sexpr *s = sexpr_lookup_key(sexpr, node);
-
- if (s == NULL)
- return NULL;
-
- if (s->kind != SEXPR_CONS || s->u.s.cdr->kind != SEXPR_CONS)
- return NULL;
-
- return s->u.s.cdr;
-}
-
-/**
- * sexpr_has:
- * @sexpr: a pointer to a parsed S-Expression
- * @node: a path for the sub expression to lookup in the S-Expression
- *
- * Search a sub expression in the S-Expression based on its path.
- * NOTE: path are limited to 4096 bytes.
- * NB, even if the key was found sexpr_lookup may return NULL if
- * the corresponding value was empty
- *
- * Returns true if the key was found, false otherwise
- */
-int
-sexpr_has(const struct sexpr *sexpr, const char *node)
-{
- struct sexpr *s = sexpr_lookup_key(sexpr, node);
-
- if (s == NULL)
- return 0;
-
- if (s->kind != SEXPR_CONS)
- return 0;
-
- return 1;
-}
-
-/**
- * sexpr_node:
- * @sexpr: a pointer to a parsed S-Expression
- * @node: a path for the node to lookup in the S-Expression
- *
- * Search a node value in the S-Expression based on its path
- * NOTE: path are limited to 4096 bytes.
- *
- * Returns the value of the node or NULL if not found.
- */
-const char *
-sexpr_node(const struct sexpr *sexpr, const char *node)
-{
- struct sexpr *n = sexpr_lookup(sexpr, node);
-
- return (n && n->u.s.car->kind == SEXPR_VALUE) ?
n->u.s.car->u.value : NULL;
-}
-
-int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst)
-{
- const char *val = sexpr_node(sexpr, node);
-
- if (val && *val)
- return VIR_STRDUP(*dst, val) < 0 ? -1 : 0;
-
- *dst = NULL;
- return 0;
-}
-
-
-/**
- * sexpr_fmt_node:
- * @sexpr: a pointer to a parsed S-Expression
- * @fmt: a path for the node to lookup in the S-Expression
- * @... extra data to build the path
- *
- * Search a node value in the S-Expression based on its path
- *
- * Returns the value of the node or NULL if not found.
- */
-const char *
-sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...)
-{
- int result;
- va_list ap;
- char *node;
- const char *value;
-
- va_start(ap, fmt);
- result = virVasprintf(&node, fmt, ap);
- va_end(ap);
-
- if (result < 0)
- return NULL;
-
- value = sexpr_node(sexpr, node);
-
- VIR_FREE(node);
-
- return value;
-}
-
-/**
- * sexpr_int:
- * @sexpr: an S-Expression
- * @name: the name for the value
- *
- * convenience function to lookup an int value in the S-Expression
- *
- * Returns the value found or 0 if not found (but may not be an error).
- * This function suffers from the flaw that zero is both a correct
- * return value and an error indicator: careful!
- */
-int
-sexpr_int(const struct sexpr *sexpr, const char *name)
-{
- const char *value = sexpr_node(sexpr, name);
-
- if (value) {
- int val = 0;
- ignore_value(virStrToLong_i(value, NULL, 0, &val));
- return val;
- }
- return 0;
-}
-
-
-/**
- * sexpr_float:
- * @sexpr: an S-Expression
- * @name: the name for the value
- *
- * convenience function to lookup a float value in the S-Expression
- *
- * Returns the value found or 0 if not found (but may not be an error)
- */
-double
-sexpr_float(const struct sexpr *sexpr, const char *name)
-{
- const char *value = sexpr_node(sexpr, name);
-
- if (value) {
- double val = 0;
- ignore_value(virStrToDouble(value, NULL, &val));
- return val;
- }
- return 0;
-}
-
-/**
- * sexpr_u64:
- * @sexpr: an S-Expression
- * @name: the name for the value
- *
- * convenience function to lookup a 64bits unsigned int value in the
- * S-Expression
- *
- * Returns the value found or 0 if not found (but may not be an error)
- */
-uint64_t
-sexpr_u64(const struct sexpr *sexpr, const char *name)
-{
- const char *value = sexpr_node(sexpr, name);
-
- if (value) {
- unsigned long long val = 0;
- ignore_value(virStrToLong_ull(value, NULL, 0, &val));
- return val;
- }
- return 0;
-}
diff --git a/src/util/virsexpr.h b/src/util/virsexpr.h
deleted file mode 100644
index d140659722..0000000000
--- a/src/util/virsexpr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * virsexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon
- *
- * Copyright (C) 2012 Red Hat, Inc.
- * Copyright (C) 2005 Anthony Liguori <aliguori(a)us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- */
-
-#pragma once
-
-#include "internal.h"
-#include "virbuffer.h"
-
-enum sexpr_type {
- SEXPR_NIL,
- SEXPR_CONS,
- SEXPR_VALUE,
-};
-
-struct sexpr {
- enum sexpr_type kind;
- union {
- struct {
- struct sexpr *car;
- struct sexpr *cdr;
- } s;
- char *value;
- } u;
-};
-
-/* conversion to/from strings */
-int sexpr2string(const struct sexpr *sexpr, virBufferPtr buffer);
-struct sexpr *string2sexpr(const char *buffer);
-
-/* constructors and destructors */
-struct sexpr *sexpr_nil(void);
-struct sexpr *sexpr_string(const char *str, ssize_t len);
-struct sexpr *sexpr_cons(const struct sexpr *car, const struct sexpr *cdr);
-struct sexpr *sexpr_append(struct sexpr *lst, const struct sexpr *item);
-void sexpr_free(struct sexpr *sexpr);
-
-/* lookup in S-Expressions */
-const char *sexpr_node(const struct sexpr *sexpr, const char *node);
-int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst);
-const char *sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...)
- ATTRIBUTE_FMT_PRINTF(2,3);
-struct sexpr *sexpr_lookup(const struct sexpr *sexpr, const char *node);
-int sexpr_has(const struct sexpr *sexpr, const char *node);
-
-int sexpr_int(const struct sexpr *sexpr, const char *name);
-double sexpr_float(const struct sexpr *sexpr, const char *name);
-uint64_t sexpr_u64(const struct sexpr *sexpr, const char *name);
--
2.21.0
7:31 a.m.
New subject: [libvirt] [PATCH 13/14] util: Drop virsexpr module
On Wed, Jul 03, 2019 at 02:38:05PM +0200, Peter Krempa wrote:
There are no users any more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
po/POTFILES | 1 -
src/libvirt_private.syms | 18 --
src/util/Makefile.inc.am | 2 -
src/util/virsexpr.c | 608 ---------------------------------------
src/util/virsexpr.h | 66 -----
5 files changed, 695 deletions(-)
delete mode 100644 src/util/virsexpr.c
delete mode 100644 src/util/virsexpr.h
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:38 a.m.
New subject: [libvirt] [PATCH 14/14] news: Mention drop of xen sxpr support
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/news.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/docs/news.xml b/docs/news.xml
index ca1180d3d8..9ba53c4586 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -55,6 +55,17 @@
<release version="v5.6.0" date="unreleased">
<section title="New features">
</section>
+ <section title="Removed features">
+ <change>
+ <summary>
+ xen: Remove sxpr config support
+ </summary>
+ <description>
+ The xend driver was removed a year ago. At this point it doesn't make
+ sense to keep around the sxpr parser.
+ </description>
+ </change>
+ </section>
<section title="Improvements">
</section>
<section title="Bug fixes">
--
2.21.0
7:32 a.m.
New subject: [libvirt] [PATCH 14/14] news: Mention drop of xen sxpr support
On Wed, Jul 03, 2019 at 02:38:06PM +0200, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/news.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/docs/news.xml b/docs/news.xml
index ca1180d3d8..9ba53c4586 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -55,6 +55,17 @@
<release version="v5.6.0" date="unreleased">
<section title="New features">
</section>
+ <section title="Removed features">
+ <change>
+ <summary>
+ xen: Remove sxpr config support
+ </summary>
+ <description>
+ The xend driver was removed a year ago. At this point it doesn't make
+ sense to keep around the sxpr parser.
This is a justification good for the commit message, but not news. How
about:
Remove the sxpr parser a year after the xend driver was removed.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
7:57 a.m.
On Wed, Jul 03, 2019 at 02:37:52PM +0200, Peter Krempa wrote:
The formatter support was unused from the time we dropped xend
support.
Let's drop the formatter too along with all the unused code.
Peter Krempa (14):
tests: Remove xml2sexprtest
xenconfig: Drop sxpr formatter
xenconfig: Move guts of xenFormatSxprSound into xenFormatSound
xen: Move xenFormatSxprChr to xen_common
libxl: Drop support for parsing sxpr format in
libxlConnectDomainXMLFromNative
tests: Drop sexpr2xmltest
xenconfig: Drop unused sexpr parsing infrastructure
xenconfig: Remove pointless label in xenParseSxprSound
xen: Inline xenParseSxprSound into the only caller
xen: Move xenParseSxprVifRate to xen_common
xen: Move xenParseSxprChar to xen_common
xen: drop xen_sxpr.(c|h)
util: Drop virsexpr module
news: Mention drop of xen sxpr support
...
221 files changed, 393 insertions(+), 8907 deletions(-)
Oh, yes, ^this diff is music to my ears.
Erik
5:12 p.m.
On 7/3/19 6:37 AM, Peter Krempa wrote:
The formatter support was unused from the time we dropped xend
support.
Let's drop the formatter too along with all the unused code.
Nice! I see the series has already been reviewed and will only add that AFAICT
the xen community has not supported the sexpr format for years either.
Regards,
Jim
3:51 a.m.
On Mon, Jul 08, 2019 at 22:12:04 +0000, Jim Fehlig wrote:
On 7/3/19 6:37 AM, Peter Krempa wrote:
> The formatter support was unused from the time we dropped xend support.
> Let's drop the formatter too along with all the unused code.
Nice! I see the series has already been reviewed and will only add that AFAICT
the xen community has not supported the sexpr format for years either.
Thanks! I've pushed it now.
1963
days inactive
1969
days old
31 comments
4 participants
participants (4)
-
Erik Skultety -
Jim Fehlig -
Ján Tomko -
Peter Krempa