From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 22 Aug 2022 14:36:08 +0000 (+0200)
Subject: qemu: retire QEMU_CAPS_CHARDEV_LOGFILE
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=935865e0575207ecd40e4b885540cf0e9bdf1e28;p=libvirt.git

qemu: retire QEMU_CAPS_CHARDEV_LOGFILE

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 496ea50a6d..20cea852e0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -364,7 +364,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "spice-gl", /* QEMU_CAPS_SPICE_GL */
               "qxl.vram64_size_mb", /* QEMU_CAPS_QXL_VRAM64 */
               "qxl-vga.vram64_size_mb", /* X_QEMU_CAPS_QXL_VGA_VRAM64 */
-              "chardev-logfile", /* QEMU_CAPS_CHARDEV_LOGFILE */
+              "chardev-logfile", /* X_QEMU_CAPS_CHARDEV_LOGFILE */
 
               /* 215 */
               "debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
@@ -1576,7 +1576,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
     { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHARDEV_RECONNECT },
-    { "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV_LOGFILE },
     { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
     { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
     { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d855e2ee22..7ae30a711a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -343,7 +343,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_SPICE_GL, /* -spice gl */
     QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
     X_QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
-    QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
+    X_QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
 
     /* 215 */
     X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 94e6ba18c8..e6ae488dfd 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -72,7 +72,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 1165c94978..a9ec45c769 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -68,7 +68,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 280c9fd71f..7b7e643af9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -40,7 +40,6 @@
   <flag name='virtio-input-host'/>
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 95742efbca..8d63da1712 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -90,7 +90,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index a77488b933..0ec294d060 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -74,7 +74,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 4bbfda001f..9bf376ec22 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -69,7 +69,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 8633a18946..41e7a0c045 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -74,7 +74,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 085b12a73d..8ebea40fe7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -90,7 +90,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index a012488a26..399d37218b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -23,7 +23,6 @@
   <flag name='migrate-rdma'/>
   <flag name='vserport-change-event'/>
   <flag name='spice-gl'/>
-  <flag name='chardev-logfile'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 323e11d079..a415a4dd36 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -90,7 +90,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index b27a2688ce..fdf09432a3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -73,7 +73,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 150dbc451e..950161e92f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -68,7 +68,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 9bbc1f8755..f5805a1e3f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -73,7 +73,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a7c8d2df0c..cf83839102 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -39,7 +39,6 @@
   <flag name='virtio-input-host'/>
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 236206e146..24c00ddae6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -90,7 +90,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 8c18d7e368..a3f6196d26 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -72,7 +72,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 50dd02ae53..c9389af189 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -39,7 +39,6 @@
   <flag name='virtio-input-host'/>
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 924fcf0299..24affe0c7c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -89,7 +89,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 9376cd9396..459d064391 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -88,7 +88,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 298088c654..28205f03aa 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -78,7 +78,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 89a0bbed18..8a59a92ed7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -68,7 +68,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 5afa8fd330..85ddd25b6c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -88,7 +88,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index e309018311..f4a0a39e4f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -78,7 +78,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index c4d98ab016..e435624f0e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -74,7 +74,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7059ea0538..61c4780950 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -88,7 +88,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index e8d4bb8484..b6e1aacb67 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -88,7 +88,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='chardev-logfile'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>