From patchwork Tue Jun 11 06:47:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 250458 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 16FF82C009A for ; Tue, 11 Jun 2013 16:53:12 +1000 (EST) Received: from localhost ([::1]:53896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIS6-0007Z4-1H for incoming@patchwork.ozlabs.org; Tue, 11 Jun 2013 02:53:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIRp-0007We-9V for qemu-devel@nongnu.org; Tue, 11 Jun 2013 02:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmIRl-0006jw-N8 for qemu-devel@nongnu.org; Tue, 11 Jun 2013 02:52:53 -0400 Received: from mail-pb0-x234.google.com ([2607:f8b0:400e:c01::234]:58713) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIRl-0006jk-Cn for qemu-devel@nongnu.org; Tue, 11 Jun 2013 02:52:49 -0400 Received: by mail-pb0-f52.google.com with SMTP id xa12so8133828pbc.39 for ; Mon, 10 Jun 2013 23:52:48 -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=C1eyggehFxXtcNaKue8UxB0eYkWZgs3ujKsrd+NoFdk=; b=KJ250UD63jIW97MH3uH/DkJld5IXYebQxRmM4BGlKd1dWQ9THlYRslspEd7hTGGsaz +SqYBmV5/UZVozLeNcZgybT3sHavEGMXYhzE49q2cgEnU/6N04/OeUjyBuh7CjB2t3I3 zdneVYf/ljjE/R5/ewAe/f0z0OyDHatHmmYikMBWxN8gkbB7JKBZ+itlUc0dBaA3yQE9 d1YxRuGVJaIcE0n7IsU2OsLCwi8wXxOVh0q2S8oDfI9mg1RPAc30XhO8B+deqCQ0IJXY nrxJKbIK+rq+2Vl3Y2ta8YKkAumKccGF+u401zRtTB8Uznr6d7vuMAj5wHONxgVY7Nbu uHkw== X-Received: by 10.68.95.66 with SMTP id di2mr10004161pbb.180.1370933568534; Mon, 10 Jun 2013 23:52:48 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id b7sm13402164pba.39.2013.06.10.23.52.42 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 10 Jun 2013 23:52:47 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Tue, 11 Jun 2013 16:47:38 +1000 Message-Id: <903de2ae310e3ad4c1754231e222a67688656d60.1370931825.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.8.3.rc1.44.gb387c77.dirty In-Reply-To: References: X-Gm-Message-State: ALoCoQmO9Hp5ZGw2WtmiBJ/WMNH08J46QUrAFHRi8NoWuW0ug5szUJhh99ty6zIOi2L9qx3PYc2D X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::234 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [RFT PATCH v1 10/30] acpi/piix4: QOM Upcast 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 Use standard QOM cast macro. Remove usages of DO_UPCAST and direct -> style upcasting. Signed-off-by: Peter Crosthwaite --- hw/acpi/piix4.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e6525ac..83a8407 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -96,6 +96,11 @@ typedef struct PIIX4PMState { Notifier cpu_added_notifier; } PIIX4PMState; +#define TYPE_PIIX4_PM "PIIX4_PM" + +#define PIIX4_PM(obj) \ + OBJECT_CHECK(PIIX4PMState, (obj), TYPE_PIIX4_PM) + static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, PCIBus *bus, PIIX4PMState *s); @@ -300,7 +305,7 @@ static const VMStateDescription vmstate_acpi = { static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) { BusChild *kid, *next; - BusState *bus = qdev_get_parent_bus(&s->dev.qdev); + BusState *bus = qdev_get_parent_bus(DEVICE(s)); int slot = ffs(slots) - 1; bool slot_free = true; @@ -326,8 +331,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) static void piix4_update_hotplug(PIIX4PMState *s) { - PCIDevice *dev = &s->dev; - BusState *bus = qdev_get_parent_bus(&dev->qdev); + BusState *bus = qdev_get_parent_bus(DEVICE(s)); BusChild *kid, *next; /* Execute any pending removes during reset */ @@ -395,7 +399,7 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) static int piix4_pm_initfn(PCIDevice *dev) { - PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, dev); + PIIX4PMState *s = PIIX4_PM(dev); uint8_t *pci_conf; pci_conf = s->dev.config; @@ -418,7 +422,7 @@ static int piix4_pm_initfn(PCIDevice *dev) pci_conf[0x90] = s->smb_io_base | 1; pci_conf[0x91] = s->smb_io_base >> 8; pci_conf[0xd2] = 0x09; - pm_smbus_init(&s->dev.qdev, &s->smb); + pm_smbus_init(DEVICE(dev), &s->smb); memory_region_set_enabled(&s->smb.io, pci_conf[0xd2] & 1); memory_region_add_subregion(pci_address_space_io(dev), s->smb_io_base, &s->smb.io); @@ -449,18 +453,18 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int kvm_enabled, FWCfgState *fw_cfg) { - PCIDevice *dev; + DeviceState *dev; PIIX4PMState *s; - dev = pci_create(bus, devfn, "PIIX4_PM"); - qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base); + dev = DEVICE(pci_create(bus, devfn, TYPE_PIIX4_PM)); + qdev_prop_set_uint32(dev, "smb_io_base", smb_io_base); - s = DO_UPCAST(PIIX4PMState, dev, dev); + s = PIIX4_PM(dev); s->irq = sci_irq; s->smi_irq = smi_irq; s->kvm_enabled = kvm_enabled; - qdev_init_nofail(&dev->qdev); + qdev_init_nofail(dev); if (fw_cfg) { uint8_t suspend[6] = {128, 0, 0, 129, 128, 128}; @@ -500,7 +504,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) } static const TypeInfo piix4_pm_info = { - .name = "PIIX4_PM", + .name = TYPE_PIIX4_PM, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX4PMState), .class_init = piix4_pm_class_init, @@ -678,7 +682,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, PCI_HOTPLUG_SIZE); memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR, &s->io_pci); - pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); + pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s)); qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu); memory_region_init_io(&s->io_cpu, &cpu_hotplug_ops, s, "apci-cpu-hotplug", @@ -704,8 +708,7 @@ static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, PCIHotplugState state) { int slot = PCI_SLOT(dev->devfn); - PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, - PCI_DEVICE(qdev)); + PIIX4PMState *s = PIIX4_PM(qdev); /* Don't send event when device is enabled during qemu machine creation: * it is present on boot, no hotplug event is necessary. We do send an