On Mon, Jul 27, 2015 at 11:50:08PM +0300, Michael S. Tsirkin wrote:
> On Mon, Jul 27, 2015 at 10:54:04PM +0300, Michael Tokarev wrote:
> > From: Laszlo Ersek <ler...@redhat.com>
> >
> > 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" <m...@redhat.com>
> > Cc: Igor Mammedov <imamm...@redhat.com>
> > Cc: Gerd Hoffmann <kra...@redhat.com>
> > Cc: Paolo Bonzini <pbonz...@redhat.com>
> > Cc: qemu-triv...@nongnu.org
> > Signed-off-by: Laszlo Ersek <ler...@redhat.com>
> > Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> > Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
>
>
> 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 ...
>
Oh I see it's because Laszlo said in the cover letter
they are trivial. Never mind.
> > ---
> > 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
