External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: caps: Deprecate QEMU_CAPS_BALLOON

Browse Source 
The flag is now unused and all qemus supported by libvirt already
support it.
This commit is contained in:
Peter Krempa 2016-04-06 14:29:26 +02:00
parent c1300176f7
commit 2242a00822
13 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_capabilities.c
View File

@ -1167,8 +1167,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
if (strstr(help, "-chardev spiceport")) if (strstr(help, "-chardev spiceport"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
} }
if (strstr(help, "-balloon"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON);
if (strstr(help, "-device")) { if (strstr(help, "-device")) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
/* /*
@ -3234,7 +3232,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);

2
src/qemu/qemu_capabilities.h
View File

@ -81,7 +81,7 @@ typedef enum {
QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
/* 25 */ /* 25 */
QEMU_CAPS_BALLOON, /* -balloon available */ X_QEMU_CAPS_BALLOON, /* -balloon available */
QEMU_CAPS_DEVICE, /* Is the new -device arg available */ QEMU_CAPS_DEVICE, /* Is the new -device arg available */
QEMU_CAPS_SDL, /* Is the new -sdl arg available */ QEMU_CAPS_SDL, /* Is the new -sdl arg available */
QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */

1
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_2.4.0-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_2.5.0-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

1
tests/qemucapabilitiesdata/caps_2.6.0-1.caps
View File

@ -4,7 +4,6 @@
<flag name='chardev'/> <flag name='chardev'/>
<flag name='enable-kvm'/> <flag name='enable-kvm'/>
<flag name='monitor-json'/> <flag name='monitor-json'/>
<flag name='balloon'/>
<flag name='device'/> <flag name='device'/>
<flag name='sdl'/> <flag name='sdl'/>
<flag name='smp-topology'/> <flag name='smp-topology'/>

8
tests/qemuhelptest.c
View File

@ -157,7 +157,6 @@ mymain(void)
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_SDL, QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC, QEMU_CAPS_RTC,
@ -183,7 +182,6 @@ mymain(void)
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV, QEMU_CAPS_NETDEV,
@ -231,7 +229,6 @@ mymain(void)
QEMU_CAPS_MEM_PATH, QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL, QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC, QEMU_CAPS_RTC,
@ -263,7 +260,6 @@ mymain(void)
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV, QEMU_CAPS_NETDEV,
@ -321,7 +317,6 @@ mymain(void)
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV, QEMU_CAPS_NETDEV,
@ -376,7 +371,6 @@ mymain(void)
QEMU_CAPS_MEM_PATH, QEMU_CAPS_MEM_PATH,
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_BALLOON,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
@ -440,7 +434,6 @@ mymain(void)
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV, QEMU_CAPS_NETDEV,
@ -519,7 +512,6 @@ mymain(void)
QEMU_CAPS_CHARDEV, QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_BALLOON,
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE,
QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV, QEMU_CAPS_NETDEV,