qemu: caps: Deprecate QEMU_CAPS_BALLOON

The flag is now unused and all qemus supported by libvirt already
support it.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 621f39ae87d08762cc7283302725457559ae8d84..f46dcad8cd1163eb2919fa1977b4b0c1e5de9b12 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1167,8 +1167,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
         if (strstr(help, "-chardev spiceport"))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
     }
-    if (strstr(help, "-balloon"))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON);
     if (strstr(help, "-device")) {
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
         /*
@@ -3234,7 +3232,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index cfda5eed7f426cefc44462c28ecb0a05fad7e7b7..83b8be314a297de1c30c88fbe3c875cd13b203d2 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -81,7 +81,7 @@ typedef enum {
     QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
 
     /* 25 */
-    QEMU_CAPS_BALLOON, /* -balloon available */
+    X_QEMU_CAPS_BALLOON, /* -balloon available */
     QEMU_CAPS_DEVICE, /* Is the new -device arg available */
     QEMU_CAPS_SDL, /* Is the new -sdl arg available */
     QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
index 2e452ea1ef44fc4679d463ed5548f99def10023e..9ea36a660b4aa4e5e2a4c59988083c05bfdf5a0d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index 5ad56aa2d4e5ef7f3981484c8cdf9b7ef278fbe5..8c237eff3439a758a37d2a64f71d3a692a366898 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index d0341fdf0d7f56fb5d1a77916410e02857726a77..fe98a57c1e73ab9e71d0fa8f9ea55123c40d6e3f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index 93ea687e8925eda4f45bf6125407501b4ad0e4e0..6e9ec3e8884f758c903422da73911e5c0e692967 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index c25b076a0639aa229b219b98ba6c3d5ca60c851c..da371a4953ad10aa0ca924c9f0789c5a69a3ecfe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index 30b70e9791aab6a7007fb043000f74743d1ededc..1e2fb6ac00d3534076007ff6c479a98257dc2be6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 59d0323869ca2662ec19d3ef394197bfa2f8d5f4..8175743fd2b0f259c82c15c1c0df91390843f681 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index 0423e9cdd78ad219b98eff618d9de291b76cd7b8..2cdf961eabfa445ab9c4b195e44fd9e513e81700 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index 060ae2511bb3e7b6ba2b4f0e79cabb2549949697..ecaa165f7fa3ffff0367cdf113b6458292e35822 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index 543b633a1c05a22d9b6e398d20a847fb19621c3b..e243f8a92f0bcb9269725a9ff5c3b589e332a0b9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -4,7 +4,6 @@
     <flag name='chardev'/>
     <flag name='enable-kvm'/>
     <flag name='monitor-json'/>
-    <flag name='balloon'/>
     <flag name='device'/>
     <flag name='sdl'/>
     <flag name='smp-topology'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 35fc9c7488b2c21de4049191e43600f434033cf5..26455d5a4c922dd0fa7bd6b0b7973d26f25dc221 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -157,7 +157,6 @@ mymain(void)
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
@@ -183,7 +182,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
@@ -231,7 +229,6 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
@@ -263,7 +260,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
@@ -321,7 +317,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
@@ -376,7 +371,6 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_MONITOR_JSON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
@@ -440,7 +434,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
@@ -519,7 +512,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_BALLOON,
             QEMU_CAPS_DEVICE,
             QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,