From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sf1ph-00071F-FW for qemu-devel@nongnu.org; Thu, 14 Jun 2012 00:38:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sf1pf-0001Rx-PV for qemu-devel@nongnu.org; Thu, 14 Jun 2012 00:38:57 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:57475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sf1pf-0001Rk-Im for qemu-devel@nongnu.org; Thu, 14 Jun 2012 00:38:55 -0400 Received: by dadn2 with SMTP id n2so958626dad.4 for ; Wed, 13 Jun 2012 21:38:53 -0700 (PDT) Message-ID: <4FD96ADA.9070208@ozlabs.ru> Date: Thu, 14 Jun 2012 14:38:50 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] pseries pci: removed redundand busdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm-ppc@vger.kernel.org, "qemu-devel@nongnu.org" , Benjamin Herrenschmidt The PCIHostState struct already contains SysBusDevice so the one in sPAPRPHBState has to go. Signed-off-by: Alexey Kardashevskiy --- 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 75943cf..1c0b605 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -215,7 +215,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; @@ -253,7 +253,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.7.7.3