[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/30] ide/cmd646: substitute ->qdev casts with D
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [PATCH v2 27/30] ide/cmd646: substitute ->qdev casts with DEVICE() |
Date: |
Mon, 24 Jun 2013 17:09:57 +1000 |
From: Peter Crosthwaite <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/ide/cmd646.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index a73eb9a..9544c1f 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -281,7 +281,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
irq = qemu_allocate_irqs(cmd646_set_irq, d, 2);
for (i = 0; i < 2; i++) {
- ide_bus_new(&d->bus[i], &d->dev.qdev, i, 2);
+ ide_bus_new(&d->bus[i], DEVICE(d), i, 2);
ide_init2(&d->bus[i], irq[i]);
bmdma_init(&d->bus[i], &d->bmdma[i], d);
@@ -290,7 +290,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
&d->bmdma[i].dma);
}
- vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);
+ vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d);
qemu_register_reset(cmd646_reset, d);
return 0;
}
@@ -317,8 +317,8 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table,
PCIDevice *dev;
dev = pci_create(bus, -1, "cmd646-ide");
- qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled);
- qdev_init_nofail(&dev->qdev);
+ qdev_prop_set_uint32(DEVICE(dev), "secondary", secondary_ide_enabled);
+ qdev_init_nofail(DEVICE(dev));
pci_ide_create_devs(dev, hd_table);
}
--
1.8.3.rc1.44.gb387c77.dirty
- [Qemu-devel] [PATCH v2 17/30] pci-bridge/pci_bridge_dev: Don't use DO_UPCAST, (continued)
- [Qemu-devel] [PATCH v2 17/30] pci-bridge/pci_bridge_dev: Don't use DO_UPCAST, peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 18/30] pci-bridge/*: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 19/30] pci/pci_bridge: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 20/30] misc/vfio: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 21/30] net/eepro100: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 22/30] net/ne2000: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 23/30] usb/*: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 24/30] watchdog/wdt_i6300esb: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 25/30] scsi/vmw_pvscsi: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 26/30] i2c/smbus_ich9: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 27/30] ide/cmd646: substitute ->qdev casts with DEVICE(),
peter . crosthwaite <=
- [Qemu-devel] [PATCH v2 28/30] ide/via: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 29/30] pci-host/*: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- [Qemu-devel] [PATCH v2 30/30] i386/*: substitute ->qdev casts with DEVICE(), peter . crosthwaite, 2013/06/24
- Re: [Qemu-devel] [PATCH v2 00/30] PCI: Cleanup legacy casts in device land -- ANN: qom-next revived, Andreas Färber, 2013/06/30