From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBcW-0001fK-0k for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:33:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXBcU-0004ut-PN for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:33:27 -0400 Received: from mail-gg0-x230.google.com ([2607:f8b0:4002:c02::230]:35943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBcU-0004um-Lh for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:33:26 -0400 Received: by mail-gg0-f176.google.com with SMTP id c4so38926ggn.7 for ; Tue, 30 Apr 2013 07:33:25 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1367330432-14417-1-git-send-email-pbonzini@redhat.com> References: <1367330432-14417-1-git-send-email-pbonzini@redhat.com> Date: Tue, 30 Apr 2013 09:33:22 -0500 Message-ID: <871u9sozpp.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH] pc_piix: remove undesired change in pc_init1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: afaerber@suse.de Paolo Bonzini writes: > Introduced when applying commit f81222b (audio: look for the ISA and > PCI buses, 2013-04-18). > > Signed-off-by: Paolo Bonzini Sorry about that. Combination of a dirty tree and my patch fuzzing script getting very, very unlucky. Regards, Anthony Liguori > --- > hw/i386/pc_piix.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index c1113e0..2bda79e 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -88,6 +88,7 @@ static void pc_init1(MemoryRegion *system_memory, > void *fw_cfg = NULL; > > pc_cpus_init(cpu_model); > + pc_acpi_init("acpi-dsdt.aml"); > > if (kvmclock_enabled) { > kvmclock_create(); > -- > 1.8.2