From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8UCb-0002Kb-Nu for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8UCa-0002NV-1F for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8UCZ-0002NJ-R9 for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:39 -0500 From: Marcel Apfelbaum Date: Tue, 6 Jan 2015 15:29:16 +0200 Message-Id: <1420550957-22337-6-git-send-email-marcel@redhat.com> In-Reply-To: <1420550957-22337-1-git-send-email-marcel@redhat.com> References: <1420550957-22337-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mst@redhat.com, lersek@redhat.com, agraf@suse.de, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Signed-off-by: Marcel Apfelbaum --- hw/ppc/spapr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 72c3102..53c4116 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1484,9 +1484,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"); -- 2.1.0