motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: fix -machine usb=no for newworld and pseries machines

Browse source 
Capture the explicit setting of "usb=no" into a separate bool, and
use it to skip the update of machine->usb in the board init function.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Paolo Bonzini 2015-03-23 18:05:28 +01:00 • committed by Alexander Graf
parent 5b2128d270
commit c6e765035b
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/ppc/mac_newworld.c
View file

@ -371,7 +371,7 @@ static void ppc_core99_init(MachineState *machine)
/* 970 gets a U3 bus */
pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99_U3;
machine->usb |= defaults_enabled();
machine->usb |= defaults_enabled() && !machine->usb_disabled;
} else {
pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99;

2
hw/ppc/spapr.c
View file

@ -1580,7 +1580,7 @@ static void ppc_spapr_init(MachineState *machine)
/* Graphics */
if (spapr_vga_init(phb->bus)) {
spapr->has_graphics = true;
machine->usb |= defaults_enabled();
machine->usb |= defaults_enabled() && !machine->usb_disabled;
}
if (machine->usb) {