From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UX9bH-0001xL-Ez for qemu-devel@nongnu.org; Tue, 30 Apr 2013 08:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UX9bG-0000vN-2l for qemu-devel@nongnu.org; Tue, 30 Apr 2013 08:24:03 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38055 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UX9UR-0007Tj-Sl for qemu-devel@nongnu.org; Tue, 30 Apr 2013 08:17:00 -0400 Message-ID: <517FB63A.6070303@suse.de> Date: Tue, 30 Apr 2013 14:16:58 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1366303444-24620-1-git-send-email-pbonzini@redhat.com> <1366303444-24620-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366303444-24620-8-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 7/8] audio: look for the ISA and PCI buses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , Anthony Liguori Cc: Igor Mammedov , av1474@comtv.ru, qemu-devel@nongnu.org Am 18.04.2013 18:44, schrieb Paolo Bonzini: > Signed-off-by: Paolo Bonzini > --- > arch_init.c | 16 +++++++++++----- > hw/i386/pc_piix.c | 2 +- > hw/i386/pc_q35.c | 2 +- > hw/mips/mips_jazz.c | 2 +- > hw/mips/mips_malta.c | 2 +- > hw/ppc/prep.c | 2 +- > include/sysemu/arch_init.h | 2 +- > 7 files changed, 17 insertions(+), 11 deletions(-) >=20 [...] > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 943758a..1953d8c 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -194,7 +194,7 @@ static void pc_init1(MemoryRegion *system_memory, > } > } > =20 > - audio_init(isa_bus, pci_enabled ? pci_bus : NULL); > + audio_init(); > =20 > pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, > floppy, idebus[0], idebus[1], rtc_state); [snip] The patch version committed has an additional change in this file: @@ -88,7 +88,6 @@ static void pc_init1(MemoryRegion *system_memory, void *fw_cfg =3D NULL; pc_cpus_init(cpu_model); - pc_acpi_init("acpi-dsdt.aml"); if (kvmclock_enabled) { kvmclock_create(); Was that accidental? Noticed because of a conflict with Igor's patches. Further, my Reviewed-by is missing on patch 1/8, so was maybe the previous RFC version committed accidentally instead of this one? Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg