diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-15 17:17:37 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-22 10:47:49 -0500 |
| commit | be20f9e902ca47ea84e1b1c1e89b0a55d59b4c11 (patch) | |
| tree | 11fd0270b2f59ae1bcc68481fd2156bdcf841d36 /hw/vga-isa.c | |
| parent | f5e6fed879ae10b9f6494a6eed21c1979391d7cb (diff) | |
| download | focaccia-qemu-be20f9e902ca47ea84e1b1c1e89b0a55d59b4c11.tar.gz focaccia-qemu-be20f9e902ca47ea84e1b1c1e89b0a55d59b4c11.zip | |
vga: drop get_system_memory() from vga devices and derivatives
Instead, use the bus accessors, or get the address space directly from the board constructor. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/vga-isa.c')
| -rw-r--r-- | hw/vga-isa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/vga-isa.c b/hw/vga-isa.c index fef7f58f28..0d199015d7 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -28,7 +28,6 @@ #include "pixel_ops.h" #include "qemu-timer.h" #include "loader.h" -#include "exec-memory.h" typedef struct ISAVGAState { ISADevice dev; @@ -51,7 +50,7 @@ static int vga_initfn(ISADevice *dev) vga_common_init(s, VGA_RAM_SIZE); vga_io_memory = vga_init_io(s); - memory_region_add_subregion_overlap(get_system_memory(), + memory_region_add_subregion_overlap(isa_address_space(dev), isa_mem_base + 0x000a0000, vga_io_memory, 1); memory_region_set_coalescing(vga_io_memory); @@ -68,7 +67,7 @@ static int vga_initfn(ISADevice *dev) s->ds = graphic_console_init(s->update, s->invalidate, s->screen_dump, s->text_update, s); - vga_init_vbe(s); + vga_init_vbe(s, isa_address_space(dev)); /* ROM BIOS */ rom_add_vga(VGABIOS_FILENAME); return 0; |