From: Marcel Apfelbaum <marcel@redhat.com>
Date: Tue, 6 Jan 2015 13:29:16 +0000 (+0200)
Subject: hw/ppc/spapr: simplify usb controller creation logic
X-Git-Tag: v2.3.0-rc0~110^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ee9ced979e68522ee38ea759e7630ac70f15fa8;p=thirdparty%2Fqemu.git

hw/ppc/spapr: simplify usb controller creation logic

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d2b8b121508..b560459e833 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1528,9 +1528,10 @@ static void ppc_spapr_init(MachineState *machine)
     /* Graphics */
     if (spapr_vga_init(phb->bus)) {
         spapr->has_graphics = true;
+        machine->usb |= defaults_enabled();
     }
 
-    if ((spapr->has_graphics && defaults_enabled()) || usb_enabled()) {
+    if (machine->usb) {
         pci_create_simple(phb->bus, -1, "pci-ohci");
         if (spapr->has_graphics) {
             usbdevice_create("keyboard");