From patchwork Sun Mar 24 11:32:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15563 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 0BC1C23E3E for ; Sun, 24 Mar 2013 11:32:51 +0000 (UTC) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by fiordland.canonical.com (Postfix) with ESMTP id BDAA3A18D65 for ; Sun, 24 Mar 2013 11:32:50 +0000 (UTC) Received: by mail-vc0-f179.google.com with SMTP id gf12so4234309vcb.10 for ; Sun, 24 Mar 2013 04:32:50 -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=V6HHzrlGMBvmm4NeH3aA1CnJFGwLXlPRbz3ahZpJVUtohXOTDfqQDObF9b6EgjkIXu jaTLZSdUjj9cUeMEwwDY4z+0wv4qqqWcJALoshyjhpwXLWW7fVAUQiv6Tc6/JY56F9d0 986R3Nxmj+7dfEKgjupkfcDwmz/rU+TJqfwBq2VZ+91x0OVo4wroxtAq4fYZq3FT6YQZ CWOi0K3osUZVfvoCpJQtbBJ9z3k9wP2jHKXqE58aTF1l4Bsm/rqlbgNT4QrRu4F2Z7Ms uxCtGAnoyI0oOCUHvYP4T0byAulJuF2lsZKUVV2m/qjsUuNo/mv2Q1EmPF0AAv2G2/jJ Mekw== X-Received: by 10.58.224.101 with SMTP id rb5mr10796808vec.17.1364124770307; Sun, 24 Mar 2013 04:32:50 -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 cg12csp4958ved; Sun, 24 Mar 2013 04:32:49 -0700 (PDT) X-Received: by 10.152.128.98 with SMTP id nn2mr4097101lab.17.1364124764979; Sun, 24 Mar 2013 04:32:44 -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 sp6si3276892lab.64.2013.03.24.04.32.43 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 24 Mar 2013 04:32:44 -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 1UJjAG-0001W5-BZ; Sun, 24 Mar 2013 11:32:40 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" , Paul Brook , Arnd Bergmann , Will Deacon Subject: [PATCH 06/10] versatile_pci: Put the host bridge PCI device at slot 29 Date: Sun, 24 Mar 2013 11:32:36 +0000 Message-Id: <1364124760-5794-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364124760-5794-1-git-send-email-peter.maydell@linaro.org> References: <1364124760-5794-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQmFDm8bFW+Xh0geHisuexMqV11qy9K/6MIBmJvMOi8XoJ4eVmG7FsceJDzydYfHcwTRe1ra 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)