From patchwork Tue Aug 11 09:38:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 31132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4DA37B6EDF for ; Tue, 11 Aug 2009 19:52:25 +1000 (EST) Received: from localhost ([127.0.0.1]:40825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mao1i-0005TQ-Fh for incoming@patchwork.ozlabs.org; Tue, 11 Aug 2009 05:52:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ManoW-0001Ii-GT for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:38:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ManoS-0001Dr-Mf for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:38:40 -0400 Received: from [199.232.76.173] (port=33880 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ManoS-0001DY-5n for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:38:36 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44710) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ManoR-0008Bn-Ki for qemu-devel@nongnu.org; Tue, 11 Aug 2009 05:38:35 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7B9cZuT014652 for ; Tue, 11 Aug 2009 05:38:35 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7B9cYZU028075; Tue, 11 Aug 2009 05:38:34 -0400 Received: from zweiblum.home.kraxel.org (vpn-10-100.str.redhat.com [10.32.10.100]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7B9cWsF003121; Tue, 11 Aug 2009 05:38:33 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 4EC40700D2; Tue, 11 Aug 2009 11:38:31 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 11 Aug 2009 11:38:30 +0200 Message-Id: <1249983510-2960-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] qdev/prop: convert isa-bus to helper macros. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/isa-bus.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 8c14b1d..315efbb 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -29,18 +29,9 @@ static struct BusInfo isa_bus_info = { .name = "ISA", .size = sizeof(ISABus), .props = (Property[]) { - { - .name = "iobase", - .info = &qdev_prop_hex32, - .offset = offsetof(ISADevice, iobase[0]), - .defval = (uint32_t[]) { -1 }, - },{ - .name = "iobase2", - .info = &qdev_prop_hex32, - .offset = offsetof(ISADevice, iobase[1]), - .defval = (uint32_t[]) { -1 }, - }, - {/* end of list */} + DEFINE_PROP_HEX32("iobase", ISADevice, iobase[0], -1), + DEFINE_PROP_HEX32("iobase2", ISADevice, iobase[1], -1), + DEFINE_PROP_END_OF_LIST(), } };