提交 e3746add 编写于 作者: J Ján Tomko

qemu: deprecate QEMU_CAPS_SMBIOS_TYPE

Implied by QEMU >= 1.2.0.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 3a066efe
......@@ -3631,7 +3631,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);
......
......@@ -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' */
......
......@@ -5906,8 +5906,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;
......@@ -5917,13 +5916,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) {
......@@ -9972,7 +9964,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;
/*
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -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'/>
......
......@@ -1465,9 +1465,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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册