[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0-rc0 06/31] ssi: Convert legacy SSI_BUS -> BUS
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0-rc0 06/31] ssi: Convert legacy SSI_BUS -> BUS casts |
Date: |
Wed, 12 Mar 2014 22:09:38 +0100 |
From: Peter Crosthwaite <address@hidden>
Remove two legacy ->qbus style casts from TYPE_SSI_BUS to TYPE_BUS in
ssi.c.
Signed-off-by: Peter Crosthwaite <address@hidden>
[AF: Convert one missing ->qbus and rename parent field]
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ssi/ssi.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index 3cac37c..017f022 100644
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -15,7 +15,7 @@
#include "hw/ssi.h"
struct SSIBus {
- BusState qbus;
+ BusState parent_obj;
};
#define TYPE_SSI_BUS "SSI"
@@ -88,7 +88,7 @@ static const TypeInfo ssi_slave_info = {
DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name)
{
- return qdev_create(&bus->qbus, name);
+ return qdev_create(BUS(bus), name);
}
DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
@@ -108,11 +108,12 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char
*name)
uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
{
+ BusState *b = BUS(bus);
BusChild *kid;
SSISlaveClass *ssc;
uint32_t r = 0;
- QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
+ QTAILQ_FOREACH(kid, &b->children, sibling) {
SSISlave *slave = SSI_SLAVE(kid->child);
ssc = SSI_SLAVE_GET_CLASS(slave);
r |= ssc->transfer_raw(slave, val);
@@ -156,7 +157,7 @@ static int ssi_auto_connect_slave(Object *child, void
*opaque)
}
cs_line = qdev_get_gpio_in(DEVICE(dev), 0);
- qdev_set_parent_bus(DEVICE(dev), &arg->bus->qbus);
+ qdev_set_parent_bus(DEVICE(dev), BUS(arg->bus));
**arg->cs_linep = cs_line;
(*arg->cs_linep)++;
return 0;
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0-rc0 04/31] qom: Avoid leaking str and bool properties on failure, (continued)
- [Qemu-devel] [PULL for-2.0-rc0 04/31] qom: Avoid leaking str and bool properties on failure, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 07/31] misc/max111x: Create abstract max111x type, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 05/31] ssi: Convert legacy SSI_SLAVE -> DEVICE casts, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 01/31] qdev: Fix bus dependency of DeviceState::hotpluggable getter, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 11/31] spapr-pci: Change the default PCI bus naming, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 12/31] qdev-monitor-test: Simplify using g_assert_cmpstr(), Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 13/31] qdev-monitor-test: Don't test human-readable error message, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 15/31] vl: Use MachineClass instead of global QEMUMachine list, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 08/31] misc/max111x: QOM casting sweep, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 09/31] ssi: Remove SSI_SLAVE_FROM_QDEV() macro, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 06/31] ssi: Convert legacy SSI_BUS -> BUS casts,
Andreas Färber <=
- [Qemu-devel] [PULL for-2.0-rc0 03/31] qdev-monitor: Set properties after parent is assigned in device_add, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 17/31] qom-test: Test QOM properties, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 10/31] block/m25p80: Remove FROM_SSI_SLAVE() usages, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 20/31] tests: Add virtio-balloon qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 14/31] hw/core: Introduce QEMU machine as QOM object, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 19/31] tests: Add virtio-blk qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 27/31] tests: Add spapr-pci-host-bridge qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 21/31] tests: Add virtio-rng qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 18/31] tests: Clean up IndustryPack TPCI200 gcov paths, Andreas Färber, 2014/03/12
- [Qemu-devel] [PULL for-2.0-rc0 23/31] tests: Add virtio-serial qtest, Andreas Färber, 2014/03/12