* [Qemu-devel] [PATCH v2 1/3] unin_pci: Clean up qdev names
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 0/3] UniNorth PCI cleanups Andreas Färber
@ 2012-01-19 17:40 ` Andreas Färber
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 2/3] unin_pci: Drop duplicate busdev Andreas Färber
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Andreas Färber @ 2012-01-19 17:40 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, qemu-ppc, Andreas Färber, Alexander Graf
Add -pcihost to SysBus devices to resolve name conflicts,
and clarify PCI vs. Internal PCI.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Alexander Graf <agraf@suse.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>
---
hw/unin_pci.c | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index 14d9914..be0e98c 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -213,7 +213,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
/* Use values found on a real PowerMac */
/* Uninorth main bus */
- dev = qdev_create(NULL, "uni-north");
+ dev = qdev_create(NULL, "uni-north-pci-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
d = FROM_SYSBUS(UNINState, s);
@@ -245,7 +245,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
/* Uninorth AGP bus */
pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north-agp");
- dev = qdev_create(NULL, "uni-north-agp");
+ dev = qdev_create(NULL, "uni-north-agp-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
sysbus_mmio_map(s, 0, 0xf0800000);
@@ -254,8 +254,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
/* Uninorth internal bus */
#if 0
/* XXX: not needed for now */
- pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), "uni-north-pci");
- dev = qdev_create(NULL, "uni-north-pci");
+ pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0),
+ "uni-north-internal-pci");
+ dev = qdev_create(NULL, "uni-north-internal-pci-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
sysbus_mmio_map(s, 0, 0xf4800000);
@@ -275,7 +276,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
/* Uninorth AGP bus */
- dev = qdev_create(NULL, "u3-agp");
+ dev = qdev_create(NULL, "u3-agp-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
d = FROM_SYSBUS(UNINState, s);
@@ -335,7 +336,7 @@ static int unin_internal_pci_host_init(PCIDevice *d)
}
static PCIDeviceInfo unin_main_pci_host_info = {
- .qdev.name = "uni-north",
+ .qdev.name = "uni-north-pci",
.qdev.size = sizeof(PCIDevice),
.init = unin_main_pci_host_init,
.vendor_id = PCI_VENDOR_ID_APPLE,
@@ -365,7 +366,7 @@ static PCIDeviceInfo unin_agp_pci_host_info = {
};
static PCIDeviceInfo unin_internal_pci_host_info = {
- .qdev.name = "uni-north-pci",
+ .qdev.name = "uni-north-internal-pci",
.qdev.size = sizeof(PCIDevice),
.init = unin_internal_pci_host_init,
.vendor_id = PCI_VENDOR_ID_APPLE,
@@ -374,19 +375,42 @@ static PCIDeviceInfo unin_internal_pci_host_info = {
.class_id = PCI_CLASS_BRIDGE_HOST,
};
+static SysBusDeviceInfo sysbus_unin_pci_host_info = {
+ .qdev.name = "uni-north-pci-pcihost",
+ .qdev.size = sizeof(UNINState),
+ .init = pci_unin_main_init_device,
+};
+
+static SysBusDeviceInfo sysbus_u3_agp_pci_host_info = {
+ .qdev.name = "u3-agp-pcihost",
+ .qdev.size = sizeof(UNINState),
+ .init = pci_u3_agp_init_device,
+};
+
+static SysBusDeviceInfo sysbus_unin_agp_pci_host_info = {
+ .qdev.name = "uni-north-agp-pcihost",
+ .qdev.size = sizeof(UNINState),
+ .init = pci_unin_agp_init_device,
+};
+
+static SysBusDeviceInfo sysbus_unin_internal_pci_host_info = {
+ .qdev.name = "uni-north-internal-pci-pcihost",
+ .qdev.size = sizeof(UNINState),
+ .init = pci_unin_internal_init_device,
+};
+
static void unin_register_devices(void)
{
- sysbus_register_dev("uni-north", sizeof(UNINState),
- pci_unin_main_init_device);
+ sysbus_register_withprop(&sysbus_unin_pci_host_info);
pci_qdev_register(&unin_main_pci_host_info);
- sysbus_register_dev("u3-agp", sizeof(UNINState),
- pci_u3_agp_init_device);
+
+ sysbus_register_withprop(&sysbus_u3_agp_pci_host_info);
pci_qdev_register(&u3_agp_pci_host_info);
- sysbus_register_dev("uni-north-agp", sizeof(UNINState),
- pci_unin_agp_init_device);
+
+ sysbus_register_withprop(&sysbus_unin_agp_pci_host_info);
pci_qdev_register(&unin_agp_pci_host_info);
- sysbus_register_dev("uni-north-pci", sizeof(UNINState),
- pci_unin_internal_init_device);
+
+ sysbus_register_withprop(&sysbus_unin_internal_pci_host_info);
pci_qdev_register(&unin_internal_pci_host_info);
}
--
1.7.7
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH v2 2/3] unin_pci: Drop duplicate busdev
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 0/3] UniNorth PCI cleanups Andreas Färber
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 1/3] unin_pci: Clean up qdev names Andreas Färber
@ 2012-01-19 17:40 ` Andreas Färber
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 3/3] unin_pci: Drop unused reset handler Andreas Färber
2012-01-23 17:05 ` [Qemu-devel] [Qemu-ppc] [PATCH v2 0/3] UniNorth PCI cleanups Alexander Graf
3 siblings, 0 replies; 8+ messages in thread
From: Andreas Färber @ 2012-01-19 17:40 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, Andreas Färber, Alexander Graf
PCIHostState already has a busdev.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Alexander Graf <agraf@suse.de>
---
hw/unin_pci.c | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index be0e98c..8c03cb0 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -39,7 +39,6 @@
static const int unin_irq_line[] = { 0x1b, 0x1c, 0x1d, 0x1e };
typedef struct UNINState {
- SysBusDevice busdev;
PCIHostState host_state;
MemoryRegion pci_mmio;
MemoryRegion pci_hole;
@@ -134,11 +133,13 @@ static const MemoryRegionOps unin_data_ops = {
static int pci_unin_main_init_device(SysBusDevice *dev)
{
+ PCIHostState *h;
UNINState *s;
/* Use values found on a real PowerMac */
/* Uninorth main bus */
- s = FROM_SYSBUS(UNINState, dev);
+ h = FROM_SYSBUS(PCIHostState, dev);
+ s = DO_UPCAST(UNINState, host_state, h);
memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops,
&s->host_state, "pci-conf-idx", 0x1000);
@@ -154,10 +155,12 @@ static int pci_unin_main_init_device(SysBusDevice *dev)
static int pci_u3_agp_init_device(SysBusDevice *dev)
{
+ PCIHostState *h;
UNINState *s;
/* Uninorth U3 AGP bus */
- s = FROM_SYSBUS(UNINState, dev);
+ h = FROM_SYSBUS(PCIHostState, dev);
+ s = DO_UPCAST(UNINState, host_state, h);
memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops,
&s->host_state, "pci-conf-idx", 0x1000);
@@ -173,10 +176,12 @@ static int pci_u3_agp_init_device(SysBusDevice *dev)
static int pci_unin_agp_init_device(SysBusDevice *dev)
{
+ PCIHostState *h;
UNINState *s;
/* Uninorth AGP bus */
- s = FROM_SYSBUS(UNINState, dev);
+ h = FROM_SYSBUS(PCIHostState, dev);
+ s = DO_UPCAST(UNINState, host_state, h);
memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops,
&s->host_state, "pci-conf-idx", 0x1000);
@@ -189,10 +194,12 @@ static int pci_unin_agp_init_device(SysBusDevice *dev)
static int pci_unin_internal_init_device(SysBusDevice *dev)
{
+ PCIHostState *h;
UNINState *s;
/* Uninorth internal bus */
- s = FROM_SYSBUS(UNINState, dev);
+ h = FROM_SYSBUS(PCIHostState, dev);
+ s = DO_UPCAST(UNINState, host_state, h);
memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops,
&s->host_state, "pci-conf-idx", 0x1000);
@@ -209,6 +216,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
{
DeviceState *dev;
SysBusDevice *s;
+ PCIHostState *h;
UNINState *d;
/* Use values found on a real PowerMac */
@@ -216,14 +224,15 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
dev = qdev_create(NULL, "uni-north-pci-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
- d = FROM_SYSBUS(UNINState, s);
+ h = FROM_SYSBUS(PCIHostState, s);
+ d = DO_UPCAST(UNINState, host_state, h);
memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL);
memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio,
0x80000000ULL, 0x70000000ULL);
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
&d->pci_hole);
- d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",
+ d->host_state.bus = pci_register_bus(dev, "pci",
pci_unin_set_irq, pci_unin_map_irq,
pic,
&d->pci_mmio,
@@ -272,6 +281,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
{
DeviceState *dev;
SysBusDevice *s;
+ PCIHostState *h;
UNINState *d;
/* Uninorth AGP bus */
@@ -279,7 +289,8 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
dev = qdev_create(NULL, "u3-agp-pcihost");
qdev_init_nofail(dev);
s = sysbus_from_qdev(dev);
- d = FROM_SYSBUS(UNINState, s);
+ h = FROM_SYSBUS(PCIHostState, s);
+ d = DO_UPCAST(UNINState, host_state, h);
memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL);
memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio,
@@ -287,7 +298,7 @@ PCIBus *pci_pmac_u3_init(qemu_irq *pic,
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
&d->pci_hole);
- d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",
+ d->host_state.bus = pci_register_bus(dev, "pci",
pci_unin_set_irq, pci_unin_map_irq,
pic,
&d->pci_mmio,
--
1.7.7
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH v2 3/3] unin_pci: Drop unused reset handler
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 0/3] UniNorth PCI cleanups Andreas Färber
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 1/3] unin_pci: Clean up qdev names Andreas Färber
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 2/3] unin_pci: Drop duplicate busdev Andreas Färber
@ 2012-01-19 17:40 ` Andreas Färber
2012-01-23 17:05 ` [Qemu-devel] [Qemu-ppc] [PATCH v2 0/3] UniNorth PCI cleanups Alexander Graf
3 siblings, 0 replies; 8+ messages in thread
From: Andreas Färber @ 2012-01-19 17:40 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, Andreas Färber, Alexander Graf
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Alexander Graf <agraf@suse.de>
---
hw/unin_pci.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index 8c03cb0..6a10013 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -63,10 +63,6 @@ static void pci_unin_set_irq(void *opaque, int irq_num, int level)
qemu_set_irq(pic[unin_irq_line[irq_num]], level);
}
-static void pci_unin_reset(void *opaque)
-{
-}
-
static uint32_t unin_get_config_reg(uint32_t reg, uint32_t addr)
{
uint32_t retval;
@@ -148,7 +144,6 @@ static int pci_unin_main_init_device(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->host_state.conf_mem);
sysbus_init_mmio(dev, &s->host_state.data_mem);
- qemu_register_reset(pci_unin_reset, &s->host_state);
return 0;
}
@@ -169,8 +164,6 @@ static int pci_u3_agp_init_device(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->host_state.conf_mem);
sysbus_init_mmio(dev, &s->host_state.data_mem);
- qemu_register_reset(pci_unin_reset, &s->host_state);
-
return 0;
}
--
1.7.7
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [Qemu-ppc] [PATCH v2 0/3] UniNorth PCI cleanups
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 0/3] UniNorth PCI cleanups Andreas Färber
` (2 preceding siblings ...)
2012-01-19 17:40 ` [Qemu-devel] [PATCH v2 3/3] unin_pci: Drop unused reset handler Andreas Färber
@ 2012-01-23 17:05 ` Alexander Graf
3 siblings, 0 replies; 8+ messages in thread
From: Alexander Graf @ 2012-01-23 17:05 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-ppc, qemu-devel
On 01/19/2012 06:40 PM, Andreas Färber wrote:
> Hello Alex,
>
> Here's an 80-char fixed version of the qdev renaming for Anthony
> plus two more cleanups. More to follow.
Thanks, applied all to ppc-next.
Alex
^ permalink raw reply [flat|nested] 8+ messages in thread