ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/core/machine.c
View File

@ -223,6 +223,7 @@ static void machine_set_usb(Object *obj, bool value, Error **errp)
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
ms->usb = value; ms->usb = value;
ms->usb_disabled = !value;
} }
static char *machine_get_firmware(Object *obj, Error **errp) static char *machine_get_firmware(Object *obj, Error **errp)

2
hw/ppc/mac_newworld.c
View File

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

2
hw/ppc/spapr.c
View File

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

1
include/hw/boards.h
View File

@ -146,6 +146,7 @@ struct MachineState {
bool dump_guest_core; bool dump_guest_core;
bool mem_merge; bool mem_merge;
bool usb; bool usb;
bool usb_disabled;
char *firmware; char *firmware;
bool iommu; bool iommu;
bool suppress_vmdesc; bool suppress_vmdesc;