[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/22] vga: Rename vga_state -> vga
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 21/22] vga: Rename vga_state -> vga |
Date: |
Mon, 24 Aug 2009 13:03:42 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/vga.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/vga.c b/hw/vga.c
index 0ff0216..82f199d 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2225,7 +2225,7 @@ static int vga_load(QEMUFile *f, void *opaque, int
version_id)
typedef struct PCIVGAState {
PCIDevice dev;
- VGAState vga_state;
+ VGAState vga;
} PCIVGAState;
void vga_dirty_log_start(VGAState *s)
@@ -2243,7 +2243,7 @@ static void vga_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
PCIVGAState *d = (PCIVGAState *)pci_dev;
- VGAState *s = &d->vga_state;
+ VGAState *s = &d->vga;
if (region_num == PCI_ROM_SLOT) {
cpu_register_physical_memory(addr, s->bios_size, s->bios_offset);
} else {
@@ -2477,7 +2477,7 @@ static void pci_vga_write_config(PCIDevice *d,
uint32_t address, uint32_t val, int len)
{
PCIVGAState *pvs = container_of(d, PCIVGAState, dev);
- VGAState *s = &pvs->vga_state;
+ VGAState *s = &pvs->vga;
pci_default_write_config(d, address, val, len);
if (s->map_addr && pvs->dev.io_regions[0].addr == -1)
@@ -2487,7 +2487,7 @@ static void pci_vga_write_config(PCIDevice *d,
static void pci_vga_initfn(PCIDevice *dev)
{
PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
- VGAState *s = &d->vga_state;
+ VGAState *s = &d->vga;
uint8_t *pci_conf = d->dev.config;
// vga + console init
@@ -2537,8 +2537,8 @@ static PCIDeviceInfo vga_info = {
.init = pci_vga_initfn,
.config_write = pci_vga_write_config,
.qdev.props = (Property[]) {
- DEFINE_PROP_HEX32("bios-offset", PCIVGAState, vga_state.bios_offset,
0),
- DEFINE_PROP_HEX32("bios-size", PCIVGAState, vga_state.bios_size,
0),
+ DEFINE_PROP_HEX32("bios-offset", PCIVGAState, vga.bios_offset, 0),
+ DEFINE_PROP_HEX32("bios-size", PCIVGAState, vga.bios_size, 0),
DEFINE_PROP_END_OF_LIST(),
}
};
--
1.6.2.5
- [Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice, (continued)
- [Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 14/22] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/22] lsi53c895a: LSIState is a PCIDevice is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/22] usb-ohci: Remove unneeded double indirection of OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/22] cirrus_vga: Remove unneeded double indirection of PCICirrusVGAState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 18/22] cirrus_vga: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 19/22] cirrus_vga: change use of pci_dev for is_pci, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 20/22] Introduce vga_common_reset() to be able to typcheck vga_reset(), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 21/22] vga: Rename vga_state -> vga,
Juan Quintela <=
- [Qemu-devel] [PATCH 22/22] Everything outside of vga.c should use VGACommonState, Juan Quintela, 2009/08/24
- Re: [Qemu-devel] [PATCH 00/22] Indirection Cleanup, Gerd Hoffmann, 2009/08/24