From patchwork Tue Aug 14 17:49:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 177400 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 4AE0E2C007C for ; Wed, 15 Aug 2012 03:50:14 +1000 (EST) Received: from localhost ([::1]:54929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1LFs-00046D-Cg for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 13:50:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1LFf-0003z5-G7 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 13:50:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1LFd-0004Pk-7p for qemu-devel@nongnu.org; Tue, 14 Aug 2012 13:49:59 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:39622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1LFd-0004Pe-3w; Tue, 14 Aug 2012 13:49:57 -0400 Received: by qcab12 with SMTP id b12so500936qca.4 for ; Tue, 14 Aug 2012 10:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8UwRTtJeBAXxp6DVSzvs9pAcAHjJv6G2zcW0tgCapJo=; b=cKIxi3vnhsRLC9AxMDTMVeWKuA8zku62T18dhGu5mWOCcAuTUGZivakkWPjlPdY0ug S9cwWMpcqtjbqXka800PS8MfQNHA9Vxue6Q/kpkwkocPHsGA9FzS8Q4a6Phnb7T2HdPc CT9PVUHv7rFiMArd9WI7+ltogwwJ4vw/6ucmC7txoEXU/nZwp3n/6vPTQYEGryNL+hb+ u/4FV4eLVzx/UiCBUJ9HazbdJD3qP6xeElw0YsbfSfs9GLPgS9V9+oATdYKE1wnlNGyh qNI8K9BRoUXi+1COwyGV5iMd22A1FpDN/Kfrb0xjo/b8KEHnp4c8k4s1nnObJLBm6oq5 64Cw== Received: by 10.60.8.8 with SMTP id n8mr22693693oea.38.1344966596564; Tue, 14 Aug 2012 10:49:56 -0700 (PDT) Received: from localhost.localdomain ([117.79.232.202]) by mx.google.com with ESMTPS id d6sm3292487obx.15.2012.08.14.10.49.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 10:49:55 -0700 (PDT) From: Li Zhang To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Wed, 15 Aug 2012 01:49:35 +0800 Message-Id: <1344966575-25952-2-git-send-email-zhlcindy@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1344966575-25952-1-git-send-email-zhlcindy@linux.vnet.ibm.com> References: <1344966575-25952-1-git-send-email-zhlcindy@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.216.173 Cc: aliguori@us.ibm.com, agraf@suse.de, Li Zhang , david@gibson.dropbear.id.au Subject: [Qemu-devel] [Qemu-ppc][PATCH v8 2/2] Add USB enablement on sPAPR platform. 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 USB is enabled as default on sPAPR platform because it needs USB keyboard and USB mouse when VGA is enabled. This patch is to add USB controller on sPAPR platform. Signed-off-by: Li Zhang --- hw/spapr.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 81c9343..b45401b 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -710,6 +710,11 @@ static void ppc_spapr_init(ram_addr_t ram_size, spapr_vscsi_create(spapr->vio_bus); } + if (usb_enabled(true)) { + 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);