| Message ID | 1347103584-20598-11-git-send-email-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
On Sat, Sep 8, 2012 at 11:26 AM, Aurelien Jarno <aurelien@aurel32.net> wrote: > As a bonus it allows new vga card types (including none). > > Cc: Blue Swirl <blauwirbel@gmail.com> Acked-by: Blue Swirl <blauwirbel@gmail.com> > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> > --- > hw/sun4u.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/sun4u.c b/hw/sun4u.c > index cca090f..137a7c6 100644 > --- a/hw/sun4u.c > +++ b/hw/sun4u.c > @@ -39,7 +39,6 @@ > #include "elf.h" > #include "blockdev.h" > #include "exec-memory.h" > -#include "vga-pci.h" > > //#define DEBUG_IRQ > //#define DEBUG_EBUS > @@ -821,7 +820,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, > ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); > pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, > &pci_bus3, &pbm_irqs); > - pci_std_vga_init(pci_bus); > + pci_vga_init(pci_bus); > > // XXX Should be pci_bus3 > isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs); > -- > 1.7.10.4 >
diff --git a/hw/sun4u.c b/hw/sun4u.c index cca090f..137a7c6 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -39,7 +39,6 @@ #include "elf.h" #include "blockdev.h" #include "exec-memory.h" -#include "vga-pci.h" //#define DEBUG_IRQ //#define DEBUG_EBUS @@ -821,7 +820,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, &pci_bus3, &pbm_irqs); - pci_std_vga_init(pci_bus); + pci_vga_init(pci_bus); // XXX Should be pci_bus3 isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs);
As a bonus it allows new vga card types (including none). Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- hw/sun4u.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)