[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in ca
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more |
Date: |
Sun, 17 Jul 2011 14:13:49 +0300 |
We're going to remove the callback, so we can't use it to save the
address. Use the pci API instead.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/vmware_vga.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 354c221..190b005 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -52,8 +52,6 @@ struct vmsvga_state_s {
int on;
} cursor;
- target_phys_addr_t vram_base;
-
int index;
int scratch_size;
uint32_t *scratch;
@@ -761,8 +759,11 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t
address)
case SVGA_REG_BYTES_PER_LINE:
return ((s->depth + 7) >> 3) * s->new_width;
- case SVGA_REG_FB_START:
- return s->vram_base;
+ case SVGA_REG_FB_START: {
+ struct pci_vmsvga_state_s *pci_vmsvga
+ = container_of(s, struct pci_vmsvga_state_s, chip);
+ return pci_get_bar_addr(&pci_vmsvga->card, 1);
+ }
case SVGA_REG_FB_OFFSET:
return 0x0;
@@ -1247,14 +1248,13 @@ static void pci_vmsvga_map_mem(PCIDevice *pci_dev, int
region_num,
struct vmsvga_state_s *s = &d->chip;
ram_addr_t iomemtype;
- s->vram_base = addr;
#ifdef DIRECT_VRAM
iomemtype = cpu_register_io_memory(vmsvga_vram_read,
vmsvga_vram_write, s, DEVICE_NATIVE_ENDIAN);
#else
iomemtype = s->vga.vram_offset | IO_MEM_RAM;
#endif
- cpu_register_physical_memory(s->vram_base, s->vga.vram_size,
+ cpu_register_physical_memory(addr, s->vga.vram_size,
iomemtype);
s->vga.map_addr = addr;
--
1.7.5.3
- [Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API, (continued)
- [Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 15/58] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 12/58] exec.c: initialize memory map, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 11/58] memory: add ioeventfd support, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 33/58] rtl8139: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 10/58] memory: add backward compatibility for old mmio registration, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 55/58] pci: convert pci rom to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 40/58] virtio-pci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more,
Avi Kivity <=
- [Qemu-devel] [RFC v4 43/58] lsi53c895a: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 36/58] eepro100: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 06/58] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 01/58] Hierarchical memory region API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 42/58] intel-hda: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 47/58] i6300esb: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 28/58] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 20/58] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 08/58] memory: I/O address space support, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 54/58] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/07/17