vmmouse: QOM'ify
Introduce type constant and cast macro to obsolete DO_UPCAST() and container_of(). Prepares for ISA realizefn. Remove reserved underscore from struct name 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-19-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
a72dc5fc67
commit
e3b7fbead8
|
@ -51,9 +51,13 @@
|
||||||
#define DPRINTF(fmt, ...) do { } while (0)
|
#define DPRINTF(fmt, ...) do { } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct _VMMouseState
|
#define TYPE_VMMOUSE "vmmouse"
|
||||||
|
#define VMMOUSE(obj) OBJECT_CHECK(VMMouseState, (obj), TYPE_VMMOUSE)
|
||||||
|
|
||||||
|
typedef struct VMMouseState
|
||||||
{
|
{
|
||||||
ISADevice dev;
|
ISADevice parent_obj;
|
||||||
|
|
||||||
uint32_t queue[VMMOUSE_QUEUE_SIZE];
|
uint32_t queue[VMMOUSE_QUEUE_SIZE];
|
||||||
int32_t queue_size;
|
int32_t queue_size;
|
||||||
uint16_t nb_queue;
|
uint16_t nb_queue;
|
||||||
|
@ -250,7 +254,7 @@ static const VMStateDescription vmstate_vmmouse = {
|
||||||
|
|
||||||
static void vmmouse_reset(DeviceState *d)
|
static void vmmouse_reset(DeviceState *d)
|
||||||
{
|
{
|
||||||
VMMouseState *s = container_of(d, VMMouseState, dev.qdev);
|
VMMouseState *s = VMMOUSE(d);
|
||||||
|
|
||||||
s->queue_size = VMMOUSE_QUEUE_SIZE;
|
s->queue_size = VMMOUSE_QUEUE_SIZE;
|
||||||
|
|
||||||
|
@ -259,7 +263,7 @@ static void vmmouse_reset(DeviceState *d)
|
||||||
|
|
||||||
static int vmmouse_initfn(ISADevice *dev)
|
static int vmmouse_initfn(ISADevice *dev)
|
||||||
{
|
{
|
||||||
VMMouseState *s = DO_UPCAST(VMMouseState, dev, dev);
|
VMMouseState *s = VMMOUSE(dev);
|
||||||
|
|
||||||
DPRINTF("vmmouse_init\n");
|
DPRINTF("vmmouse_init\n");
|
||||||
|
|
||||||
|
@ -287,7 +291,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo vmmouse_info = {
|
static const TypeInfo vmmouse_info = {
|
||||||
.name = "vmmouse",
|
.name = TYPE_VMMOUSE,
|
||||||
.parent = TYPE_ISA_DEVICE,
|
.parent = TYPE_ISA_DEVICE,
|
||||||
.instance_size = sizeof(VMMouseState),
|
.instance_size = sizeof(VMMouseState),
|
||||||
.class_init = vmmouse_class_initfn,
|
.class_init = vmmouse_class_initfn,
|
||||||
|
|
Loading…
Reference in a new issue