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 b3e6d591b0
("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>
			
			
This commit is contained in:
		
				
					committed by
					
						 David Gibson
						David Gibson
					
				
			
			
				
	
			
			
			
						parent
						
							c5eb5846d2
						
					
				
				
					commit
					6d034b7bf8
				
			| @@ -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"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user