Patchwork [28/32] qdev/prop: convert vga.c to helper macros.

login
register
mail settings
Submitter Gerd Hoffmann
Date Aug. 3, 2009, 3:35 p.m.
Message ID <1249313748-6459-29-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/30628/
State Superseded
Headers show

Comments

Gerd Hoffmann - Aug. 3, 2009, 3:35 p.m.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/vga.c     |   13 +++----------
 hw/vga_int.h |    4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

Patch

diff --git a/hw/vga.c b/hw/vga.c
index 4d74ffe..25e5d6c 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2533,16 +2533,9 @@  static PCIDeviceInfo vga_info = {
     .init         = pci_vga_initfn,
     .config_write = pci_vga_write_config,
     .qdev.props   = (Property[]) {
-        {
-            .name   = "bios-offset",
-            .info   = &qdev_prop_hex32,
-            .offset = offsetof(PCIVGAState, vga_state.bios_offset),
-        },{
-            .name   = "bios-size",
-            .info   = &qdev_prop_hex32,
-            .offset = offsetof(PCIVGAState, vga_state.bios_size),
-        },
-        {/* end of list */}
+        DEFINE_PROP_HEX32("bios-offset", PCIVGAState, vga_state.bios_offset, 0),
+        DEFINE_PROP_HEX32("bios-size",   PCIVGAState, vga_state.bios_size,   0),
+        DEFINE_PROP_END_OF_LIST(),
     }
 };
 
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 631b1b0..651e6f3 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -107,8 +107,8 @@  typedef struct VGACommonState {
     uint32_t map_addr;
     uint32_t map_end;
     uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */
-    unsigned long bios_offset;
-    unsigned int bios_size;
+    uint32_t bios_offset;
+    uint32_t bios_size;
     int it_shift;
     PCIDevice *pci_dev;
     uint32_t latch;