[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/24] pseries pci: removed redundant busdev
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 01/24] pseries pci: removed redundant busdev |
Date: |
Wed, 15 Aug 2012 11:58:39 +0200 |
From: Alexey Kardashevskiy <address@hidden>
The PCIHostState struct already contains SysBusDevice so
the one in sPAPRPHBState has to go.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/spapr_pci.c | 4 ++--
hw/spapr_pci.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index b2e4f78..5bee180 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus *bus,
void *opaque,
static int spapr_phb_init(SysBusDevice *s)
{
- sPAPRPHBState *phb = FROM_SYSBUS(sPAPRPHBState, s);
+ sPAPRPHBState *phb = DO_UPCAST(sPAPRPHBState, host_state.busdev, s);
char *namebuf;
int i;
PCIBus *bus;
@@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s)
memory_region_add_subregion(get_system_memory(), phb->io_win_addr,
&phb->iowindow);
- bus = pci_register_bus(&phb->busdev.qdev,
+ bus = pci_register_bus(&phb->host_state.busdev.qdev,
phb->busname ? phb->busname : phb->dtbusname,
pci_spapr_set_irq, pci_spapr_map_irq, phb,
&phb->memspace, &phb->iospace,
diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
index d9e46e2..a141764 100644
--- a/hw/spapr_pci.h
+++ b/hw/spapr_pci.h
@@ -28,7 +28,6 @@
#include "hw/xics.h"
typedef struct sPAPRPHBState {
- SysBusDevice busdev;
PCIHostState host_state;
uint64_t buid;
--
1.6.0.2
- [Qemu-devel] [PULL 00/24] ppc patch queue 2012-08-15, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 03/24] PPC: e500: rename mpc8544ds into generic file, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 02/24] pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 04/24] PPC: e500: change internal references away from mpc8544ds, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 01/24] pseries pci: removed redundant busdev,
Alexander Graf <=
- [Qemu-devel] [PATCH 05/24] PPC: e500: split mpc8544ds machine from generic e500 code, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 06/24] PPC: e500: add generic e500 platform, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 07/24] ppc: Fix bug in handling of PAPR hypercall exits, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 08/24] Revert "PPC: e500: Use new MPIC dt format", Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 11/24] xbzrle: fix compilation on ppc32, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 09/24] Add one new file vga-pci.h and cleanup on all platforms, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 13/24] PPC: spapr: Remove global variable, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 10/24] spapr: Add support for -vga option, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 12/24] PPC: spapr: Rework VGA select logic, Alexander Graf, 2012/08/15