From patchwork Wed Jun 22 12:24:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efimov Vasily X-Patchwork-Id: 9192625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 934256075A for ; Wed, 22 Jun 2016 12:30:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83AB6283E9 for ; Wed, 22 Jun 2016 12:30:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7853428400; Wed, 22 Jun 2016 12:30:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 2EA3E283E9 for ; Wed, 22 Jun 2016 12:30:51 +0000 (UTC) Received: from localhost ([::1]:57924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhIw-0000Jr-7r for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Jun 2016 08:30:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhDz-0003I7-W8 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:25:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFhDv-0001sD-4c for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:25:43 -0400 Received: from smtp.ispras.ru ([83.149.199.79]:37666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhDe-0001jT-4W; Wed, 22 Jun 2016 08:25:22 -0400 Received: from real.intra.ispras.ru (unknown [83.149.199.91]) by smtp.ispras.ru (Postfix) with ESMTP id 55241203FC; Wed, 22 Jun 2016 15:25:06 +0300 (MSK) From: Efimov Vasily To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2016 15:24:47 +0300 Message-Id: <1466598298-21214-4-git-send-email-real@ispras.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466598298-21214-1-git-send-email-real@ispras.ru> References: <1466598298-21214-1-git-send-email-real@ispras.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.79 Subject: [Qemu-devel] [PATCH v2 03/14] vmport: identify vmport type by macro TYPE_VMPORT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Markus Armbruster , Efimov Vasily , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Kirill Batuzov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently vmport device is identified by the string literal. Using a preprocessor alias instead is preferable. Signed-off-by: Efimov Vasily Reviewed-by: Paolo Bonzini --- hw/misc/vmport.c | 1 - include/hw/i386/pc.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c index 6896789..c763811 100644 --- a/hw/misc/vmport.c +++ b/hw/misc/vmport.c @@ -36,7 +36,6 @@ #define VMPORT_ENTRIES 0x2c #define VMPORT_MAGIC 0x564D5868 -#define TYPE_VMPORT "vmport" #define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT) typedef struct VMPortState diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 49566c8..dc7503d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -199,11 +199,12 @@ typedef struct GSIState { void gsi_handler(void *opaque, int n, int level); /* vmport.c */ +#define TYPE_VMPORT "vmport" typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); static inline void vmport_init(ISABus *bus) { - isa_create_simple(bus, "vmport"); + isa_create_simple(bus, TYPE_VMPORT); } void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque);