From patchwork Mon Jul 2 05:25:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 168491 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 99B772C01C1 for ; Mon, 2 Jul 2012 15:27:21 +1000 (EST) Received: from localhost ([::1]:57939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlZAN-0002j4-Mn for incoming@patchwork.ozlabs.org; Mon, 02 Jul 2012 01:27:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlZAA-0002XY-Lb for qemu-devel@nongnu.org; Mon, 02 Jul 2012 01:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SlZA8-0001Pk-N2 for qemu-devel@nongnu.org; Mon, 02 Jul 2012 01:27:06 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:34772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlZA8-0001PD-Is for qemu-devel@nongnu.org; Mon, 02 Jul 2012 01:27:04 -0400 Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jul 2012 01:27:00 -0400 Received: from d01relay01.pok.ibm.com (9.56.227.233) by e4.ny.us.ibm.com (192.168.1.104) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 2 Jul 2012 01:26:59 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q625QwSk413184; Mon, 2 Jul 2012 01:26:58 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q625QwoQ005018; Mon, 2 Jul 2012 01:26:58 -0400 Received: from zhlbj-host (zhlbj-host.cn.ibm.com [9.115.122.179] (may be forged)) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q625QuLA004979; Mon, 2 Jul 2012 01:26:57 -0400 Received: by zhlbj-host (Postfix, from userid 1000) id BEB7B3C0B5C; Mon, 2 Jul 2012 13:26:51 +0800 (CST) From: zhlcindy@gmail.com To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Mon, 2 Jul 2012 13:25:36 +0800 Message-Id: <0be04c2530ab90a35e26d34cd2fdea49fa392716.1341204647.git.zhlcindy@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: x-cbid: 12070205-3534-0000-0000-00000A059014 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.144 Cc: benh@au1.ibm.com, shangw@linux.vnet.ibm.com, agraf@suse.de, Li Zhang , afaerber@suse.de Subject: [Qemu-devel] [Qemu-ppc][PATCH v5 4/4] 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 From: Li Zhang 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 | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/hw/spapr.c b/hw/spapr.c index 973de1b..3648cad 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,16 @@ 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 { + 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 +730,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; + } + machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); if (machine_opts) { add_usb = qemu_opt_get_bool(machine_opts, "usb", true); @@ -720,6 +743,10 @@ static void ppc_spapr_init(ram_addr_t ram_size, if (add_usb) { 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)) { fprintf(stderr, "qemu: pSeries SLOF firmware requires >= "