From 3f2499d7d703c83667ff1df6603e4c9d9791e9a4 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Thu, 7 Jun 2018 23:24:45 +0200 Subject: [PATCH] qemu: Relax check for SMM feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One of the things that this is improving is the fact that instead of error message (that was wrong) you get when starting a domain with SMM and i440fx we allow the setting to go through. SMM option exists and makes sense on i440fx as well (basically whenever that _SMM_OPT capability is set). Signed-off-by: Martin Kletzander Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1805f29186..a985e9dd96 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3793,8 +3793,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def, case VIR_DOMAIN_FEATURE_SMM: if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT && - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT) || - !qemuDomainIsQ35(def))) { + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("smm is not available with this QEMU binary")); return -1;