From patchwork Thu Mar 17 09:20:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 8608591 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9FBC69F44D for ; Thu, 17 Mar 2016 09:22:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F15FF202E6 for ; Thu, 17 Mar 2016 09:22:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 467D0202EC for ; Thu, 17 Mar 2016 09:22:25 +0000 (UTC) Received: from localhost ([::1]:33613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agU8O-0005SB-8n for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 05:22:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agU8C-0005RB-SF for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agU8A-0007Ws-9N for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:12 -0400 Received: from m12-11.163.com ([220.181.12.11]:51262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agU89-0007WF-I8 for qemu-devel@nongnu.org; Thu, 17 Mar 2016 05:22:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=F9PCDbvW44ofKDT4WQ TTO9in1Eas8Zes+6xxcnaGjW4=; b=WZcoX8RPa+yEtFRQGEPSPx06iHoWMViuHy dAt5M7R8Y7SotQIc8OowKMJcEi+xCM4JPn3vD7izkg0d2mjYTavWKHGmd5uTUzlQ 0J/wqVZFSf4lVaTfjIHzTGXZ0xa0ov7tunIzGw28tj6kX99dpNQZI3wdOPsVl4zk vxath5THo= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp7 (Coremail) with SMTP id C8CowABHoWwpd+pWo3YaAw--.26085S7; Thu, 17 Mar 2016 17:21:56 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 17 Mar 2016 17:20:29 +0800 Message-Id: <1458206430-21917-6-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458206430-21917-1-git-send-email-zxq_yx_007@163.com> References: <1458206430-21917-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: C8CowABHoWwpd+pWo3YaAw--.26085S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45XF17Ar4UKrWxGw43GFg_yoW8KrW5p3 ZxKrWakrWfJFyYqryfJr17Wr18Gr18JFW0y3yDAw1rZ3Z8Gr48CF129w1FvayUGrWvywnI ya1Yg3Wjyas3JrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jLR6wUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFhUvxlWBPrppLQAAs+ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.11 Cc: cornelia.huck@de.ibm.com, pbonzini@redhat.com, michael@walle.cc, agraf@suse.de, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH 5/6] hw/char: QOM'ify sclpconsole-lm.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drop the DO_UPCAST macro Signed-off-by: xiaoqiang zhao --- 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;