From patchwork Tue Jun 11 07:02:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 250478 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 431002C0099 for ; Tue, 11 Jun 2013 17:08:18 +1000 (EST) Received: from localhost ([::1]:33081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIgi-0001bt-2a for incoming@patchwork.ozlabs.org; Tue, 11 Jun 2013 03:08:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIgN-0001YO-40 for qemu-devel@nongnu.org; Tue, 11 Jun 2013 03:07:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmIgL-000343-V2 for qemu-devel@nongnu.org; Tue, 11 Jun 2013 03:07:55 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:59675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmIgL-00033y-GV for qemu-devel@nongnu.org; Tue, 11 Jun 2013 03:07:53 -0400 Received: by mail-pd0-f175.google.com with SMTP id 4so8302960pdd.20 for ; Tue, 11 Jun 2013 00:07:52 -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=mNUfpogW5JXvLlhIPh8okT0A/ef/k6bSWnM/0eE0FLI=; b=IkVAzAVAgfUAqW1sMu9AWbqqNO8JZw8xjCsfuXzgYWlwc77E2Xkx3WA5iidOEeYtWT As/Y9ADFvqa8GE5V/xBLkiyV9098OG+/Sg0uTPfA4LjRea6I+cq57p4+HJCdxjsXVi+G qFNTM2Pt/lsoMoOJlaRBQxdO2RCR2JfbiQGWunHgvVyz1zkC/YPEiBg0iPv5qVIR58of +bpz/F0v7sc5sFa4GlLLShU6NnMyaX53QwHc83rUDvDT2oHKklEigsW6Ad1vNPgyoV2x Sv0zvpAkpI6fh6O7wRyKCOFE9bG55VWd1ezMt6J7owQHJjjAXxEo0HUHxpao9OeS0buy G5hQ== X-Received: by 10.66.217.226 with SMTP id pb2mr17384690pac.109.1370934472813; Tue, 11 Jun 2013 00:07:52 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id b7sm13455139pba.39.2013.06.11.00.07.46 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 11 Jun 2013 00:07:51 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Tue, 11 Jun 2013 17:02:41 +1000 Message-Id: <3b21525f3bd768755348fcf6f8e1b5fa2545c7fc.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: ALoCoQmPzqSS8oSJxh7+efJpjMABHSff6kUh2XCjUQxpo6wTY+3jHserzKfJTxIAD+EC1bHkqvC0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.175 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [RFT PATCH v1 30/30] i386/*: substitute ->qdev casts with DEVICE() 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 Signed-off-by: Peter Crosthwaite --- hw/i386/kvm/pci-assign.c | 21 ++++++++++++--------- hw/i386/pc.c | 4 ++-- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index ff85590..d9c2436 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -491,7 +491,7 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, name, cur_region->size, virtbase); vmstate_register_ram(&pci_dev->v_addrs[i].real_iomem, - &pci_dev->dev.qdev); + DEVICE(&pci_dev->dev)); } assigned_dev_iomem_setup(&pci_dev->dev, i, cur_region->size); @@ -817,6 +817,7 @@ fail: static int assign_device(AssignedDevice *dev) { + DeviceState *d = DEVICE(&dev->dev); uint32_t flags = KVM_DEV_ASSIGN_ENABLE_IOMMU; int r; @@ -830,7 +831,7 @@ static int assign_device(AssignedDevice *dev) if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) { error_report("No IOMMU found. Unable to assign device \"%s\"", - dev->dev.qdev.id); + d->id); return -ENODEV; } @@ -842,7 +843,7 @@ static int assign_device(AssignedDevice *dev) r = kvm_device_pci_assign(kvm_state, &dev->host, flags, &dev->dev_id); if (r < 0) { error_report("Failed to assign device \"%s\" : %s", - dev->dev.qdev.id, strerror(-r)); + d->id, strerror(-r)); switch (r) { case -EBUSY: @@ -867,6 +868,7 @@ static bool check_irqchip_in_kernel(void) static int assign_intx(AssignedDevice *dev) { + DeviceState *d = DEVICE(&dev->dev); AssignedIRQType new_type; PCIINTxRoute intx_route; bool intx_host_msi; @@ -942,7 +944,7 @@ retry: goto retry; } error_report("Failed to assign irq for \"%s\": %s", - dev->dev.qdev.id, strerror(-r)); + d->id, strerror(-r)); error_report("Perhaps you are assigning a device " "that shares an IRQ with another device?"); return r; @@ -972,7 +974,7 @@ static void assigned_dev_update_irq_routing(PCIDevice *dev) r = assign_intx(assigned_dev); if (r < 0) { - qdev_unplug(&dev->qdev, &err); + qdev_unplug(DEVICE(dev), &err); assert(!err); } } @@ -1675,7 +1677,7 @@ static const VMStateDescription vmstate_assigned_device = { static void reset_assigned_device(DeviceState *dev) { - PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev); + PCIDevice *pci_dev = PCI_DEVICE(dev); AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev); char reset_file[64]; const char reset[] = "1"; @@ -1731,6 +1733,7 @@ static void reset_assigned_device(DeviceState *dev) static int assigned_initfn(struct PCIDevice *pci_dev) { + DeviceState *d = DEVICE(pci_dev); AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint8_t e_intx; int r; @@ -1769,7 +1772,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev) if (get_real_device(dev, dev->host.domain, dev->host.bus, dev->host.slot, dev->host.function)) { error_report("pci-assign: Error: Couldn't get real device (%s)!", - dev->dev.qdev.id); + d->id); goto out; } @@ -1811,7 +1814,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev) assigned_dev_load_option_rom(dev); - add_boot_device_path(dev->bootindex, &pci_dev->qdev, NULL); + add_boot_device_path(dev->bootindex, d, NULL); return 0; @@ -1916,7 +1919,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev) snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(dev))); memory_region_init_ram(&dev->dev.rom, name, st.st_size); - vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev); + vmstate_register_ram(&dev->dev.rom, DEVICE(&dev->dev)); ptr = memory_region_get_ram_ptr(&dev->dev.rom); memset(ptr, 0xff, st.st_size); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4844a6b..120f02c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1085,10 +1085,10 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) if (pci_bus) { PCIDevice *pcidev = pci_vga_init(pci_bus); - dev = pcidev ? &pcidev->qdev : NULL; + dev = DEVICE(pcidev); } else if (isa_bus) { ISADevice *isadev = isa_vga_init(isa_bus); - dev = isadev ? &isadev->qdev : NULL; + dev = DEVICE(isadev); } return dev; } diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d618570..1b40f24 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -191,8 +191,8 @@ static void pc_init1(MemoryRegion *system_memory, } else { dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); } - idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0"); - idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1"); + idebus[0] = qdev_get_child_bus(DEVICE(dev), "ide.0"); + idebus[1] = qdev_get_child_bus(DEVICE(dev), "ide.1"); } else { for(i = 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7888dfe..ff48bbf 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -179,8 +179,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args) PCI_DEVFN(ICH9_SATA1_DEV, ICH9_SATA1_FUNC), true, "ich9-ahci"); - idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0"); - idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1"); + idebus[0] = qdev_get_child_bus(DEVICE(ahci), "ide.0"); + idebus[1] = qdev_get_child_bus(DEVICE(ahci), "ide.1"); if (usb_enabled(false)) { /* Should we create 6 UHCI according to ich9 spec? */