From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJpLj-0000TM-Ob for qemu-devel@nongnu.org; Mon, 27 Jul 2015 16:50:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJpLg-0007m1-Ea for qemu-devel@nongnu.org; Mon, 27 Jul 2015 16:50:15 -0400 Date: Mon, 27 Jul 2015 23:50:08 +0300 From: "Michael S. Tsirkin" Message-ID: <20150727234906-mutt-send-email-mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , Laszlo Ersek On Mon, Jul 27, 2015 at 10:54:04PM +0300, Michael Tokarev wrote: > From: Laszlo Ersek > > Otherwise on reboot firmware might think (due to APMC_EN remaining set > from the previous boot) that SMI support is absent. > > Cc: "Michael S. Tsirkin" > Cc: Igor Mammedov > Cc: Gerd Hoffmann > Cc: Paolo Bonzini > Cc: qemu-trivial@nongnu.org > Signed-off-by: Laszlo Ersek > Reviewed-by: Igor Mammedov > Signed-off-by: Michael Tokarev Confused. Why are you merging these patches through your tree? I was preparing a pull request myself, while likely git will figure it out fine, this commit will appear twice in history and it's kind of messy. I guess I could drop this - but it's more work ... > --- > hw/acpi/ich9.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index f04f6dc..8da5a2d 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -221,6 +221,7 @@ static void pm_reset(void *opaque) > acpi_pm_tmr_reset(&pm->acpi_regs); > acpi_gpe_reset(&pm->acpi_regs); > > + pm->smi_en = 0; > if (!pm->smm_enabled) { > /* Mark SMM as already inited to prevent SMM from running. KVM does not > * support SMM mode. */ > -- > 2.1.4