From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLUdL-00041H-9R for qemu-devel@nongnu.org; Tue, 09 Oct 2012 03:53:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLUdK-0004T6-4d for qemu-devel@nongnu.org; Tue, 09 Oct 2012 03:53:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLUdJ-0004T0-Qw for qemu-devel@nongnu.org; Tue, 09 Oct 2012 03:53:42 -0400 Message-ID: <5073D7FB.2000702@redhat.com> Date: Tue, 09 Oct 2012 09:53:31 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <4c27506681a076bb646d4661ed7004617405580b.1349749915.git.jbaron@redhat.com> In-Reply-To: <4c27506681a076bb646d4661ed7004617405580b.1349749915.git.jbaron@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 14/21] q35: Suppress SMM BIOS initialization under KVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com, kraxel@redhat.com Il 09/10/2012 05:30, Jason Baron ha scritto: > From: Jan Kiszka > > Same as for i44fx: KVM does not support SMM yet. Signal it initialized > to Seabios to avoid failures. > > Signed-off-by: Jan Kiszka > Signed-off-by: Jason Baron > --- > hw/acpi_ich9.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c > index 9e78b60..1412ad3 100644 > --- a/hw/acpi_ich9.c > +++ b/hw/acpi_ich9.c > @@ -28,6 +28,7 @@ > #include "qemu-timer.h" > #include "sysemu.h" > #include "acpi.h" > +#include "kvm.h" > > #include "q35.h" > > @@ -292,6 +293,12 @@ static void pm_reset(void *opaque) > acpi_pm_tmr_reset(&pm->acpi_regs); > acpi_gpe_reset(&pm->acpi_regs); > > + if (kvm_enabled()) { > + /* Mark SMM as already inited to prevent SMM from running. KVM does not > + * support SMM mode. */ > + pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN; > + } > + > pm_update_sci(pm); > } > > Reviewed-by: Paolo Bonzini