[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] hw/char: QOM'ify sclpconsole-lm.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 5/6] hw/char: QOM'ify sclpconsole-lm.c |
Date: |
Thu, 17 Mar 2016 17:20:29 +0800 |
Drop the DO_UPCAST macro
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/char/sclpconsole-lm.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index 7d4ff81..3dcc5a5 100644
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -44,6 +44,10 @@ typedef struct SCLPConsoleLM {
uint8_t buf[SIZE_CONSOLE_BUFFER];
} SCLPConsoleLM;
+#define TYPE_SCLP_LM_CONSOLE "sclplmconsole"
+#define SCLP_LM_CONSOLE(obj) \
+ OBJECT_CHECK(SCLPConsoleLM, (obj), TYPE_SCLP_LM_CONSOLE)
+
/*
* Character layer call-back functions
*
@@ -116,7 +120,7 @@ static int get_console_data(SCLPEvent *event, uint8_t *buf,
size_t *size,
{
int len;
- SCLPConsoleLM *cons = DO_UPCAST(SCLPConsoleLM, event, event);
+ SCLPConsoleLM *cons = SCLP_LM_CONSOLE(event);
len = cons->length;
/* data need to fit into provided SCLP buffer */
@@ -190,7 +194,7 @@ static int write_console_data(SCLPEvent *event, const
uint8_t *buf, int len)
int ret = 0;
const uint8_t *buf_offset;
- SCLPConsoleLM *scon = DO_UPCAST(SCLPConsoleLM, event, event);
+ SCLPConsoleLM *scon = SCLP_LM_CONSOLE(event);
if (!scon->chr) {
/* If there's no backend, we can just say we consumed all data. */
@@ -244,7 +248,7 @@ static int write_event_data(SCLPEvent *event,
EventBufferHeader *ebh)
int errors = 0;
MDBO *mdbo;
SclpMsg *data = (SclpMsg *) ebh;
- SCLPConsoleLM *scon = DO_UPCAST(SCLPConsoleLM, event, event);
+ SCLPConsoleLM *scon = SCLP_LM_CONSOLE(event);
len = be16_to_cpu(data->mdb.header.length);
if (len < sizeof(data->mdb.header)) {
@@ -313,7 +317,7 @@ static int console_init(SCLPEvent *event)
{
static bool console_available;
- SCLPConsoleLM *scon = DO_UPCAST(SCLPConsoleLM, event, event);
+ SCLPConsoleLM *scon = SCLP_LM_CONSOLE(event);
if (console_available) {
error_report("Multiple line-mode operator consoles are not supported");
@@ -336,7 +340,7 @@ static int console_exit(SCLPEvent *event)
static void console_reset(DeviceState *dev)
{
SCLPEvent *event = SCLP_EVENT(dev);
- SCLPConsoleLM *scon = DO_UPCAST(SCLPConsoleLM, event, event);
+ SCLPConsoleLM *scon = SCLP_LM_CONSOLE(event);
event->event_pending = false;
scon->length = 0;
--
2.1.4
- [Qemu-devel] [PATCH 0/6] QOM'ify hw/char devices, xiaoqiang zhao, 2016/03/17
- [Qemu-devel] [PATCH 5/6] hw/char: QOM'ify sclpconsole-lm.c,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 1/6] hw/char: QOM'ify escc.c, xiaoqiang zhao, 2016/03/17
- [Qemu-devel] [PATCH 2/6] hw/char: QOM'ify etraxfs_ser.c, xiaoqiang zhao, 2016/03/17
- [Qemu-devel] [PATCH 4/6] hw/char: QOM'ify lm32_uart.c, xiaoqiang zhao, 2016/03/17
- [Qemu-devel] [PATCH 3/6] hw/char: QOM'ify lm32_juart.c, xiaoqiang zhao, 2016/03/17
- [Qemu-devel] [PATCH 6/6] hw/char: QOM'ify sclpconsole.c, xiaoqiang zhao, 2016/03/17