aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-04-27 22:18:52 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-29 08:27:49 -0500
commita72dc5fc67cd2412be35dc17698a4eb4f7e00a0c (patch)
tree61573faecb838d35001c12309894240a403d33a3 /hw
parentb582b5a398975d875d7e0b1c8f90817d01a8b20a (diff)
downloadqemu-a72dc5fc67cd2412be35dc17698a4eb4f7e00a0c.zip
qemu-a72dc5fc67cd2412be35dc17698a4eb4f7e00a0c.tar.gz
qemu-a72dc5fc67cd2412be35dc17698a4eb4f7e00a0c.tar.bz2
vga-isa: QOM'ify ISA VGA
Introduce type constant and cast macro to obsolete DO_UPCAST() and container_of(). Prepares for ISA realizefn. Unify function naming scheme while at it. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Andreas Färber <afaerber@suse.de> Message-id: 1367093935-29091-18-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/display/vga-isa.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 2b3cc9b..9e63b69 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -31,14 +31,18 @@
#include "qemu/timer.h"
#include "hw/loader.h"
+#define TYPE_ISA_VGA "isa-vga"
+#define ISA_VGA(obj) OBJECT_CHECK(ISAVGAState, (obj), TYPE_ISA_VGA)
+
typedef struct ISAVGAState {
- ISADevice dev;
+ ISADevice parent_obj;
+
struct VGACommonState state;
} ISAVGAState;
-static void vga_reset_isa(DeviceState *dev)
+static void vga_isa_reset(DeviceState *dev)
{
- ISAVGAState *d = container_of(dev, ISAVGAState, dev.qdev);
+ ISAVGAState *d = ISA_VGA(dev);
VGACommonState *s = &d->state;
vga_common_reset(s);
@@ -46,7 +50,7 @@ static void vga_reset_isa(DeviceState *dev)
static int vga_initfn(ISADevice *dev)
{
- ISAVGAState *d = DO_UPCAST(ISAVGAState, dev, dev);
+ ISAVGAState *d = ISA_VGA(dev);
VGACommonState *s = &d->state;
MemoryRegion *vga_io_memory;
const MemoryRegionPortio *vga_ports, *vbe_ports;
@@ -75,26 +79,27 @@ static Property vga_isa_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
-static void vga_class_initfn(ObjectClass *klass, void *data)
+static void vga_isa_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
+
ic->init = vga_initfn;
- dc->reset = vga_reset_isa;
+ dc->reset = vga_isa_reset;
dc->vmsd = &vmstate_vga_common;
dc->props = vga_isa_properties;
}
-static const TypeInfo vga_info = {
- .name = "isa-vga",
+static const TypeInfo vga_isa_info = {
+ .name = TYPE_ISA_VGA,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAVGAState),
- .class_init = vga_class_initfn,
+ .class_init = vga_isa_class_initfn,
};
-static void vga_register_types(void)
+static void vga_isa_register_types(void)
{
- type_register_static(&vga_info);
+ type_register_static(&vga_isa_info);
}
-type_init(vga_register_types)
+type_init(vga_isa_register_types)