From patchwork Tue Nov 27 13:00:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 1810901 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B326ADF254 for ; Tue, 27 Nov 2012 13:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753286Ab2K0NAh (ORCPT ); Tue, 27 Nov 2012 08:00:37 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:43753 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753233Ab2K0NAg (ORCPT ); Tue, 27 Nov 2012 08:00:36 -0500 Received: from mudshark.cambridge.arm.com (mudshark.cambridge.arm.com [10.1.79.58]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id qARD0U53009851; Tue, 27 Nov 2012 13:00:30 GMT Received: by mudshark.cambridge.arm.com (Postfix, from userid 1000) id 10426C2A9C; Tue, 27 Nov 2012 13:00:29 +0000 (GMT) From: Will Deacon To: kvm@vger.kernel.org Cc: penberg@kernel.org, Will Deacon , Matt Evans Subject: [PATCH] kvm tools: powerpc: convert spapr pci to new device iterators Date: Tue, 27 Nov 2012 13:00:28 +0000 Message-Id: <1354021228-19077-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.8.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Commit 8d35d32d0148 ("kvm tools: add generic device registration mechanism") introduced a tree-based device lookup-by-bus mechanism as well as iterators to enumerate the devices on a particular bus. Whilst both x86 and ppc were converted by the original patch, the spapr pci changes were incomplete, so include the required changes here. Compile-tested only on ppc64 970mp. Note that I had to hack the Makefile in order to build guest_init.o with a toolchain defaulting to ppc: $(GUEST_INIT): guest/init.c $(E) " LINK " $@ - $(Q) $(CC) -static guest/init.c -o $@ - $(Q) $(LD) -r -b binary -o guest/guest_init.o $(GUEST_INIT) + $(Q) $(CC) -m64 -static guest/init.c -o $@ + $(Q) $(LD) -m elf64ppc -r -b binary -o guest/guest_init.o $(GUEST_INIT) $(DEPS): Cc: Matt Evans Signed-off-by: Will Deacon Acked-by: Matt Evans --- tools/kvm/powerpc/spapr_pci.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/kvm/powerpc/spapr_pci.c b/tools/kvm/powerpc/spapr_pci.c index 5f4016c..ed4b9ab 100644 --- a/tools/kvm/powerpc/spapr_pci.c +++ b/tools/kvm/powerpc/spapr_pci.c @@ -15,6 +15,7 @@ #include "spapr.h" #include "spapr_pci.h" +#include "kvm/devices.h" #include "kvm/fdt.h" #include "kvm/util.h" #include "kvm/pci.h" @@ -248,6 +249,7 @@ int spapr_populate_pci_devices(struct kvm *kvm, void *fdt) { int bus_off, node_off = 0, devid, fn, i, n, devices; + struct device_header *dev_hdr; char nodename[256]; struct { uint32_t hi; @@ -301,14 +303,15 @@ int spapr_populate_pci_devices(struct kvm *kvm, /* Populate PCI devices and allocate IRQs */ devices = 0; - - for (devid = 0; devid < KVM_MAX_DEVICES; devid++) { + dev_hdr = device__first_dev(DEVICE_BUS_PCI); + while (dev_hdr) { uint32_t *irqmap = interrupt_map[devices]; - struct pci_device_header *hdr = pci__find_dev(devid); + struct pci_device_header *hdr = dev_hdr->data; if (!hdr) continue; + devid = dev_hdr->dev_num; fn = 0; /* kvmtool doesn't yet do multifunction devices */ sprintf(nodename, "pci@%u,%u", devid, fn); @@ -413,6 +416,7 @@ int spapr_populate_pci_devices(struct kvm *kvm, /* We don't set ibm,dma-window property as we don't have an IOMMU. */ ++devices; + dev_hdr = device__next_dev(dev_hdr); } /* Write interrupt map */