diff options
| author | Thomas Huth | 2017-06-09 08:53:17 +0200 |
|---|---|---|
| committer | David Gibson | 2017-06-30 06:03:31 +0200 |
| commit | 6d034b7bf8d1c20f193b00fd6434adf399d701da (patch) | |
| tree | 7a11cc75de5fec290db98263e540f3b5779e2c34 /hw/ppc/prep.c | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170629' into s... (diff) | |
| download | qemu-6d034b7bf8d1c20f193b00fd6434adf399d701da.tar.gz qemu-6d034b7bf8d1c20f193b00fd6434adf399d701da.tar.xz qemu-6d034b7bf8d1c20f193b00fd6434adf399d701da.zip | |
hw/ppc/prep: Remove superfluous call to soundhw_init()
When using the 40p machine, soundhw_init() is currently called twice,
one time from vl.c and one time from ibm_40p_init(). The call in
ibm_40p_init() was likely just a copy-and-paste from a old version
of the prep machine - but there the call to audio_init() (which was
the previous name of this function) has been removed many years ago
already, with commit b3e6d591b05538056d665572f3e3bbfb3cbb70e7
("audio: enable PCI audio cards for all PCI-enabled targets"), so
we certainly also do not need the soundhw_init() in the 40p function
anymore nowadays.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Sahid Ferdjaoui <sferdjao@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/prep.c')
| -rw-r--r-- | hw/ppc/prep.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index d16646c95d..36d3dcd89a 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -36,7 +36,6 @@ #include "hw/pci/pci_host.h" #include "hw/ppc/ppc.h" #include "hw/boards.h" -#include "hw/audio/soundhw.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "hw/ide.h" @@ -782,9 +781,6 @@ static void ibm_40p_init(MachineState *machine) qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, NULL, &cmos_checksum); - /* initialize audio subsystem */ - soundhw_init(); - /* add some more devices */ if (defaults_enabled()) { isa_create_simple(isa_bus, "i8042"); |