[libvirt] [PATCH 22/44] Deprecate QEMU_CAPS_SMBIOS_TYPE

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 12 ++---------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 6 +++--- 31 files changed, 6 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5d5b8ed64..6fd6d06e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 55b95f4e5..6e756c661 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -108,7 +108,7 @@ typedef enum { QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ + X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ /* 45 */ X_QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2487965d8..da95625b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5910,8 +5910,7 @@ qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) static int qemuBuildSmbiosCommandLine(virCommandPtr cmd, virQEMUDriverPtr driver, - const virDomainDef *def, - virQEMUCapsPtr qemuCaps) + const virDomainDef *def) { size_t i; virSysinfoDefPtr source = NULL; @@ -5921,13 +5920,6 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd, def->os.smbios_mode == VIR_DOMAIN_SMBIOS_EMULATE) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary %s does not support smbios settings"), - def->emulator); - return -1; - } - /* should we really error out or just warn in those cases ? */ if (def->os.smbios_mode == VIR_DOMAIN_SMBIOS_HOST) { if (driver->hostsysinfo == NULL) { @@ -9950,7 +9942,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virUUIDFormat(def->uuid, uuid); virCommandAddArgList(cmd, "-uuid", uuid, NULL); - if (qemuBuildSmbiosCommandLine(cmd, driver, def, qemuCaps) < 0) + if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0) goto error; /* diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index dc3f4d0d8..86af6e828 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 42a361564..9012430cf 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index b03e0db34..edfd53315 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index cc80ca13d..bd2d90954 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 5799f1ae3..57d416807 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index a8197113c..585433312 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 2439ac31a..ccafbbd8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 4abc07a35..e197f1887 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 3b0945f99..85a3c28e1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index f0f9b59b4..638b9d882 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 2cfe87954..9ccd01ae2 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index e0b2af57a..10f6d0b9e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index cdb69c9bb..6449f8577 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 1d12e27e8..375eb3891 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='enable-kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 9a51c42dd..98c961fdd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='no-hpet'/> <flag name='no-kvm-pit'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index cbf4b358e..f1627ab7b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 9e9c3ddb9..89fef00c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 0fe16efcf..ba050f4bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index e5db343d0..7db11051e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 21a4f5192..2d841414e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index adfc6cb44..e5c51082e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index f6355a5c4..3a973588b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index ecec216da..eb10d11f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7f5454d68..18eebf10f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c51dc12a3..4d61a7768 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index d493a8f50..6ab4e980a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index a9b127967..fb2ad3e07 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 943513cca..b678d6353 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1454,9 +1454,9 @@ mymain(void) DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE); + DO_TEST("smbios", NONE); + DO_TEST_PARSE_ERROR("smbios-date", NONE); + DO_TEST_PARSE_ERROR("smbios-uuid-match", NONE); DO_TEST("watchdog", NONE); DO_TEST("watchdog-device", NONE); -- 2.16.1