From patchwork Thu Jun 14 04:38:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 164804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 412D9B701F for ; Thu, 14 Jun 2012 14:39:07 +1000 (EST) Received: from localhost ([::1]:46699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sf1pp-00071X-4H for incoming@patchwork.ozlabs.org; Thu, 14 Jun 2012 00:39:05 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=WUkwlAY2yD1mvx3Q9M2jyev1aTK0xH5eg/xCmK1ceI0=; b=OyCk75NfZM65KYf8LrRxvJvfxLu63IPT68Q0xcQ4P0OTBYkZXgfw9hSmi9BcPVJx5+ zkRXk5gAGzeCRxha0UAnGKs/kxHIoiCOgpfCZOH70+BO8P3JZUfB9/1cvdonEyrSLoAm 1D0LXTOhSPmDbOpkslJ/NAwPA0AJlHzhQe+WddMI0RN/SqNU4dtr3i6U9g7+d/O91yBM hQUMOwvsxOv7rwH4y0fpqqCK7EX9xw/TaBecDTFxvYsEPC/kMOZ44uXgyw/2lRPPFFP3 2BkYUrVfhJqVmqe56NW9iCd+5/dTbX3GLPeTXXxYHpN424WgX+9P9WRwpVogDCumCALx AoRw== Received: by 10.68.227.198 with SMTP id sc6mr3373556pbc.138.1339648733504; Wed, 13 Jun 2012 21:38:53 -0700 (PDT) Received: from [10.61.2.175] (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPS id z2sm8121567pbv.34.2012.06.13.21.38.51 (version=SSLv3 cipher=OTHER); 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 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: kvm-ppc@vger.kernel.org, "qemu-devel@nongnu.org" , Benjamin Herrenschmidt X-Gm-Message-State: ALoCoQnHFld6LsKs7OGHnGKe5WVofzf7cLiRp8AggIL3i5ABzRTYajeqYNHHPscV7UEz+Va0wJsR X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH] pseries pci: removed redundand busdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;