]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Relax check for SMM feature
authorMartin Kletzander <mkletzan@redhat.com>
Thu, 7 Jun 2018 21:24:45 +0000 (23:24 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Fri, 8 Jun 2018 08:28:46 +0000 (10:28 +0200)
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 <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_domain.c

index 1805f2918669681566e9141131dfbedb08adf382..a985e9dd9635239237533d1a8c10880bcc9e11f9 100644 (file)
@@ -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;