[PATCH 20/20] qemu: capabilities: Retire QEMU_CAPS_AUDIODEV

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- 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 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c02fef6acd..e4295aa8a9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -620,7 +620,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 395 */ "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */ - "audiodev", /* QEMU_CAPS_AUDIODEV */ + "audiodev", /* X_QEMU_CAPS_AUDIODEV */ "blockdev-backup", /* QEMU_CAPS_BLOCKDEV_BACKUP */ "object.qapified", /* QEMU_CAPS_OBJECT_JSON */ "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */ @@ -3306,7 +3306,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "spice", "gl", QEMU_CAPS_SPICE_GL }, { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL }, - { "vnc", "audiodev", QEMU_CAPS_AUDIODEV }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a409c1272c..14ecdabe60 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -599,7 +599,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 395 */ QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */ - QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ + X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */ QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */ QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 875e491581..51f2dfa246 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -156,7 +156,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 428ecd4f42..93b8e8b8a2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -154,7 +154,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='rotation-rate'/> <flag name='input-linux'/> <flag name='query-display-options'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 725745593c..401aa2d22d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -121,7 +121,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 6a54c44d79..b198448036 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -199,7 +199,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 35998cabf0..e27a250ad4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -166,7 +166,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index b8ddf2e9a8..5ee8feed6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -172,7 +172,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c49c258255..438eb94ca8 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -158,7 +158,6 @@ <flag name='am53c974'/> <flag name='vhost-user-blk'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index ce297f2ef5..12f97ca168 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -206,7 +206,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index e6a3ed5ec0..c53b6054dd 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -80,7 +80,6 @@ <flag name='netdev.vhost-vdpa'/> <flag name='ncr53c90'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index a49650cbcc..ffbc83333a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -208,7 +208,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 42a4418a08..f32d0d6107 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -170,7 +170,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index d0dd058743..d0694c2605 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -174,7 +174,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 25339f86d9..963e742470 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -160,7 +160,6 @@ <flag name='am53c974'/> <flag name='vhost-user-blk'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 30d10236e9..c03b43df0f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -128,7 +128,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 4ff03dbead..805b8acaf2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -209,7 +209,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 2d861da97b..dc3944383f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -173,7 +173,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 06543071aa..84aa09fc76 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -130,7 +130,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 38acee5f18..f089a30a06 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -212,7 +212,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index b03c6bfc24..7ca644202b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -212,7 +212,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 942c0ba169..dd13c1ea4c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -182,7 +182,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 983b54430d..fa3eaab75b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -175,7 +175,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 32f226acbd..af85cb41b2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -212,7 +212,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index f4d7cbdd10..88247e586f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -183,7 +183,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 2f895294de..ad3b50ce23 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -186,7 +186,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 17ea778d38..617c101a5d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -212,7 +212,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 5f5c839fea..8393400779 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -212,7 +212,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='audiodev'/> <flag name='blockdev-backup'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> -- 2.36.1