[libvirt PATCH 0/2] qemu: Drop QEMU_CAPS_INCOMING_DEFER
This capability is supported even in QEMU 3.1.0 which is the oldest supported version of QEMU. Jiri Denemark (2): qemu: Simplify qemuProcessIncomingDef qemu: Drop QEMU_CAPS_INCOMING_DEFER src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_migration.c | 3 +-- src/qemu/qemu_process.c | 22 ++++++------------- src/qemu/qemu_process.h | 3 +-- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../caps_4.1.0.x86_64.xml | 1 - .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - .../caps_5.0.0.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - 39 files changed, 11 insertions(+), 56 deletions(-) -- 2.35.1
All QEMU releases currently supported by libvirt already understand "-incoming defer". We can drop the code handling "-incoming URI". Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/qemu/qemu_migration.c | 3 +-- src/qemu/qemu_process.c | 22 +++++++--------------- src/qemu/qemu_process.h | 3 +-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 98f82abe7c..30a6202d85 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3040,8 +3040,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, VIR_DEBUG("Received no lockstate"); } - if (incoming->deferredURI && - qemuMigrationDstRun(driver, vm, incoming->deferredURI, + if (qemuMigrationDstRun(driver, vm, incoming->uri, VIR_ASYNC_JOB_MIGRATION_IN) < 0) goto stopjob; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 995737ce86..2e11d24be2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4559,8 +4559,7 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc) return; g_free(inc->address); - g_free(inc->launchURI); - g_free(inc->deferredURI); + g_free(inc->uri); g_free(inc); } @@ -4589,15 +4588,10 @@ qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps, inc->address = g_strdup(listenAddress); - inc->launchURI = qemuMigrationDstGetURI(migrateFrom, fd); - if (!inc->launchURI) + inc->uri = qemuMigrationDstGetURI(migrateFrom, fd); + if (!inc->uri) goto error; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_INCOMING_DEFER)) { - inc->deferredURI = inc->launchURI; - inc->launchURI = g_strdup("defer"); - } - inc->fd = fd; inc->path = path; @@ -7373,12 +7367,11 @@ qemuProcessLaunch(virConnectPtr conn, unsigned long long maxMemLock = 0; VIR_DEBUG("conn=%p driver=%p vm=%p name=%s if=%d asyncJob=%d " - "incoming.launchURI=%s incoming.deferredURI=%s " + "incoming.uri=%s " "incoming.fd=%d incoming.path=%s " "snapshot=%p vmop=%d flags=0x%x", conn, driver, vm, vm->def->name, vm->def->id, asyncJob, - NULLSTR(incoming ? incoming->launchURI : NULL), - NULLSTR(incoming ? incoming->deferredURI : NULL), + NULLSTR(incoming ? incoming->uri : NULL), incoming ? incoming->fd : -1, NULLSTR(incoming ? incoming->path : NULL), snapshot, vmop, flags); @@ -7429,7 +7422,7 @@ qemuProcessLaunch(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(driver, vm, - incoming ? incoming->launchURI : NULL, + incoming ? "defer" : NULL, snapshot, vmop, false, qemuCheckFips(vm), @@ -7856,8 +7849,7 @@ qemuProcessStart(virConnectPtr conn, relabel = true; if (incoming) { - if (incoming->deferredURI && - qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) + if (qemuMigrationDstRun(driver, vm, incoming->uri, asyncJob) < 0) goto stop; } else { /* Refresh state of devices from QEMU. During migration this happens diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 85c197714a..f81bfd930a 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -52,8 +52,7 @@ void qemuProcessReconnectAll(virQEMUDriver *driver); typedef struct _qemuProcessIncomingDef qemuProcessIncomingDef; struct _qemuProcessIncomingDef { char *address; /* address where QEMU is supposed to listen */ - char *launchURI; /* used as a parameter for -incoming command line option */ - char *deferredURI; /* used when calling migrate-incoming QMP command */ + char *uri; /* used when calling migrate-incoming QMP command */ int fd; /* for fd:N URI */ const char *path; /* path associated with fd */ }; -- 2.35.1
The capability is not used anymore since "-incoming defer" is supported by all QEMU versions we care about. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - 36 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 33d1f93204..faf868e076 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -348,7 +348,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "e1000", /* QEMU_CAPS_DEVICE_E1000 */ "virtio-net", /* QEMU_CAPS_DEVICE_VIRTIO_NET */ "gic-version", /* QEMU_CAPS_MACH_VIRT_GIC_VERSION */ - "incoming-defer", /* QEMU_CAPS_INCOMING_DEFER */ + "incoming-defer", /* X_QEMU_CAPS_INCOMING_DEFER */ "virtio-gpu", /* QEMU_CAPS_DEVICE_VIRTIO_GPU */ /* 200 */ @@ -1207,7 +1207,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, - { "migrate-incoming", QEMU_CAPS_INCOMING_DEFER }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b71336d78f..b7bf47c51e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -322,7 +322,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_E1000, /* -device e1000 */ QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */ QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ - QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */ + X_QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */ QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */ /* 200 */ diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 44c502a570..5b6c1510a7 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 528bfc0565..8ca3ac48fe 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -85,7 +85,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index b1b4a01b38..5adf904fc4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -69,7 +69,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 73ebeac373..f60aeb5f40 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 051e5a27f4..c494254c4d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -70,7 +70,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 9286851bda..d2582fa297 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index a2245f39df..4f36186044 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -38,7 +38,6 @@ <flag name='dea-key-wrap'/> <flag name='migration-event'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index aa680a401b..18e5ebd4f4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 8d51f64367..12c5ebe6f3 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index ec547c3a4b..ee536b7b63 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index af33c81cb2..99d1c79dd4 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index d287e792ae..069777a49b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -38,7 +38,6 @@ <flag name='dea-key-wrap'/> <flag name='migration-event'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 380006220b..6b61214a0b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -85,7 +85,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 7a08db471e..4fd02e786d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -72,7 +72,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 2a1c77b73e..2dd66410d1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -67,7 +67,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index dc998ad4df..557949d6d6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index f52df9a820..f301d8a926 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -85,7 +85,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 5dc12846db..3a330ebdc0 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -26,7 +26,6 @@ <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='migration-event'/> - <flag name='incoming-defer'/> <flag name='chardev-file-append'/> <flag name='vserport-change-event'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index a72832f045..53fcbf3417 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -85,7 +85,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index f0c90d25d6..824224302c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -71,7 +71,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 3e55b4321b..1c3121714d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 0c550cd647..873923992d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -69,7 +69,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 517e8c1a93..5e9560d7b7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='dea-key-wrap'/> <flag name='migration-event'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 7c818c6e2a..3998da9253 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -85,7 +85,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index d88e8d2723..51d3628eeb 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 5a6f5bc1e7..2e5d0f197a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='dea-key-wrap'/> <flag name='migration-event'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 84ef615fff..3498d6255b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index bfdd72b790..ddeca62290 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 0ca2dae5e5..5538940372 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -75,7 +75,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 59c08bbc38..bec10e00e0 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 17ceb00ec3..dba5ecaf87 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index b97d4561de..257b0f625d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -75,7 +75,6 @@ <flag name='e1000'/> <flag name='virtio-net'/> <flag name='gic-version'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 320d9572e5..5a502392df 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -72,7 +72,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index cb3e807409..87f9b4068d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -84,7 +84,6 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> - <flag name='incoming-defer'/> <flag name='virtio-gpu'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> -- 2.35.1
On Fri, Apr 08, 2022 at 08:36:59 +0200, Jiri Denemark wrote:
This capability is supported even in QEMU 3.1.0 which is the oldest supported version of QEMU.
Jiri Denemark (2): qemu: Simplify qemuProcessIncomingDef qemu: Drop QEMU_CAPS_INCOMING_DEFER
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (2)
-
Jiri Denemark -
Peter Krempa