From patchwork Thu Aug 16 02:03:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 177886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D7DC42C0093 for ; Thu, 16 Aug 2012 12:04:12 +1000 (EST) Received: from localhost ([::1]:53487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1pRT-00040b-0E for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 22:04:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1pRL-00040J-Rh for qemu-devel@nongnu.org; Wed, 15 Aug 2012 22:04:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1pRK-0003DO-OT for qemu-devel@nongnu.org; Wed, 15 Aug 2012 22:04:03 -0400 Received: from ozlabs.org ([203.10.76.45]:53202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1pRK-0003DC-CU; Wed, 15 Aug 2012 22:04:02 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 1DFDD2C008D; Thu, 16 Aug 2012 12:04:00 +1000 (EST) From: David Gibson To: agraf@suse.de, aliguori@us.ibm.com Date: Thu, 16 Aug 2012 12:03:56 +1000 Message-Id: <1345082636-31813-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH] pseries: Instantiate USB interface when required X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The pseries machine already supports the -vga std option, creating a graphics adapter. However, this is not very useful without being able to add a keyboard and mouse as well. This patch addresses this by adding a USB interface when requested, and automatically adding a USB keyboard and mouse when VGA is enabled. This is a stop gap measure to get usable graphics mode on pseries while waiting for Li Zhang's rework of USB options to go in after 1.2. Signed-off-by: David Gibson --- hw/spapr.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/spapr.c b/hw/spapr.c index 5c8d524..5a25f6c 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -47,6 +47,7 @@ #include "kvm_ppc.h" #include "pci.h" #include "vga-pci.h" +#include "usb.h" #include "exec-memory.h" @@ -826,6 +827,15 @@ static void ppc_spapr_init(ram_addr_t ram_size, spapr->has_graphics = true; } + if (usb_enabled) { + pci_create_simple(QLIST_FIRST(&spapr->phbs)->host_state.bus, + -1, "pci-ohci"); + if (spapr->has_graphics) { + usbdevice_create("keyboard"); + usbdevice_create("mouse"); + } + } + if (spapr->rma_size < (MIN_RMA_SLOF << 20)) { fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF);