From patchwork Thu Jan 26 17:35:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 138004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1396B6F6F for ; Fri, 27 Jan 2012 04:40:39 +1100 (EST) Received: from localhost ([::1]:48346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqTJM-0004xH-MK for incoming@patchwork.ozlabs.org; Thu, 26 Jan 2012 12:40:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqTIs-0003pM-Bv for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:40:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqTGB-00073O-Ct for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:37:22 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39576 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqTGB-00073C-82 for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:37:19 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id D20A890B1D; Thu, 26 Jan 2012 18:37:17 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2012 18:35:05 +0100 Message-Id: <1327599306-6330-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1327599306-6330-1-git-send-email-afaerber@suse.de> References: <1327433600-7403-12-git-send-email-aliguori@us.ibm.com> <1327599306-6330-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Stefan Weil , Anthony Liguori , Matthew Fernandez , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Avi Kivity Subject: [Qemu-devel] [PATCH 2/3] marvell_88w8618_audio: Use DEFINE_PROP_* macros 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori [AF: Use DEFINE_PROP_END_OF_LIST() as well] Signed-off-by: Andreas Färber --- If we're touching it, let's do it right. Causes a trivial merge conflict in [PATCH 27/28] sysbus: apic: ioapic: convert to QEMU Object Model. hw/marvell_88w8618_audio.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c index 0cd8410..8b6a5c0 100644 --- a/hw/marvell_88w8618_audio.c +++ b/hw/marvell_88w8618_audio.c @@ -50,7 +50,7 @@ typedef struct mv88w8618_audio_state { uint32_t play_pos; uint32_t last_free; uint32_t clock_div; - DeviceState *wm; + void *wm; } mv88w8618_audio_state; static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in) @@ -279,12 +279,8 @@ static SysBusDeviceInfo mv88w8618_audio_info = { .qdev.reset = mv88w8618_audio_reset, .qdev.vmsd = &mv88w8618_audio_vmsd, .qdev.props = (Property[]) { - { - .name = "wm8750", - .info = &qdev_prop_ptr, - .offset = offsetof(mv88w8618_audio_state, wm), - }, - {/* end of list */} + DEFINE_PROP_PTR("wm8750", mv88w8618_audio_state, wm), + DEFINE_PROP_END_OF_LIST() } };