From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8UCg-0002Sg-8h for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8UCf-0002Oa-K6 for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8UCf-0002OQ-D5 for qemu-devel@nongnu.org; Tue, 06 Jan 2015 08:29:45 -0500 From: Marcel Apfelbaum Date: Tue, 6 Jan 2015 15:29:17 +0200 Message-Id: <1420550957-22337-7-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 6/6] hw/ppc/mac_newworld: 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/mac_newworld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index b54f94a..c377012 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -371,6 +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(); } else { pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io()); machine_arch = ARCH_MAC99; @@ -417,8 +418,7 @@ static void ppc_core99_init(MachineState *machine) dev = qdev_create(adb_bus, TYPE_ADB_MOUSE); qdev_init_nofail(dev); - if ((machine_arch == ARCH_MAC99_U3 && defaults_enabled()) || - usb_enabled()) { + if (machine->usb) { pci_create_simple(pci_bus, -1, "pci-ohci"); /* U3 needs to use USB for input because Linux doesn't support via-cuda on PPC64 */ -- 2.1.0