On 07.09.2012, at 17:27, Aurelien Jarno <aurel...@aurel32.net> wrote:
> The g3beige machine always add a video card, even when the "-vga none" > is passed. Fix that by checking if it is enabled or not before > instanciating it. > > Cc: Alexander Graf <ag...@suse.de> > Signed-off-by: Aurelien Jarno <aurel...@aurel32.net> > --- > hw/ppc_oldworld.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c > index 1dcd8a6..363b0e5 100644 > --- a/hw/ppc_oldworld.c > +++ b/hw/ppc_oldworld.c > @@ -250,7 +250,9 @@ static void ppc_heathrow_init (ram_addr_t ram_size, > pci_bus = pci_grackle_init(0xfec00000, pic, > get_system_memory(), > get_system_io()); > - pci_vga_init(pci_bus); > + if (std_vga_enabled) { > + pci_vga_init(pci_bus); Shouldn't we try to have some generic function that can create any PCI VGA adapter for us? We might want to throw a cirrus or qxl one in a g3beige. Alex > + } > > escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0], > serial_hds[1], ESCC_CLOCK, 4); > -- > 1.7.10.4 >