diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-23 18:05:28 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-03-25 22:49:47 +0100 |
| commit | c6e765035bc5e0d73231c2c0fbd54620201d6655 (patch) | |
| tree | 05e1631846d0ec05a624c5ee159b9a431fe1385b /hw | |
| parent | 5b2128d27051fe036ac36e8e860e72490b27a369 (diff) | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/machine.c | 1 | ||||
| -rw-r--r-- | hw/ppc/mac_newworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index cb1185ada4..25c45e6f9d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -223,6 +223,7 @@ static void machine_set_usb(Object *obj, bool value, Error **errp) MachineState *ms = MACHINE(obj); ms->usb = value; + ms->usb_disabled = !value; } static char *machine_get_firmware(Object *obj, Error **errp) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 624b4ab50b..7cc5106c79 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -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; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ca0a060b92..61ddc7994d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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) { |