From patchwork Tue Mar 26 10:22:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15654 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 01F2623E64 for ; Tue, 26 Mar 2013 10:22:21 +0000 (UTC) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by fiordland.canonical.com (Postfix) with ESMTP id 6C298A198C5 for ; Tue, 26 Mar 2013 10:22:20 +0000 (UTC) Received: by mail-vb0-f49.google.com with SMTP id s24so4368775vbi.8 for ; Tue, 26 Mar 2013 03:22:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=2/jtd/abqGEcggdjEF8LjHXSTDR/csSLaDcesYVGl3g=; b=aHiUBrPDbIE5jRcdHwKtekJE8WsOgHOdGpZtuGcOM74SLVzRHlvZcmZhpW1sYkddGk UmSYei7qTcoiaEkoLyrgauNzeE3QOAtXVQUD60KVKqLw51fC6FUt++88GWAJsnQMrYuQ SrHGVQVXN2y6RnVFj3zwCLGJVKkWo3KDYI2v9zp06AuGpFMnMCSn1LYDJ++dgUghkRxZ s1+W99RvrCl+YJ8XNyc/Z2mcFfZk0xGKKfusxMypSnA0tm+dCW5hyH2NOPrqX8dE4/1J Aydyr9kYaorD7wohcf7ljmD9U0ykvIWUDD1nidN+hPuqJVnQzT+f1dN1hygqdGaN8ZXH ml6Q== X-Received: by 10.52.233.225 with SMTP id tz1mr16576401vdc.54.1364293339922; Tue, 26 Mar 2013 03:22:19 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp64346ved; Tue, 26 Mar 2013 03:22:19 -0700 (PDT) X-Received: by 10.14.202.71 with SMTP id c47mr43244936eeo.39.1364293337155; Tue, 26 Mar 2013 03:22:17 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id n8si25464165eeu.165.2013.03.26.03.22.16 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 26 Mar 2013 03:22:17 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UKR1A-0002HJ-AW; Tue, 26 Mar 2013 10:22:12 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Arnd Bergmann , "Michael S. Tsirkin" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Will Deacon , Paul Brook , Aurelien Jarno Subject: [PATCH v2 06/11] versatile_pci: Put the host bridge PCI device at slot 29 Date: Tue, 26 Mar 2013 10:22:06 +0000 Message-Id: <1364293331-8722-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364293331-8722-1-git-send-email-peter.maydell@linaro.org> References: <1364293331-8722-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlCMGYP2omB8OxFUYBR+P6QuVzjd6KEkEScCEiM4ESXvWaPruz7Zys1g2qI4gmTBzMi1fOJ On real hardware the host bridge appears as a PCI device in slot 29, so make QEMU put its host bridge in that slot too. Signed-off-by: Peter Maydell --- hw/versatile_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index 777e9b1..576e619 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -87,6 +87,8 @@ static void pci_vpb_init(Object *obj) object_initialize(&s->pci_dev, TYPE_VERSATILE_PCI_HOST); qdev_set_parent_bus(DEVICE(&s->pci_dev), BUS(&s->pci_bus)); + object_property_set_int(OBJECT(&s->pci_dev), PCI_DEVFN(29, 0), "addr", + NULL); } static void pci_vpb_realize(DeviceState *dev, Error **errp)