From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sw7j2-0003yq-Mo for qemu-devel@nongnu.org; Tue, 31 Jul 2012 04:22:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sw7j0-0000eN-Bd for qemu-devel@nongnu.org; Tue, 31 Jul 2012 04:22:44 -0400 Message-ID: <1343720141.16975.1.camel@pasglop> From: Benjamin Herrenschmidt Date: Tue, 31 Jul 2012 17:35:41 +1000 In-Reply-To: <1343714945-20726-3-git-send-email-david@gibson.dropbear.id.au> References: <1343714945-20726-1-git-send-email-david@gibson.dropbear.id.au> <1343714945-20726-3-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 2/5] pseries: Instantiate USB if requested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Li Zhang , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org On Tue, 2012-07-31 at 16:09 +1000, David Gibson wrote: > 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 Li Zhang has been owning that patch for a while and I believe has a better version. Li, what's the status with it ? Alex ? Cheers, Ben. > --- > 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);