mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr: Add support for -vga option

Browse Source 
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 <benh@kernel.crashing.org>
Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
[agraf: remove USB bits]
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
zhlcindy@gmail.com 2012-08-06 16:42:00 +00:00 committed by Alexander Graf
parent c1195d1677
commit f28359d8e8
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/spapr.c
View File

@ -45,6 +45,7 @@
#include "kvm.h" #include "kvm.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "pci.h" #include "pci.h"
#include "vga-pci.h"
#include "exec-memory.h" #include "exec-memory.h"
@ -82,6 +83,7 @@
#define PHANDLE_XICP 0x00001111 #define PHANDLE_XICP 0x00001111
sPAPREnvironment *spapr; sPAPREnvironment *spapr;
bool spapr_has_graphics;
qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num,
enum xics_irq_type type) enum xics_irq_type type)
@ -257,6 +259,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model,
_FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop)))); _FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop))));
} }
_FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); _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))); _FDT((fdt_end_node(fdt)));
@ -503,7 +508,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))); _FDT((fdt_pack(fdt)));
@ -556,6 +563,18 @@ static void spapr_cpu_reset(void *opaque)
cpu_reset(CPU(cpu)); 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 */ /* pSeries LPAR / sPAPR hardware init */
static void ppc_spapr_init(ram_addr_t ram_size, static void ppc_spapr_init(ram_addr_t ram_size,
const char *boot_device, const char *boot_device,
@ -710,6 +729,11 @@ static void ppc_spapr_init(ram_addr_t ram_size,
spapr_vscsi_create(spapr->vio_bus); spapr_vscsi_create(spapr->vio_bus);
} }
/* Graphics */
if (spapr_vga_init(QLIST_FIRST(&spapr->phbs)->host_state.bus)) {
spapr_has_graphics = true;
}
if (rma_size < (MIN_RMA_SLOF << 20)) { if (rma_size < (MIN_RMA_SLOF << 20)) {
fprintf(stderr, "qemu: pSeries SLOF firmware requires >= " fprintf(stderr, "qemu: pSeries SLOF firmware requires >= "
"%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF); "%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF);