From patchwork Sat Aug 4 12:05:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 175088 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 CBA352C008E for ; Sat, 4 Aug 2012 22:08:00 +1000 (EST) Received: from localhost ([::1]:47903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd9C-0001Yh-Rk for incoming@patchwork.ozlabs.org; Sat, 04 Aug 2012 08:07:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd8n-0000X4-Gr for qemu-devel@nongnu.org; Sat, 04 Aug 2012 08:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sxd8m-0003cg-0a for qemu-devel@nongnu.org; Sat, 04 Aug 2012 08:07:33 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:35131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd8l-0002vX-R6; Sat, 04 Aug 2012 08:07:31 -0400 Received: by mail-ob0-f173.google.com with SMTP id ta14so2476455obb.4 for ; Sat, 04 Aug 2012 05:07:31 -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=cIaAYwItymZ7ya8wK1R0dG6TuImvIIkSZmZEIDweidY=; b=R+Q6GRJHxWTiOvnRfjN77Dn5JhtDWSedq+JRGweXzBYio9fXaPZPJ1aYEDEdLmpXO0 27K1LVFV2gM78U7IrinXMFwJBZvf1daozP81yfthrmK/2lv79RMI3oMCPvUr4DNDVxFK AjwCHpVeaWy8sm0oKhmxDaDBuVx3c5oVnBEotNxgNT9g7/dWN9DTpNDN5XevafPRV8yn pTtCY3aWIXzswKVRDaAY9R8Dw7kr909BR5IJTBq/Z/Hs9+xRvY6XJd9cMNxmfFBbH54/ buR9IbWYC5bWEuJWW1EdIeU4LqMhSVa833Et0eb2hZgIeixheBVteGQrUKJmB4A5Ldle ph3w== Received: by 10.60.22.165 with SMTP id e5mr9845393oef.60.1344082051617; Sat, 04 Aug 2012 05:07:31 -0700 (PDT) Received: from localhost.localdomain ([175.25.242.10]) by mx.google.com with ESMTPS id th3sm12393434obb.6.2012.08.04.05.07.26 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Aug 2012 05:07:30 -0700 (PDT) From: Li Zhang To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Sat, 4 Aug 2012 20:05:57 +0800 Message-Id: <1344081957-4717-6-git-send-email-zhlcindy@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1344081957-4717-1-git-send-email-zhlcindy@linux.vnet.ibm.com> References: <1344081957-4717-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.214.173 Cc: aliguori@us.ibm.com, agraf@suse.de, Li Zhang , afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [Qemu-ppc][PATCH v6 5/5] spapr: Add support for -vga option 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 Also instanciate the USB keyboard and mouse when that option is used (you can still use -device to create individual devices without all the defaults) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Li Zhang --- hw/spapr.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 4dc5e59..e8eb947 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -45,6 +45,8 @@ #include "kvm.h" #include "kvm_ppc.h" #include "pci.h" +#include "vga-pci.h" +#include "usb.h" #include "exec-memory.h" @@ -82,6 +84,7 @@ #define PHANDLE_XICP 0x00001111 sPAPREnvironment *spapr; +bool spapr_has_graphics; qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, enum xics_irq_type type) @@ -257,6 +260,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model, _FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop)))); } _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); + _FDT((fdt_property_cell(fdt, "qemu,graphic-width", graphic_width))); + _FDT((fdt_property_cell(fdt, "qemu,graphic-height", graphic_height))); + _FDT((fdt_property_cell(fdt, "qemu,graphic-depth", graphic_depth))); _FDT((fdt_end_node(fdt))); @@ -503,7 +509,9 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr, } } - spapr_populate_chosen_stdout(fdt, spapr->vio_bus); + if (!spapr_has_graphics) { + spapr_populate_chosen_stdout(fdt, spapr->vio_bus); + } _FDT((fdt_pack(fdt))); @@ -556,6 +564,18 @@ static void spapr_cpu_reset(void *opaque) cpu_reset(CPU(cpu)); } +static int spapr_vga_init(PCIBus *pci_bus) +{ + if (std_vga_enabled) { + pci_vga_init(pci_bus); + } else { + fprintf(stderr, "This vga model is not supported," + "currently it only supports -vga std\n"); + return 0; + } + return 1; +} + /* pSeries LPAR / sPAPR hardware init */ static void ppc_spapr_init(ram_addr_t ram_size, const char *boot_device, @@ -712,6 +732,11 @@ static void ppc_spapr_init(ram_addr_t ram_size, spapr_vscsi_create(spapr->vio_bus); } + /* Graphics */ + if (spapr_vga_init(QLIST_FIRST(&spapr->phbs)->host_state.bus)) { + spapr_has_graphics = true; + } + mach_opts = qemu_opts_find(qemu_find_opts("machine"), 0); if (mach_opts) { usb_enabled = qemu_opt_get_bool(mach_opts, "usb", true); @@ -720,6 +745,10 @@ static void ppc_spapr_init(ram_addr_t ram_size, 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 (rma_size < (MIN_RMA_SLOF << 20)) {