diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-03 17:35:44 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:11:26 -0500 |
commit | df59cbc6e2ff26d8fb4ffeea9742e9441ff1be35 (patch) | |
tree | 2833ba154c0d9537bc6b9e02dce4d149e4ac89b4 | |
parent | 53dad4992c700671d2f3d1157b489804bf0bca47 (diff) |
qdev/prop: convert vga.c to helper macros.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
-rw-r--r-- | hw/vga.c | 13 | ||||
-rw-r--r-- | hw/vga_int.h | 4 |
2 files changed, 5 insertions, 12 deletions
@@ -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 8fdf51dc61..eb2d6ea94a 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; |