From patchwork Mon Jun 18 09:34:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 165436 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 33BC7B70EB for ; Mon, 18 Jun 2012 19:35:31 +1000 (EST) Received: from localhost ([::1]:44830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgYMr-0004FF-28 for incoming@patchwork.ozlabs.org; Mon, 18 Jun 2012 05:35:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgYMe-00041Y-2N for qemu-devel@nongnu.org; Mon, 18 Jun 2012 05:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgYMP-00021y-SO for qemu-devel@nongnu.org; Mon, 18 Jun 2012 05:35:15 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:61590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgYMP-000207-GC; Mon, 18 Jun 2012 05:35:01 -0400 Received: by wgbfm10 with SMTP id fm10so4490936wgb.10 for ; Mon, 18 Jun 2012 02:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=Tuu3xcqUc+TQkpq64F/WIKQScjBKsfXRqgf65Q3fzA4=; b=n72SbfzdNg0alPtgu/UDzULNnpfhi2oqF7XMNVwEOyr2GPMYm0GZwoJ7TUNkCqlr3e GWTO/V1E4HDA4JzsfCmV1SLpbAsLXF+O2dRKM47LpNhP71ewBr9aAFs7yUc4W/8Wm1xl m59z8yHAIQ0YiBbk5ood2M3lAZNaV9NirsmvlIm8QUQFGM9oUZaptgXATXxOm0SjEzfK 52awc+SEb7DgsId8yGYz5J5D7KhaDU9N1ck6mwIH7XZYrM2zzzlpa+1FbujeeiGnz7Ae MDlzp26QnWUcRxYtZ8Dt6ZEHySv16h0n1VFEVBb5heliIuCKR93K3kzs1QHA3gJlJ+Pj eDCw== MIME-Version: 1.0 Received: by 10.180.84.6 with SMTP id u6mr22612743wiy.11.1340012098599; Mon, 18 Jun 2012 02:34:58 -0700 (PDT) Received: by 10.216.59.69 with HTTP; Mon, 18 Jun 2012 02:34:58 -0700 (PDT) Date: Mon, 18 Jun 2012 17:34:58 +0800 Message-ID: From: Li Zhang To: qemu-devel@nongnu.org, qemu-ppc X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.53 Cc: Anthony Liguori , Benjamin Herrenschmidt , =?UTF-8?Q?Andreas_F=C3=A4rber?= , Li Zhang Subject: [Qemu-devel] [PATCH 2/2] 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 | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 8d158d7..c7b6e9d 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -45,6 +45,8 @@ #include "kvm.h" #include "kvm_ppc.h" #include "pci.h" +#include "pc.h" +#include "usb.h" #include "exec-memory.h" @@ -82,6 +84,7 @@ #define PHANDLE_XICP 0x00001111 sPAPREnvironment *spapr; +static int spapr_has_graphics; qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, enum xics_irq_type type) @@ -222,6 +225,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))); @@ -457,7 +463,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))); @@ -510,6 +518,30 @@ static void spapr_cpu_reset(void *opaque) cpu_reset(CPU(cpu)); } +static int spapr_vga_init(PCIBus *pci_bus) +{ + /* Default is nothing */ +#if 0 /* Enable this once we merge a SLOF which works with Cirrus */ + if (cirrus_vga_enabled) { + pci_cirrus_vga_init(pci_bus); + } else +#endif + if (vmsvga_enabled) { + fprintf(stderr, "Warning: vmware_vga not available," + " using standard VGA instead\n"); + pci_vga_init(pci_bus); +#ifdef CONFIG_SPICE + } else if (qxl_enabled) { + pci_create_simple(pci_bus, -1, "qxl-vga"); +#endif + } else 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, @@ -663,6 +695,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 = 1; + } + machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); if (machine_opts) usb_on = qemu_opt_get_bool(machine_opts, "usb", true); @@ -670,6 +707,10 @@ static void ppc_spapr_init(ram_addr_t ram_size, if (usb_on) { 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 >= "