[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] vga: Fix inconsistent tracking of map_addr
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 6/7] vga: Fix inconsistent tracking of map_addr |
Date: |
Sat, 11 Apr 2009 19:20:26 +0200 |
User-agent: |
StGIT/0.14.2 |
Only track video RAM mapping in map_addr and use the correct RAM size.
Furthermore, make sure the reset the address in case unmapping took
place via PCI reconfiguration.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/vga.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/vga.c b/hw/vga.c
index b53b743..a483168 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2258,12 +2258,10 @@ static void vga_map(PCIDevice *pci_dev, int region_num,
cpu_register_physical_memory(addr, s->bios_size, s->bios_offset);
} else {
cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
+ s->map_addr = addr;
+ s->map_end = addr + s->vram_size;
+ vga_dirty_log_start(s);
}
-
- s->map_addr = addr;
- s->map_end = addr + VGA_RAM_SIZE;
-
- vga_dirty_log_start(s);
}
void vga_common_init(VGAState *s, int vga_ram_size)
@@ -2493,6 +2491,8 @@ static void pci_vga_write_config(PCIDevice *d,
vga_dirty_log_stop(s);
pci_default_write_config(d, address, val, len);
+ if (s->map_addr && pvs->dev.io_regions[0].addr == -1)
+ s->map_addr = 0;
vga_dirty_log_start(s);
}
- [Qemu-devel] [PATCH 0/7] kvm: fix system reset & rework slot management, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 5/7] kvm: improve handling of overlapping slots, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 1/7] kvm: Sync CPU state on reset, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 6/7] vga: Fix inconsistent tracking of map_addr,
Jan Kiszka <=
- [Qemu-devel] [PATCH 2/7] kvm: Apply SMM-already-initialized workaround on reset, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 7/7] vga: Cleanup dirty logging, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 3/7] kvm: Cleanup unmap condition in kvm_set_phys_mem, Jan Kiszka, 2009/04/11
- [Qemu-devel] [PATCH 4/7] kvm: Add sanity checks to slot management, Jan Kiszka, 2009/04/11