qemu: capabilities: Retire QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-21 19:02:25 +00:00 · 2022-02-10 12:55:47 +01:00 · 2022-02-10 12:55:47 +01:00 · b72318f36d
commit b72318f36d
parent 47b6829edc
36 changed files with 2 additions and 37 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -496,7 +496,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "blockdev-del", /* QEMU_CAPS_BLOCKDEV_DEL */
              "vmgenid", /* QEMU_CAPS_DEVICE_VMGENID */
              "vhost-vsock", /* QEMU_CAPS_DEVICE_VHOST_VSOCK */
-              "chardev-fd-pass", /* QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */
+              "chardev-fd-pass", /* X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */

              /* 305 */
              "tpm-emulator", /* QEMU_CAPS_DEVICE_TPM_EMULATOR */
@ -3297,7 +3297,6 @@ struct virQEMUCapsCommandLineProps {
 * in qemu and thus isn't being properly extended. Other means to detect
 * features should be used if possible. */
 static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
-    { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -471,7 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
    QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */
    QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
-    QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */
+    X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */

    /* 305 */
    QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -111,7 +111,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -151,7 +151,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -116,7 +116,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -118,7 +118,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -117,7 +117,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -117,7 +117,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -86,7 +86,6 @@
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='vfio-ap'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -150,7 +150,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -150,7 +150,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -118,7 +118,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -118,7 +118,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -86,7 +86,6 @@
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -151,7 +151,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -120,7 +120,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -120,7 +120,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -117,7 +117,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -151,7 +151,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -50,7 +50,6 @@
  <flag name='memory-backend-file.discard-data'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='egl-headless'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -150,7 +150,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -119,7 +119,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -118,7 +118,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -115,7 +115,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -84,7 +84,6 @@
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -150,7 +150,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -120,7 +120,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -84,7 +84,6 @@
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -149,7 +149,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -127,7 +127,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -118,7 +118,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -127,7 +127,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
  <flag name='egl-headless'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -124,7 +124,6 @@
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
  <flag name='vhost-vsock'/>
-  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>