On Wed, Sep 12, 2018 at 09:09:26AM -0400, John Ferlan wrote:
On 09/12/2018 08:48 AM, Andrea Bolognani wrote:No longer needed since we bumped our minimum QEMU version to 1.5.0. Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-)Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
This series does not touch the .replies files. The .xml conflicts only adding new capabilities are trivial to resolve: http://repo.or.cz/tomko-tools.git/blob/HEAD:/rcc Jano
There's a series to use - memfd from Marc-Andre Laurent that gets impacted. Yeah - I know - first to merge wins... John -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
