haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qxl: store memory region and offset instead of pointer for guest slots

Browse source 
Store MemoryRegion and offset instead of a pointer for each qxl memory
slot, so we can easily figure in which memory region an qxl object
stored.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1466597244-5938-2-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2016-06-22 14:07:23 +02:00
parent 726bdf653a
commit 3cb5158f15
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hw/display/qxl.c
View file

@ -1244,6 +1244,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
int pci_region; int pci_region;
pcibus_t pci_start; pcibus_t pci_start;
pcibus_t pci_end; pcibus_t pci_end;
MemoryRegion *mr;
intptr_t virt_start; intptr_t virt_start;
QXLDevMemSlot memslot; QXLDevMemSlot memslot;
int i; int i;
@ -1290,11 +1291,11 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
switch (pci_region) { switch (pci_region) {
case QXL_RAM_RANGE_INDEX: case QXL_RAM_RANGE_INDEX:
virt_start = (intptr_t)memory_region_get_ram_ptr(&d->vga.vram); mr = &d->vga.vram;
break; break;
case QXL_VRAM_RANGE_INDEX: case QXL_VRAM_RANGE_INDEX:
case 4 /* vram 64bit */: case 4 /* vram 64bit */:
virt_start = (intptr_t)memory_region_get_ram_ptr(&d->vram_bar); mr = &d->vram_bar;
break; break;
default: default:
/* should not happen */ /* should not happen */
@ -1302,6 +1303,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
return 1; return 1;
} }
virt_start = (intptr_t)memory_region_get_ram_ptr(mr);
memslot.slot_id = slot_id; memslot.slot_id = slot_id;
memslot.slot_group_id = MEMSLOT_GROUP_GUEST; /* guest group */ memslot.slot_group_id = MEMSLOT_GROUP_GUEST; /* guest group */
memslot.virt_start = virt_start + (guest_start - pci_start); memslot.virt_start = virt_start + (guest_start - pci_start);
@ -1311,7 +1313,8 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
qxl_rom_set_dirty(d); qxl_rom_set_dirty(d);
qemu_spice_add_memslot(&d->ssd, &memslot, async); qemu_spice_add_memslot(&d->ssd, &memslot, async);
d->guest_slots[slot_id].ptr = (void*)memslot.virt_start; d->guest_slots[slot_id].mr = mr;
d->guest_slots[slot_id].offset = memslot.virt_start - virt_start;
d->guest_slots[slot_id].size = memslot.virt_end - memslot.virt_start; d->guest_slots[slot_id].size = memslot.virt_end - memslot.virt_start;
d->guest_slots[slot_id].delta = delta; d->guest_slots[slot_id].delta = delta;
d->guest_slots[slot_id].active = 1; d->guest_slots[slot_id].active = 1;
@ -1378,6 +1381,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
{ {
uint64_t offset; uint64_t offset;
uint32_t slot; uint32_t slot;
void *ptr;
switch (group_id) { switch (group_id) {
case MEMSLOT_GROUP_HOST: case MEMSLOT_GROUP_HOST:
@ -1387,7 +1391,10 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset)) { if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset)) {
return NULL; return NULL;
} }
return qxl->guest_slots[slot].ptr + offset; ptr = memory_region_get_ram_ptr(qxl->guest_slots[slot].mr);
ptr += qxl->guest_slots[slot].offset;
ptr += offset;
return ptr;
} }
return NULL; return NULL;
} }

3
hw/display/qxl.h
View file

@ -53,7 +53,8 @@ typedef struct PCIQXLDevice {
struct guest_slots { struct guest_slots {
QXLMemSlot slot; QXLMemSlot slot;
void *ptr; MemoryRegion *mr;
uint64_t offset;
uint64_t size; uint64_t size;
uint64_t delta; uint64_t delta;
uint32_t active; uint32_t active;