From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sw5du-0000By-JA for qemu-devel@nongnu.org; Tue, 31 Jul 2012 02:09:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sw5dt-0003nM-Hc for qemu-devel@nongnu.org; Tue, 31 Jul 2012 02:09:18 -0400 From: David Gibson Date: Tue, 31 Jul 2012 16:09:02 +1000 Message-Id: <1343714945-20726-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1343714945-20726-1-git-send-email-david@gibson.dropbear.id.au> References: <1343714945-20726-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 2/5] pseries: Instantiate USB if requested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson The pseries machine currently ignores the -usb command line option. This patch corrects the problem by having it instantiate a PCI OHCI USB host controller when -usb is specified. Signed-off-by: David Gibson --- hw/spapr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/spapr.c b/hw/spapr.c index ab5a0c2..740881b 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -45,6 +45,7 @@ #include "kvm.h" #include "kvm_ppc.h" #include "pci.h" +#include "usb.h" #include "exec-memory.h" @@ -710,6 +711,12 @@ static void ppc_spapr_init(ram_addr_t ram_size, spapr_vscsi_create(spapr->vio_bus); } + /* USB */ + if (usb_enabled) { + pci_create_simple(QLIST_FIRST(&spapr->phbs)->host_state.bus, + -1, "pci-ohci"); + } + if (rma_size < (MIN_RMA_SLOF << 20)) { fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF); -- 1.7.10.4