From: xiaoqiang zhao <zxq_yx_007@163.com>
To: qemu-devel@nongnu.org
Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, michael@walle.cc,
agraf@suse.de, edgar.iglesias@gmail.com
Subject: [Qemu-devel] [PATCH 1/6] hw/char: QOM'ify escc.c
Date: Thu, 17 Mar 2016 17:20:25 +0800 [thread overview]
Message-ID: <1458206430-21917-2-git-send-email-zxq_yx_007@163.com> (raw)
In-Reply-To: <1458206430-21917-1-git-send-email-zxq_yx_007@163.com>
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
hw/char/escc.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/char/escc.c b/hw/char/escc.c
index c7a24ac..370e6b1 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -983,9 +983,10 @@ void slavio_serial_ms_kbd_init(hwaddr base, qemu_irq irq,
sysbus_mmio_map(s, 0, base);
}
-static int escc_init1(SysBusDevice *dev)
+static void escc_init1(Object *obj)
{
- ESCCState *s = ESCC(dev);
+ ESCCState *s = ESCC(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
unsigned int i;
s->chn[0].disabled = s->disabled;
@@ -1002,7 +1003,7 @@ static int escc_init1(SysBusDevice *dev)
s->chn[0].otherchn = &s->chn[1];
s->chn[1].otherchn = &s->chn[0];
- memory_region_init_io(&s->mmio, OBJECT(s), &escc_mem_ops, s, "escc",
+ memory_region_init_io(&s->mmio, obj, &escc_mem_ops, s, "escc",
ESCC_SIZE << s->it_shift);
sysbus_init_mmio(dev, &s->mmio);
@@ -1014,8 +1015,6 @@ static int escc_init1(SysBusDevice *dev)
s->chn[1].hs = qemu_input_handler_register((DeviceState *)(&s->chn[1]),
&sunkbd_handler);
}
-
- return 0;
}
static Property escc_properties[] = {
@@ -1032,9 +1031,7 @@ static Property escc_properties[] = {
static void escc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = escc_init1;
dc->reset = escc_reset;
dc->vmsd = &vmstate_escc;
dc->props = escc_properties;
@@ -1045,6 +1042,7 @@ static const TypeInfo escc_info = {
.name = TYPE_ESCC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ESCCState),
+ .instance_init = escc_init1,
.class_init = escc_class_init,
};
--
2.1.4
next prev parent reply other threads:[~2016-03-17 9:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 9:20 [Qemu-devel] [PATCH 0/6] QOM'ify hw/char devices xiaoqiang zhao
2016-03-17 9:20 ` xiaoqiang zhao [this message]
2016-03-17 9:20 ` [Qemu-devel] [PATCH 2/6] hw/char: QOM'ify etraxfs_ser.c xiaoqiang zhao
2016-05-06 7:42 ` Edgar E. Iglesias
2016-05-09 10:51 ` Paolo Bonzini
2016-03-17 9:20 ` [Qemu-devel] [PATCH 3/6] hw/char: QOM'ify lm32_juart.c xiaoqiang zhao
2016-03-17 9:20 ` [Qemu-devel] [PATCH 4/6] hw/char: QOM'ify lm32_uart.c xiaoqiang zhao
2016-03-17 9:20 ` [Qemu-devel] [PATCH 5/6] hw/char: QOM'ify sclpconsole-lm.c xiaoqiang zhao
2016-03-17 10:08 ` Cornelia Huck
2016-03-17 10:38 ` zxq_yx_007
2016-03-17 9:20 ` [Qemu-devel] [PATCH 6/6] hw/char: QOM'ify sclpconsole.c xiaoqiang zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458206430-21917-2-git-send-email-zxq_yx_007@163.com \
--to=zxq_yx_007@163.com \
--cc=agraf@suse.de \
--cc=cornelia.huck@de.ibm.com \
--cc=edgar.iglesias@gmail.com \
--cc=michael@walle.cc \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.