Patchwork [for-1.5,v2,16/20] sga: QOM'ify

login
register
mail settings
Submitter Andreas Färber
Date April 27, 2013, 8:18 p.m.
Message ID <1367093935-29091-17-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/240190/
State New
Headers show

Comments

Andreas Färber - April 27, 2013, 8:18 p.m.
Introduce type constant and cast macro.

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/misc/sga.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index 5cf4b86..c842190 100644
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -31,8 +31,11 @@ 
 
 #define SGABIOS_FILENAME "sgabios.bin"
 
-typedef struct ISAGAState {
-    ISADevice dev;
+#define TYPE_SGA "sga"
+#define SGA(obj) OBJECT_CHECK(ISASGAState, (obj), TYPE_SGA)
+
+typedef struct ISASGAState {
+    ISADevice parent_obj;
 } ISASGAState;
 
 static int sga_initfn(ISADevice *dev)
@@ -40,6 +43,7 @@  static int sga_initfn(ISADevice *dev)
     rom_add_vga(SGABIOS_FILENAME);
     return 0;
 }
+
 static void sga_class_initfn(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -49,7 +53,7 @@  static void sga_class_initfn(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo sga_info = {
-    .name          = "sga",
+    .name          = TYPE_SGA,
     .parent        = TYPE_ISA_DEVICE,
     .instance_size = sizeof(ISASGAState),
     .class_init    = sga_class_initfn,