CirrusVGAState cirrus_vga;
} PCICirrusVGAState;
+#define TYPE_ISA_CIRRUS_VGA "isa-cirrus-vga"
+#define ISA_CIRRUS_VGA(obj) \
+ OBJECT_CHECK(ISACirrusVGAState, (obj), TYPE_ISA_CIRRUS_VGA)
+
typedef struct ISACirrusVGAState {
- ISADevice dev;
+ ISADevice parent_obj;
+
CirrusVGAState cirrus_vga;
} ISACirrusVGAState;
static int vga_initfn(ISADevice *dev)
{
- ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
+ ISACirrusVGAState *d = ISA_CIRRUS_VGA(dev);
VGACommonState *s = &d->cirrus_vga.vga;
vga_common_init(s);
return 0;
}
-static Property isa_vga_cirrus_properties[] = {
+static Property isa_cirrus_vga_properties[] = {
DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
cirrus_vga.vga.vram_size_mb, 8),
DEFINE_PROP_END_OF_LIST(),
dc->vmsd = &vmstate_cirrus_vga;
k->init = vga_initfn;
- dc->props = isa_vga_cirrus_properties;
+ dc->props = isa_cirrus_vga_properties;
}
static const TypeInfo isa_cirrus_vga_info = {
- .name = "isa-cirrus-vga",
+ .name = TYPE_ISA_CIRRUS_VGA,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISACirrusVGAState),
.class_init = isa_cirrus_vga_class_init,