Re: [Qemu-devel] [PATCH 7/8] audio: look for the ISA and PCI buses

["Andreas Färber" <afaerber@suse.de>]

Am 18.04.2013 18:44, schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  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(-)
> 
[...]
> 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,
>          }
>      }
>  
> -    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
> +    audio_init();
>  
>      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 = 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

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg