Re: [libvirt] [PATCH 00/16] Xen: remove xend config version

On 15.12.2015 22:32, Jim Fehlig wrote: > Hi All, > > Ian Campbell recently attempted [1] to fix and issue around MAX_VIRT_VPUS > on ARM that required adding a new XEND_CONFIG_VERSION. After some > discussion [2] we decided to drop support for all of the old xend config > versions and go with the version supported in Xen 4.0, since the xl syntax > was originally based on (and intended to be compatible with) xm circa that > point in time. > > This series removes all traces of xend config version from the codebase, > essentially removing support for Xen 3.x. Hopefully I succeeding in making > the rather large series reviewable. The series is also available on the > remove-xend-config-version branch of my libvirt github clone [2]. > > [1] https://www.redhat.com/archives/libvir-list/2015-November/msg01153.html > [2] https://www.redhat.com/archives/libvir-list/2015-December/msg00148.html > [3] https://github.com/jfehlig/libvirt/tree/remove-xend-config-version > > Jim Fehlig (16): > Xen: tests: remove old xm config tests > Xen: tests: remove net-ioemu xm config test > Xen: tests: remove old sexpr2xml tests > Xen: tests: remove old xml2sexpr tests > Xen: tests: use latest XEND_CONFIG_VERSION in xm/xl tests > Xen: xenconfig: remove XEND_CONFIG_VERSION in common code > Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_xm > Xen: xenconfig: remove xendConfigVersion from public functions > Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests > Xen: xenconfig: remove disks from '(image)' sexpr > Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests > Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_sxpr > Xen: xen_driver: remove use of XEND_CONFIG_VERSION > Xen: xend: remove use of XEND_CONFIG_VERSION > Xen: xenconfig: remove xendConfigVersion from public sexpr functions > Xen: remove xendConfigVersion from driver private struct > > src/libxl/libxl_driver.c | 9 +- > src/xen/xen_driver.c | 296 ++++----------- > src/xen/xen_driver.h | 2 - > src/xen/xend_internal.c | 224 ++--------- > src/xen/xm_internal.c | 9 +- > src/xenconfig/xen_common.c | 211 ++++------- > src/xenconfig/xen_common.h | 7 +- > src/xenconfig/xen_sxpr.c | 411 ++++++--------------- > src/xenconfig/xen_sxpr.h | 21 +- > src/xenconfig/xen_xl.c | 9 +- > src/xenconfig/xen_xl.h | 7 +- > src/xenconfig/xen_xm.c | 57 +-- > src/xenconfig/xen_xm.h | 5 +- > src/xenconfig/xenxs_private.h | 8 - > tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- > .../sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 4 +- > .../sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- > tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr | 9 - > tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 48 --- > .../sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 4 +- > .../sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 4 +- > .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 5 +- > .../sexpr2xml-fv-serial-dev-2-ports.xml | 4 +- > .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 4 +- > .../sexpr2xml-fv-serial-dev-2nd-port.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr | 7 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr | 7 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 4 +- > .../sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 4 +- > .../sexpr2xml-fv-serial-tcp-telnet.sexpr | 3 +- > .../sexpr2xml-fv-serial-tcp-telnet.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr | 3 +- > tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 2 + > tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- > tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 4 +- > tests/sexpr2xmldata/sexpr2xml-fv.xml | 4 +- > tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- > tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr | 9 - > tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 34 -- > tests/sexpr2xmltest.c | 130 ++++--- > .../test-fullvirt-direct-kernel-boot.cfg | 3 +- > .../test-fullvirt-direct-kernel-boot.xml | 2 +- > tests/xlconfigdata/test-fullvirt-multiusb.cfg | 3 +- > tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- > tests/xlconfigdata/test-new-disk.cfg | 3 +- > tests/xlconfigdata/test-new-disk.xml | 2 +- > tests/xlconfigdata/test-spice-features.cfg | 3 +- > tests/xlconfigdata/test-spice-features.xml | 2 +- > tests/xlconfigdata/test-spice.cfg | 3 +- > tests/xlconfigdata/test-spice.xml | 2 +- > tests/xlconfigtest.c | 29 +- > tests/xmconfigdata/test-escape-paths.cfg | 5 +- > tests/xmconfigdata/test-escape-paths.xml | 2 +- > .../xmconfigdata/test-fullvirt-default-feature.cfg | 5 +- > .../xmconfigdata/test-fullvirt-default-feature.xml | 2 +- > tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- > tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- > tests/xmconfigdata/test-fullvirt-localtime.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- > tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 25 -- > tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 49 --- > tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 3 + > tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- > tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- > tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 26 -- > tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 49 --- > tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- > .../test-fullvirt-serial-dev-2-ports.cfg | 5 +- > .../test-fullvirt-serial-dev-2-ports.xml | 2 +- > .../test-fullvirt-serial-dev-2nd-port.cfg | 5 +- > .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-file.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-null.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- > .../test-fullvirt-serial-tcp-telnet.cfg | 5 +- > .../test-fullvirt-serial-tcp-telnet.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- > tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- > tests/xmconfigdata/test-fullvirt-sound.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- > tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- > tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- > tests/xmconfigdata/test-fullvirt-utc.cfg | 5 +- > tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- > tests/xmconfigdata/test-no-source-cdrom.cfg | 5 +- > tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- > .../test-paravirt-old-pvfb-vncdisplay.cfg | 18 - > .../test-paravirt-old-pvfb-vncdisplay.xml | 36 -- > tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 17 - > tests/xmconfigdata/test-paravirt-old-pvfb.xml | 36 -- > tests/xmconfigdata/test-pci-devs.cfg | 5 +- > tests/xmconfigdata/test-pci-devs.xml | 2 +- > tests/xmconfigtest.c | 94 +++-- > tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 4 +- > tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 2 +- > .../xml2sexpr-disk-block-shareable.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 2 +- > .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 2 +- > .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 2 +- > .../xml2sexpr-disk-drv-blktap-raw.sexpr | 2 +- > .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 2 +- > .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 2 +- > .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-escape.sexpr | 6 +- > tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 10 +- > .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 5 +- > tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 9 - > tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml | 31 -- > .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 5 +- > .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 10 +- > .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 +- > .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 13 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 13 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 10 +- > .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 10 +- > .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 4 +- > tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 4 +- > tests/xml2sexprdata/xml2sexpr-fv.sexpr | 10 +- > tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 3 +- > tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 3 +- > tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 3 +- > .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 6 +- > tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- > .../xml2sexpr-pv-bootloader-cmdline.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 2 +- > tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr | 6 +- > tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 3 +- > .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 3 +- > tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 3 +- > tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 10 - > tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml | 23 -- > tests/xml2sexprdata/xml2sexpr-pv.sexpr | 3 +- > tests/xml2sexprtest.c | 120 +++--- > 193 files changed, 919 insertions(+), 1833 deletions(-) > delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr > delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml > delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr > delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml > delete mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.cfg > delete mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.xml > delete mode 100755 tests/xmconfigdata/test-fullvirt-old-cdrom.cfg > delete mode 100644 tests/xmconfigdata/test-fullvirt-old-cdrom.xml > delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg > delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml > delete mode 100755 tests/xmconfigdata/test-paravirt-old-pvfb.cfg > delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb.xml > delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr > delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml > delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr > delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml > ACK series