From 35139a590c4e2f3086d069028bda77f1de1d46b0 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 16 Aug 2012 12:03:56 +1000 Subject: [PATCH] pseries: Instantiate USB interface when required 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 Signed-off-by: Anthony Liguori --- hw/spapr.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/spapr.c b/hw/spapr.c index 5178721d49..be533ee934 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -49,6 +49,7 @@ #include "vga-pci.h" #include "exec-memory.h" +#include "hw/usb.h" #include @@ -765,6 +766,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 (rma_size < (MIN_RMA_SLOF << 20)) { fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF);