]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
authorPeter Krempa <pkrempa@redhat.com>
Thu, 10 Feb 2022 11:55:47 +0000 (12:55 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 4 Apr 2022 10:26:59 +0000 (12:26 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
36 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml

index a5bb0e29e4c467dc06e0d66c67b840073dd3046a..73886e600783a21cf5c4874a3203c0ea8575cc0e 100644 (file)
@@ -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 },
index 6476ec074628a77dee68c27af6e6eefeb3ff2671..8d97d05cf8afe0340c84e3945d1afa4884dad125 100644 (file)
@@ -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 */
index 08ae7072d5f0af26b3cb86aadeda7961df6e5b5f..3b2cffbafeb9dc22d9f61052b61a85fe0a909634 100644 (file)
   <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'/>
index c342862b9ab5237434ecade445de3b8f76f46d54..53c3ee16d7cdfe727fb4deb403d06c1f27db1a3e 100644 (file)
   <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'/>
index 8a1fbd1069748092cb83875237c6c2d45c4dbfdc..379b065b3770de5bc75f81e25693373334143712 100644 (file)
   <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'/>
index 086dd4b04afbe74b228cc4bfe172064f8292b6b9..65266a18a3f86706d6cb51972c0e718dedb3a0de 100644 (file)
   <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'/>
index a16bc7fac2ff2bf4eda868144a3645dcbdf6bc39..1a7ed270a6ef2c7cd9140d642f5adcb71d0218c0 100644 (file)
   <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'/>
index f960e381a22420ce66bc5250f4d812ef745ea76b..2100b5846d6c42b5a3dc3165a6df2466b9336f11 100644 (file)
   <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'/>
index 2aec9b92dd1e26ddbbe3a879c024c61f491b246b..7694a2ff39f3f2c960ef903f37bb0d6cb7c0494a 100644 (file)
@@ -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'/>
index 33735f14d002fd4444c575fe1884d21ad774c41f..8762ab983472420183387cba8571341cd970fab9 100644 (file)
   <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'/>
index 6bb750d071352337fe6739cb56ff9bd842690b6a..235b5be07ec4a6301401de318570314ea7ac80c3 100644 (file)
   <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'/>
index 86c2445f459d8c0c28374424123c8457b5d4c622..af0ef7c2d73b4c0b7ac3c808665dbc71334a1ac4 100644 (file)
   <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'/>
index aa269ee0da31643d87c935b099b2e198d18edf09..2218c60c8bee705fd0fbc8a40eaac6d86b1ce4db 100644 (file)
   <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'/>
index ad6976dd1f000326afef610405c992bf82c51be3..5303ea614a9ab92a56474e149fdba7c7f8dadf3c 100644 (file)
@@ -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'/>
index 290f50207a3ad09025f9959a94d51e8e4ce381fa..48edbcb7d1a7226c7f1608aa99dfb8d591bb4071 100644 (file)
   <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'/>
index 4d85bb41dd367b3ba338f5bd0c26f9efd977b75c..69fcc15f048d6e0c68b8be0562a5e71a9ca48c0b 100644 (file)
   <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'/>
index d302db4461ed7677d1fd4263d8d10cdd048431c8..ec241007d691857a4d56230de3baff2faef3bce7 100644 (file)
   <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'/>
index 961940e5368cfbcf70369a0402c6c4d7882d2365..da1f81defba02cf0591641400caef3a9751a64c6 100644 (file)
   <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'/>
index 4dc2312182f7c69211fed9fd0d95696b949e02e4..4c8042909b7502a18dc244958cb17db89b279afd 100644 (file)
   <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'/>
index 7de7c291f51bc522ced87a352c351159ab1b5bbf..4d295a87232dffa8c7e201deca09a4ab4e044f78 100644 (file)
@@ -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'/>
index d1859659ac2c52f6dea17394d9365026cb4b407b..d90404ba3a000ed931564e0b81faeba11526e10a 100644 (file)
   <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'/>
index 3611b06e49c5883987f2d3967e37fffe2f1f13bc..cca41d2fd8ceeb3b4a27fcfac6673d7b5cacc372 100644 (file)
   <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'/>
index 01b976aa6fa761a6e208fc1ada6e0671277f9761..ea7d0452407d07836f4cb1b16427886b638c7ee4 100644 (file)
   <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'/>
index 70517a3199ceb88ada0dcd594828eadd98b3b9cc..1357a547513bb37ecf92f53578d44db89ff7fbf8 100644 (file)
   <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'/>
index 60370ad434f40493cf0d04267e35282e434b1ea7..ca01b6ac03f2b9d4d4547002095f1d2adb4ac2bc 100644 (file)
@@ -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'/>
index 7bb5cf5f42d042c6b37f3ee44b773bdf96a3271a..5751524a97cb699fbcde80b1535b2ab3f04bf975 100644 (file)
   <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'/>
index 64e0efc89af3df1424c5ac92101f33c9aee51706..ff9d4498f43a19170bf227f3bc16612c984f8050 100644 (file)
   <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'/>
index 8f1212ec622d7eff8855a60ef15b85fc691f1e5f..1f80794c7463806083f977245677caf92594ebe6 100644 (file)
@@ -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'/>
index 6bd8b8856f75ae75a27cf7c4591294e31e9de5f6..0f1db7a9b38c0bfb1f3fb1db3147e216bfa85088 100644 (file)
   <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'/>
index 390aaeab67d254bf7f52ff1c18702075d013f5be..4b28a8137dade38a7ce0eb9198ee5ba8464c840b 100644 (file)
   <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'/>
index 884fdd738da4e60439776cd115b679fdb45b90e7..c50105ad3790bfcfbd055a3899c832cf6cfa6298 100644 (file)
   <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'/>
index f93221774978745c6549ec6aac633f1f06f66e65..ad222c8678ebd2839a32eb10cf5dc56a3237ee9f 100644 (file)
   <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'/>
index c24c0dc797c3ed86362c9c4be61c2d12fe69c7f6..083e9eb86743c424df5076c6c5f8408d024261ab 100644 (file)
   <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'/>
index 742afc24b066272b46a8af51831255eee361ea12..cc1cad0ec37b55711df33d8aaf92d67f744dbe99 100644 (file)
   <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'/>
index edbf40f04879c227f7b7e9aafdaa316af137f908..b3dd120f591d5c33927165fd6f5345ebc46c6d0c 100644 (file)
   <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'/>
index a6b9c2fdd45c7fd05db15de9583258373acd0c67..6784397bc4d60442f8595b77e8a6043b7ddebb40 100644 (file)
   <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'/>