From patchwork Thu Jun 6 05:34:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 249276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 02E732C00B8 for ; Thu, 6 Jun 2013 15:36:00 +1000 (EST) Received: from localhost ([::1]:51921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkSrd-0002WJ-6i for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2013 01:35:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkSrJ-0002WC-FO for qemu-devel@nongnu.org; Thu, 06 Jun 2013 01:35:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkSrI-0005GF-Fv for qemu-devel@nongnu.org; Thu, 06 Jun 2013 01:35:37 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:56175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkSrI-0005GB-90 for qemu-devel@nongnu.org; Thu, 06 Jun 2013 01:35:36 -0400 Received: by mail-pd0-f174.google.com with SMTP id 10so1881768pdc.19 for ; Wed, 05 Jun 2013 22:35:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=8ZjorxqHrnupmUk6KUj0Dx/aXdDLGtU5HMOOIrWmUEQ=; b=C1afEHN5TZVFbicZc29beb6o5O3tTykqYG2T3uQDTu3hCeQ7ez81xD2FYQvAD0wkRk lXNqWggDxGjdqx6R263AnENuoTihPIarAFe0++inZuRW2eLOTFLw3V/73UmoAPz8UziN VIk6vm0HMd3kJfCllgYrNU/TNKLSgEfy0cCYoeEvvI1T34h8SYtg5FhOy3oYrBQM5slq 1P06ZepoAkVGJri2ztbebxpzajIl1MqszhSCjujQmFzbf1lywnzrkUeKGEmVcVp+Auly i/AkJpACP8gJuD8EEnE1BTvOc0H4Fg/iGh/zleGqSFsw1selmx7BDZp2CFKy9M6S2NMq 0XnA== X-Received: by 10.68.239.169 with SMTP id vt9mr36190496pbc.8.1370496935437; Wed, 05 Jun 2013 22:35:35 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id ra4sm76019163pab.9.2013.06.05.22.35.32 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 05 Jun 2013 22:35:34 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2013 15:34:52 +1000 Message-Id: <96f00396338321f5a76c9b86c629b69895e4d2d0.1370496582.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.8.3.rc1.44.gb387c77.dirty In-Reply-To: <54453b6aa8afa1a76b2ec1932f1d7fd25205d0bc.1370496582.git.peter.crosthwaite@xilinx.com> References: <54453b6aa8afa1a76b2ec1932f1d7fd25205d0bc.1370496582.git.peter.crosthwaite@xilinx.com> X-Gm-Message-State: ALoCoQneypGa+dd7d2S7Ubk51OV8VKLE4g6thvg/ChwWnJpd4AtX/3ihvL0x5ofpUGXk4Q7hnf0N X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.174 Cc: edgar.iglesias@gmail.com, kraxel@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 2/2] audio/intel-hda: QOM casting sweep 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 From: Peter Crosthwaite Define and use standard QOM cast macro. Remove usages of DO_UPCAST and direct -> style casting. Signed-off-by: Peter Crosthwaite Reviewed-by: Andreas Färber Reviewed-by: Gerd Hoffmann --- hw/audio/intel-hda.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index eac0cf3..3ac90d5 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -191,6 +191,9 @@ struct IntelHDAState { #define TYPE_INTEL_HDA_GENERIC "intel-hda-generic" +#define INTEL_HDA(obj) \ + OBJECT_CHECK(IntelHDAState, (obj), TYPE_INTEL_HDA_GENERIC) + struct IntelHDAReg { const char *name; /* register name */ uint32_t size; /* size in bytes */ @@ -500,7 +503,7 @@ static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn static void intel_hda_set_g_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint32_t old) { if ((d->g_ctl & ICH6_GCTL_RESET) == 0) { - intel_hda_reset(&d->pci.qdev); + intel_hda_reset(DEVICE(d)); } } @@ -1104,7 +1107,7 @@ static const MemoryRegionOps intel_hda_mmio_ops = { static void intel_hda_reset(DeviceState *dev) { BusChild *kid; - IntelHDAState *d = DO_UPCAST(IntelHDAState, pci.qdev, dev); + IntelHDAState *d = INTEL_HDA(dev); HDACodecDevice *cdev; intel_hda_regs_reset(d); @@ -1122,7 +1125,7 @@ static void intel_hda_reset(DeviceState *dev) static int intel_hda_init(PCIDevice *pci) { - IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); + IntelHDAState *d = INTEL_HDA(pci); uint8_t *conf = d->pci.config; d->name = object_get_typename(OBJECT(d)); @@ -1139,7 +1142,7 @@ static int intel_hda_init(PCIDevice *pci) msi_init(&d->pci, 0x50, 1, true, false); } - hda_codec_bus_init(&d->pci.qdev, &d->codecs, + hda_codec_bus_init(DEVICE(pci), &d->codecs, intel_hda_response, intel_hda_xfer); return 0; @@ -1147,7 +1150,7 @@ static int intel_hda_init(PCIDevice *pci) static void intel_hda_exit(PCIDevice *pci) { - IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); + IntelHDAState *d = INTEL_HDA(pci); msi_uninit(&d->pci); memory_region_destroy(&d->mmio); @@ -1312,12 +1315,12 @@ static const TypeInfo hda_codec_device_type_info = { */ static int intel_hda_and_codec_init(PCIBus *bus) { - PCIDevice *controller; + DeviceState *controller; BusState *hdabus; DeviceState *codec; - controller = pci_create_simple(bus, -1, "intel-hda"); - hdabus = QLIST_FIRST(&controller->qdev.child_bus); + controller = DEVICE(pci_create_simple(bus, -1, "intel-hda")); + hdabus = QLIST_FIRST(&controller->child_bus); codec = qdev_create(hdabus, "hda-duplex"); qdev_init_nofail(codec); return 0;