From patchwork Wed Apr 3 05:17:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 233236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FB4E2C00AE for ; Wed, 3 Apr 2013 16:19:20 +1100 (EST) Received: from localhost ([::1]:41897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNG6Q-00010N-Ng for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 01:19:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNG64-0000vd-SK for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNG63-0002Fv-BU for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:18:56 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNG63-0002Fq-5U for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:18:55 -0400 Received: by mail-pd0-f171.google.com with SMTP id z10so643881pdj.2 for ; Tue, 02 Apr 2013 22:18:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=Hyon8EzbYVoyUSc7Kb2CDsrutqZOUpSV4BNMbhGQU7U=; b=ocK1aVogKIV/6wwvQctw0wowyjTID/W74kO+5cRZyZch9SbLMachKRGWmoDmH4nryh ZD3EMo+pI4ptIo/44lUMT/U2k6/K3GOJZS07WvAtm43buhWPAsJsqsRnGfEUqctLc/9N NaaY5P7NADiywxMcOcY89VSlYKESZcfGvLcE9hMydT1FvFNwjfUuzRJUTUbsZfNFBM4z FjtVlrh01xCnyidrUAAs3ovd88WqTN+bmWDQzoqv4r4BLPD5wno9NB0cAHCDbq/4B9QG dmJjyJ7+y9eRWMRD8DpBUH752EVBFsNMCHEnLTqcEknTDbawSp+VBW+fJxjUcp4sjTjF MyeQ== X-Received: by 10.68.33.193 with SMTP id t1mr447045pbi.43.1364966334523; Tue, 02 Apr 2013 22:18:54 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id yp2sm5322944pab.10.2013.04.02.22.18.52 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 22:18:53 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Wed, 3 Apr 2013 15:17:02 +1000 Message-Id: <465f056a4e2aa4b67df1ff0b16a7f66563cfc779.1364965814.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkWTACR9bQuGizcB03IdE3XDKHCjQlCC5Tptwfv8/v/U4oL3hb5cJ6NpzwMO8MgBBIIKawT X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.192.171 Cc: Peter Crosthwaite Subject: [Qemu-devel] [PATCH v5 02/16] xilinx_axienet: Defined and use type cast macro 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 Standard QOM cast macro. Replaces usages of FROM_SYSBUS Signed-off-by: Peter Crosthwaite Reviewed-by: Andreas Färber Acked-by: Edgar E. Iglesias --- hw/xilinx_axienet.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c index c3c0663..4c7d390 100644 --- a/hw/xilinx_axienet.c +++ b/hw/xilinx_axienet.c @@ -32,6 +32,11 @@ #define DPHY(x) +#define TYPE_XILINX_AXI_ENET "xlnx.axi-ethernet" + +#define XILINX_AXI_ENET(obj) \ + OBJECT_CHECK(XilinxAXIEnet, (obj), TYPE_XILINX_AXI_ENET) + /* Advertisement control register. */ #define ADVERTISE_10HALF 0x0020 /* Try for 10mbps half-duplex */ #define ADVERTISE_10FULL 0x0040 /* Try for 10mbps full-duplex */ @@ -846,7 +851,7 @@ static NetClientInfo net_xilinx_enet_info = { static int xilinx_enet_init(SysBusDevice *dev) { - XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), dev); + XilinxAXIEnet *s = XILINX_AXI_ENET(dev); sysbus_init_irq(dev, &s->irq); @@ -871,7 +876,7 @@ static int xilinx_enet_init(SysBusDevice *dev) static void xilinx_enet_initfn(Object *obj) { - XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj)); + XilinxAXIEnet *s = XILINX_AXI_ENET(obj); Error *errp = NULL; object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, @@ -899,7 +904,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, void *data) } static const TypeInfo xilinx_enet_info = { - .name = "xlnx.axi-ethernet", + .name = TYPE_XILINX_AXI_ENET, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(XilinxAXIEnet), .class_init = xilinx_enet_class_init,