From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:6089:0:0:0:0:0 with SMTP id w9csp995559wrt; Mon, 19 Nov 2018 07:38:26 -0800 (PST) X-Google-Smtp-Source: AJdET5eE/Pk/aLaaAEytZFgwZOZ0kKMfhzDTjyo7TN7d7ssEipXkIUTJyb49MbjVljD5aee0wmXH X-Received: by 2002:a81:7744:: with SMTP id s65-v6mr21592840ywc.149.1542641906150; Mon, 19 Nov 2018 07:38:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542641906; cv=none; d=google.com; s=arc-20160816; b=nXAuR14/qJGxEKMbyP7djelQ4eqAyJhsSeRYut+DWaHvNJJYapHxVm9OwMywpcbRR6 wPtD89Q3uXERXLc1v6mjbOg/3Wr11nJYtow8iprTEJa8heZsPHIZCbRX7jN3rsX/KKk2 kU1A/jkqguG6W7uUKnihsmmV0Wjf5NLCi2EG7U6InXeGMOv26TUlrNKjOliZSZ0kIli/ HQBksYQqT9/bVFAONf3HbflGABRXiYCMa5mxsUwW8m/eNdoaYma58kUmIgpfpLT6+ScB dNi0CmY5bg20UuoOriB+VmDDxN6qPVXIUIgSYE44GoLCTRZ2Dk9ROYBg9VNKOxcoKGWA 3NSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:to:from:date; bh=OlxrFcpl+nh2MXAe6SlHrGXzuz9VWpe5fB/Ds01jktY=; b=K9L7S0QSmgAmqYv2UFYqKG2hRUnFd5KTyw5SlRMdBIjVUETj265QauoyANabdydLqE M8zvH1JDHQFLB9e1u+ESi8Y+eWOj4spf/olvqdas2NetxcYJ1bdGMer+q/ccdh5lXBWE ZORSV1mYOfz7eGUyVEyUQkOSz3uCzxywcsgvo5XNHkJnJzNofvAifO+vc1ZZnW+PX5xP L2oJKpSpkhu16SkVyevVrzp/W+C6n6yNm7nK+JFDifv5DYDRD0kXcO6eneOFSkC+cyjC UqRgE2mRaQ21SKjQ9T/7UJkkMHALT84Nh2vvXH3bjH0whlQj2qV1ob1Qmuual3HwkrKl 9j5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u59-v6si6466858ybi.496.2018.11.19.07.38.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Nov 2018 07:38:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:57265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOld3-0007OB-KT for alex.bennee@linaro.org; Mon, 19 Nov 2018 10:38:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlcp-0007O5-0K for qemu-arm@nongnu.org; Mon, 19 Nov 2018 10:38:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOlck-0001WZ-4u for qemu-arm@nongnu.org; Mon, 19 Nov 2018 10:38:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54502) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gOlcj-0001PL-Bi; Mon, 19 Nov 2018 10:38:05 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71C5E30023B8; Mon, 19 Nov 2018 15:38:04 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id B15F86012D; Mon, 19 Nov 2018 15:37:58 +0000 (UTC) Date: Mon, 19 Nov 2018 16:37:57 +0100 From: Igor Mammedov To: "Boeuf, Sebastien" Message-ID: <20181119163757.3c975f62@redhat.com> In-Reply-To: <1542397323.18399.3.camel@intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> <20181105014047.26447-20-sameo@linux.intel.com> <20181116103909.64f35d5d@redhat.com> <1542397323.18399.3.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 19 Nov 2018 15:38:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-arm] [PATCH v5 19/24] hw: acpi: Retrieve the PCI bus from AcpiPciHpState X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "peter.maydell@linaro.org" , "sstabellini@kernel.org" , "sameo@linux.intel.com" , "mst@redhat.com" , "jing2.liu@linux.intel.com" , "qemu-devel@nongnu.org" , "shannon.zhaosl@gmail.com" , "qemu-arm@nongnu.org" , "marcel.apfelbaum@gmail.com" , "xen-devel@lists.xenproject.org" , "anthony.perard@citrix.com" , "pbonzini@redhat.com" , "rth@twiddle.net" , "ehabkost@redhat.com" Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: p5gLh84lCSvO On Fri, 16 Nov 2018 19:42:08 +0000 "Boeuf, Sebastien" wrote: > Hi Igor, >=20 > On Fri, 2018-11-16 at 10:39 +0100, Igor Mammedov wrote: > > On Mon,=C2=A0=C2=A05 Nov 2018 02:40:42 +0100 > > Samuel Ortiz wrote: > > =20 > > >=20 > > > From: Sebastien Boeuf > > >=20 > > > Instead of using the machine type specific method find_i440fx() to > > > retrieve the PCI bus, this commit aims to rely on the fact that the > > > PCI bus is known by the structure AcpiPciHpState. > > >=20 > > > When the structure is initialized through acpi_pcihp_init() call, > > > it saves the PCI bus, which means there is no need to invoke a > > > special function later on. > > >=20 > > > Based on the fact that find_i440fx() was only used there, this > > > patch also removes the function find_i440fx() itself from the > > > entire codebase. > > >=20 > > > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > > > Tested-by: Philippe Mathieu-Daud=C3=A9 > > > Signed-off-by: Sebastien Boeuf > > > Signed-off-by: Jing Liu =20 > > Thanks for cleaning it up > >=20 > > minor nit: > > Taking in account that you're removing '/* TODO: Q35 support */' > > comment along with find_i440fx(), it might be worth to mention > > in this commit message. Something along lines that ACPI PCIHP > > exist to support guests without SHPC support on PCI > > based PC machine. Considering that Q35 provides native > > PCI-E hotplug, there is no need to add ACPI hotplug there. =20 >=20 > Oh yes sure we can update the commit message :). But just wanted to > mention that 'pc' machine type uses ACPI PCIHP and does support > SHPC, so it's not mutually exclusive. it supports both but is it relevant to this patch? Point was that one shouldn't remove something silently without any justification/explanation. So that readers that come later wouldn't wonder about the reasons why the code was removed. =20 > >=20 > > with commit message fixed > >=20 > > Reviewed-by: Igor Mammedov > > =20 > > >=20 > > > --- > > > =C2=A0include/hw/i386/pc.h=C2=A0=C2=A0|=C2=A0=C2=A01 - > > > =C2=A0hw/acpi/pcihp.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 += +++------ > > > =C2=A0hw/pci-host/piix.c=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A08 ------= -- > > > =C2=A0stubs/pci-host-piix.c |=C2=A0=C2=A06 ------ > > > =C2=A0stubs/Makefile.objs=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A01 - > > > =C2=A05 files changed, 4 insertions(+), 22 deletions(-) > > > =C2=A0delete mode 100644 stubs/pci-host-piix.c > > >=20 > > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > > > index 44cb6bf3f3..8e5f1464eb 100644 > > > --- a/include/hw/i386/pc.h > > > +++ b/include/hw/i386/pc.h > > > @@ -255,7 +255,6 @@ PCIBus *i440fx_init(const char *host_type, > > > const char *pci_type, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MemoryRegion *pci_= memory, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MemoryRegion *ram_= memory); > > > =C2=A0 > > > -PCIBus *find_i440fx(void); > > > =C2=A0/* piix4.c */ > > > =C2=A0extern PCIDevice *piix4_dev; > > > =C2=A0int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); > > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > > > index 80d42e12ff..254b2e50ab 100644 > > > --- a/hw/acpi/pcihp.c > > > +++ b/hw/acpi/pcihp.c > > > @@ -93,10 +93,9 @@ static void *acpi_set_bsel(PCIBus *bus, void > > > *opaque) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return bsel_alloc; > > > =C2=A0} > > > =C2=A0 > > > -static void acpi_set_pci_info(void) > > > +static void acpi_set_pci_info(AcpiPciHpState *s) > > > =C2=A0{ > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0static bool bsel_is_set; > > > -=C2=A0=C2=A0=C2=A0=C2=A0PCIBus *bus; > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0unsigned bsel_alloc =3D ACPI_PCIHP_BSEL= _DEFAULT; > > > =C2=A0 > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (bsel_is_set) { > > > @@ -104,10 +103,9 @@ static void acpi_set_pci_info(void) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bsel_is_set =3D true; > > > =C2=A0 > > > -=C2=A0=C2=A0=C2=A0=C2=A0bus =3D find_i440fx(); /* TODO: Q35 support = */ > > > -=C2=A0=C2=A0=C2=A0=C2=A0if (bus) { > > > +=C2=A0=C2=A0=C2=A0=C2=A0if (s->root) { > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* Scan all PCI= buses. Set property to enable acpi based > > > hotplug. */ > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0pci_for_each_bus_dep= th_first(bus, acpi_set_bsel, NULL, > > > &bsel_alloc); > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0pci_for_each_bus_dep= th_first(s->root, acpi_set_bsel, NULL, > > > &bsel_alloc); > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > > > =C2=A0} > > > =C2=A0 > > > @@ -213,7 +211,7 @@ static void acpi_pcihp_update(AcpiPciHpState > > > *s) > > > =C2=A0 > > > =C2=A0void acpi_pcihp_reset(AcpiPciHpState *s) > > > =C2=A0{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0acpi_set_pci_info(); > > > +=C2=A0=C2=A0=C2=A0=C2=A0acpi_set_pci_info(s); > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0acpi_pcihp_update(s); > > > =C2=A0} > > > =C2=A0 > > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > > > index 47293a3915..658460264b 100644 > > > --- a/hw/pci-host/piix.c > > > +++ b/hw/pci-host/piix.c > > > @@ -445,14 +445,6 @@ PCIBus *i440fx_init(const char *host_type, > > > const char *pci_type, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return b; > > > =C2=A0} > > > =C2=A0 > > > -PCIBus *find_i440fx(void) > > > -{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0PCIHostState *s =3D OBJECT_CHECK(PCIHostStat= e, > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0object= _resolve_path("/machine/i > > > 440fx", NULL), > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0TYPE_P= CI_HOST_BRIDGE); > > > -=C2=A0=C2=A0=C2=A0=C2=A0return s ? s->bus : NULL; > > > -} > > > - > > > =C2=A0/* PIIX3 PCI to ISA bridge */ > > > =C2=A0static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq) > > > =C2=A0{ > > > diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c > > > deleted file mode 100644 > > > index 6ed81b1f21..0000000000 > > > --- a/stubs/pci-host-piix.c > > > +++ /dev/null > > > @@ -1,6 +0,0 @@ > > > -#include "qemu/osdep.h" > > > -#include "hw/i386/pc.h" > > > -PCIBus *find_i440fx(void) > > > -{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0return NULL; > > > -} > > > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > > > index 5dd0aeeec6..725f78bedc 100644 > > > --- a/stubs/Makefile.objs > > > +++ b/stubs/Makefile.objs > > > @@ -41,6 +41,5 @@ stub-obj-y +=3D pc_madt_cpu_entry.o > > > =C2=A0stub-obj-y +=3D vmgenid.o > > > =C2=A0stub-obj-y +=3D xen-common.o > > > =C2=A0stub-obj-y +=3D xen-hvm.o > > > -stub-obj-y +=3D pci-host-piix.o > > > =C2=A0stub-obj-y +=3D ram-block.o > > > =C2=A0stub-obj-y +=3D ramfb.o =20 >=20 > Thanks, > Sebastien From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Mammedov Subject: Re: [PATCH v5 19/24] hw: acpi: Retrieve the PCI bus from AcpiPciHpState Date: Mon, 19 Nov 2018 16:37:57 +0100 Message-ID: <20181119163757.3c975f62@redhat.com> References: <20181105014047.26447-1-sameo@linux.intel.com> <20181105014047.26447-20-sameo@linux.intel.com> <20181116103909.64f35d5d@redhat.com> <1542397323.18399.3.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gOlcl-0000bc-13 for xen-devel@lists.xenproject.org; Mon, 19 Nov 2018 15:38:07 +0000 In-Reply-To: <1542397323.18399.3.camel@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: "Boeuf, Sebastien" Cc: "peter.maydell@linaro.org" , "sstabellini@kernel.org" , "sameo@linux.intel.com" , "mst@redhat.com" , "jing2.liu@linux.intel.com" , "qemu-devel@nongnu.org" , "shannon.zhaosl@gmail.com" , "qemu-arm@nongnu.org" , "marcel.apfelbaum@gmail.com" , "xen-devel@lists.xenproject.org" , "anthony.perard@citrix.com" , "pbonzini@redhat.com" , "rth@twiddle.net" , "ehabkost@redhat.com" List-Id: xen-devel@lists.xenproject.org T24gRnJpLCAxNiBOb3YgMjAxOCAxOTo0MjowOCArMDAwMAoiQm9ldWYsIFNlYmFzdGllbiIgPHNl YmFzdGllbi5ib2V1ZkBpbnRlbC5jb20+IHdyb3RlOgoKPiBIaSBJZ29yLAo+IAo+IE9uIEZyaSwg MjAxOC0xMS0xNiBhdCAxMDozOSArMDEwMCwgSWdvciBNYW1tZWRvdiB3cm90ZToKPiA+IE9uIE1v bizCoMKgNSBOb3YgMjAxOCAwMjo0MDo0MiArMDEwMAo+ID4gU2FtdWVsIE9ydGl6IDxzYW1lb0Bs aW51eC5pbnRlbC5jb20+IHdyb3RlOgo+ID4gICAKPiA+ID4gCj4gPiA+IEZyb206IFNlYmFzdGll biBCb2V1ZiA8c2ViYXN0aWVuLmJvZXVmQGludGVsLmNvbT4KPiA+ID4gCj4gPiA+IEluc3RlYWQg b2YgdXNpbmcgdGhlIG1hY2hpbmUgdHlwZSBzcGVjaWZpYyBtZXRob2QgZmluZF9pNDQwZngoKSB0 bwo+ID4gPiByZXRyaWV2ZSB0aGUgUENJIGJ1cywgdGhpcyBjb21taXQgYWltcyB0byByZWx5IG9u IHRoZSBmYWN0IHRoYXQgdGhlCj4gPiA+IFBDSSBidXMgaXMga25vd24gYnkgdGhlIHN0cnVjdHVy ZSBBY3BpUGNpSHBTdGF0ZS4KPiA+ID4gCj4gPiA+IFdoZW4gdGhlIHN0cnVjdHVyZSBpcyBpbml0 aWFsaXplZCB0aHJvdWdoIGFjcGlfcGNpaHBfaW5pdCgpIGNhbGwsCj4gPiA+IGl0IHNhdmVzIHRo ZSBQQ0kgYnVzLCB3aGljaCBtZWFucyB0aGVyZSBpcyBubyBuZWVkIHRvIGludm9rZSBhCj4gPiA+ IHNwZWNpYWwgZnVuY3Rpb24gbGF0ZXIgb24uCj4gPiA+IAo+ID4gPiBCYXNlZCBvbiB0aGUgZmFj dCB0aGF0IGZpbmRfaTQ0MGZ4KCkgd2FzIG9ubHkgdXNlZCB0aGVyZSwgdGhpcwo+ID4gPiBwYXRj aCBhbHNvIHJlbW92ZXMgdGhlIGZ1bmN0aW9uIGZpbmRfaTQ0MGZ4KCkgaXRzZWxmIGZyb20gdGhl Cj4gPiA+IGVudGlyZSBjb2RlYmFzZS4KPiA+ID4gCj4gPiA+IFJldmlld2VkLWJ5OiBQaGlsaXBw ZSBNYXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+Cj4gPiA+IFRlc3RlZC1ieTogUGhp bGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgo+ID4gPiBTaWduZWQtb2Zm LWJ5OiBTZWJhc3RpZW4gQm9ldWYgPHNlYmFzdGllbi5ib2V1ZkBpbnRlbC5jb20+Cj4gPiA+IFNp Z25lZC1vZmYtYnk6IEppbmcgTGl1IDxqaW5nMi5saXVAbGludXguaW50ZWwuY29tPiAgCj4gPiBU aGFua3MgZm9yIGNsZWFuaW5nIGl0IHVwCj4gPiAKPiA+IG1pbm9yIG5pdDoKPiA+IFRha2luZyBp biBhY2NvdW50IHRoYXQgeW91J3JlIHJlbW92aW5nICcvKiBUT0RPOiBRMzUgc3VwcG9ydCAqLycK PiA+IGNvbW1lbnQgYWxvbmcgd2l0aCBmaW5kX2k0NDBmeCgpLCBpdCBtaWdodCBiZSB3b3J0aCB0 byBtZW50aW9uCj4gPiBpbiB0aGlzIGNvbW1pdCBtZXNzYWdlLiBTb21ldGhpbmcgYWxvbmcgbGlu ZXMgdGhhdCBBQ1BJIFBDSUhQCj4gPiBleGlzdCB0byBzdXBwb3J0IGd1ZXN0cyB3aXRob3V0IFNI UEMgc3VwcG9ydCBvbiBQQ0kKPiA+IGJhc2VkIFBDIG1hY2hpbmUuIENvbnNpZGVyaW5nIHRoYXQg UTM1IHByb3ZpZGVzIG5hdGl2ZQo+ID4gUENJLUUgaG90cGx1ZywgdGhlcmUgaXMgbm8gbmVlZCB0 byBhZGQgQUNQSSBob3RwbHVnIHRoZXJlLiAgCj4gCj4gT2ggeWVzIHN1cmUgd2UgY2FuIHVwZGF0 ZSB0aGUgY29tbWl0IG1lc3NhZ2UgOikuIEJ1dCBqdXN0IHdhbnRlZCB0bwo+IG1lbnRpb24gdGhh dCAncGMnIG1hY2hpbmUgdHlwZSB1c2VzIEFDUEkgUENJSFAgYW5kIGRvZXMgc3VwcG9ydAo+IFNI UEMsIHNvIGl0J3Mgbm90IG11dHVhbGx5IGV4Y2x1c2l2ZS4KaXQgc3VwcG9ydHMgYm90aCBidXQg aXMgaXQgcmVsZXZhbnQgdG8gdGhpcyBwYXRjaD8KClBvaW50IHdhcyB0aGF0IG9uZSBzaG91bGRu J3QgcmVtb3ZlIHNvbWV0aGluZyBzaWxlbnRseSB3aXRob3V0CmFueSBqdXN0aWZpY2F0aW9uL2V4 cGxhbmF0aW9uLiBTbyB0aGF0IHJlYWRlcnMgdGhhdCBjb21lIGxhdGVyCndvdWxkbid0IHdvbmRl ciBhYm91dCB0aGUgcmVhc29ucyB3aHkgdGhlIGNvZGUgd2FzIHJlbW92ZWQuCiAKPiA+IAo+ID4g d2l0aCBjb21taXQgbWVzc2FnZSBmaXhlZAo+ID4gCj4gPiBSZXZpZXdlZC1ieTogSWdvciBNYW1t ZWRvdiA8aW1hbW1lZG9AcmVkaGF0LmNvbT4KPiA+ICAgCj4gPiA+IAo+ID4gPiAtLS0KPiA+ID4g wqBpbmNsdWRlL2h3L2kzODYvcGMuaMKgwqB8wqDCoDEgLQo+ID4gPiDCoGh3L2FjcGkvcGNpaHAu Y8KgwqDCoMKgwqDCoMKgfCAxMCArKysrLS0tLS0tCj4gPiA+IMKgaHcvcGNpLWhvc3QvcGlpeC5j wqDCoMKgwqB8wqDCoDggLS0tLS0tLS0KPiA+ID4gwqBzdHVicy9wY2ktaG9zdC1waWl4LmMgfMKg wqA2IC0tLS0tLQo+ID4gPiDCoHN0dWJzL01ha2VmaWxlLm9ianPCoMKgwqB8wqDCoDEgLQo+ID4g PiDCoDUgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKPiA+ ID4gwqBkZWxldGUgbW9kZSAxMDA2NDQgc3R1YnMvcGNpLWhvc3QtcGlpeC5jCj4gPiA+IAo+ID4g PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9pMzg2L3BjLmggYi9pbmNsdWRlL2h3L2kzODYvcGMu aAo+ID4gPiBpbmRleCA0NGNiNmJmM2YzLi44ZTVmMTQ2NGViIDEwMDY0NAo+ID4gPiAtLS0gYS9p bmNsdWRlL2h3L2kzODYvcGMuaAo+ID4gPiArKysgYi9pbmNsdWRlL2h3L2kzODYvcGMuaAo+ID4g PiBAQCAtMjU1LDcgKzI1NSw2IEBAIFBDSUJ1cyAqaTQ0MGZ4X2luaXQoY29uc3QgY2hhciAqaG9z dF90eXBlLAo+ID4gPiBjb25zdCBjaGFyICpwY2lfdHlwZSwKPiA+ID4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgTWVtb3J5UmVnaW9uICpwY2lfbWVtb3J5LAo+ID4g PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBNZW1vcnlSZWdpb24g KnJhbV9tZW1vcnkpOwo+ID4gPiDCoAo+ID4gPiAtUENJQnVzICpmaW5kX2k0NDBmeCh2b2lkKTsK PiA+ID4gwqAvKiBwaWl4NC5jICovCj4gPiA+IMKgZXh0ZXJuIFBDSURldmljZSAqcGlpeDRfZGV2 Owo+ID4gPiDCoGludCBwaWl4NF9pbml0KFBDSUJ1cyAqYnVzLCBJU0FCdXMgKippc2FfYnVzLCBp bnQgZGV2Zm4pOwo+ID4gPiBkaWZmIC0tZ2l0IGEvaHcvYWNwaS9wY2locC5jIGIvaHcvYWNwaS9w Y2locC5jCj4gPiA+IGluZGV4IDgwZDQyZTEyZmYuLjI1NGIyZTUwYWIgMTAwNjQ0Cj4gPiA+IC0t LSBhL2h3L2FjcGkvcGNpaHAuYwo+ID4gPiArKysgYi9ody9hY3BpL3BjaWhwLmMKPiA+ID4gQEAg LTkzLDEwICs5Myw5IEBAIHN0YXRpYyB2b2lkICphY3BpX3NldF9ic2VsKFBDSUJ1cyAqYnVzLCB2 b2lkCj4gPiA+ICpvcGFxdWUpCj4gPiA+IMKgwqDCoMKgwqByZXR1cm4gYnNlbF9hbGxvYzsKPiA+ ID4gwqB9Cj4gPiA+IMKgCj4gPiA+IC1zdGF0aWMgdm9pZCBhY3BpX3NldF9wY2lfaW5mbyh2b2lk KQo+ID4gPiArc3RhdGljIHZvaWQgYWNwaV9zZXRfcGNpX2luZm8oQWNwaVBjaUhwU3RhdGUgKnMp Cj4gPiA+IMKgewo+ID4gPiDCoMKgwqDCoMKgc3RhdGljIGJvb2wgYnNlbF9pc19zZXQ7Cj4gPiA+ IC3CoMKgwqDCoFBDSUJ1cyAqYnVzOwo+ID4gPiDCoMKgwqDCoMKgdW5zaWduZWQgYnNlbF9hbGxv YyA9IEFDUElfUENJSFBfQlNFTF9ERUZBVUxUOwo+ID4gPiDCoAo+ID4gPiDCoMKgwqDCoMKgaWYg KGJzZWxfaXNfc2V0KSB7Cj4gPiA+IEBAIC0xMDQsMTAgKzEwMyw5IEBAIHN0YXRpYyB2b2lkIGFj cGlfc2V0X3BjaV9pbmZvKHZvaWQpCj4gPiA+IMKgwqDCoMKgwqB9Cj4gPiA+IMKgwqDCoMKgwqBi c2VsX2lzX3NldCA9IHRydWU7Cj4gPiA+IMKgCj4gPiA+IC3CoMKgwqDCoGJ1cyA9IGZpbmRfaTQ0 MGZ4KCk7IC8qIFRPRE86IFEzNSBzdXBwb3J0ICovCj4gPiA+IC3CoMKgwqDCoGlmIChidXMpIHsK PiA+ID4gK8KgwqDCoMKgaWYgKHMtPnJvb3QpIHsKPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgLyog U2NhbiBhbGwgUENJIGJ1c2VzLiBTZXQgcHJvcGVydHkgdG8gZW5hYmxlIGFjcGkgYmFzZWQKPiA+ ID4gaG90cGx1Zy4gKi8KPiA+ID4gLcKgwqDCoMKgwqDCoMKgwqBwY2lfZm9yX2VhY2hfYnVzX2Rl cHRoX2ZpcnN0KGJ1cywgYWNwaV9zZXRfYnNlbCwgTlVMTCwKPiA+ID4gJmJzZWxfYWxsb2MpOwo+ ID4gPiArwqDCoMKgwqDCoMKgwqDCoHBjaV9mb3JfZWFjaF9idXNfZGVwdGhfZmlyc3Qocy0+cm9v dCwgYWNwaV9zZXRfYnNlbCwgTlVMTCwKPiA+ID4gJmJzZWxfYWxsb2MpOwo+ID4gPiDCoMKgwqDC oMKgfQo+ID4gPiDCoH0KPiA+ID4gwqAKPiA+ID4gQEAgLTIxMyw3ICsyMTEsNyBAQCBzdGF0aWMg dm9pZCBhY3BpX3BjaWhwX3VwZGF0ZShBY3BpUGNpSHBTdGF0ZQo+ID4gPiAqcykKPiA+ID4gwqAK PiA+ID4gwqB2b2lkIGFjcGlfcGNpaHBfcmVzZXQoQWNwaVBjaUhwU3RhdGUgKnMpCj4gPiA+IMKg ewo+ID4gPiAtwqDCoMKgwqBhY3BpX3NldF9wY2lfaW5mbygpOwo+ID4gPiArwqDCoMKgwqBhY3Bp X3NldF9wY2lfaW5mbyhzKTsKPiA+ID4gwqDCoMKgwqDCoGFjcGlfcGNpaHBfdXBkYXRlKHMpOwo+ ID4gPiDCoH0KPiA+ID4gwqAKPiA+ID4gZGlmZiAtLWdpdCBhL2h3L3BjaS1ob3N0L3BpaXguYyBi L2h3L3BjaS1ob3N0L3BpaXguYwo+ID4gPiBpbmRleCA0NzI5M2EzOTE1Li42NTg0NjAyNjRiIDEw MDY0NAo+ID4gPiAtLS0gYS9ody9wY2ktaG9zdC9waWl4LmMKPiA+ID4gKysrIGIvaHcvcGNpLWhv c3QvcGlpeC5jCj4gPiA+IEBAIC00NDUsMTQgKzQ0NSw2IEBAIFBDSUJ1cyAqaTQ0MGZ4X2luaXQo Y29uc3QgY2hhciAqaG9zdF90eXBlLAo+ID4gPiBjb25zdCBjaGFyICpwY2lfdHlwZSwKPiA+ID4g wqDCoMKgwqDCoHJldHVybiBiOwo+ID4gPiDCoH0KPiA+ID4gwqAKPiA+ID4gLVBDSUJ1cyAqZmlu ZF9pNDQwZngodm9pZCkKPiA+ID4gLXsKPiA+ID4gLcKgwqDCoMKgUENJSG9zdFN0YXRlICpzID0g T0JKRUNUX0NIRUNLKFBDSUhvc3RTdGF0ZSwKPiA+ID4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBvYmplY3RfcmVz b2x2ZV9wYXRoKCIvbWFjaGluZS9pCj4gPiA+IDQ0MGZ4IiwgTlVMTCksCj4gPiA+IC3CoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgVFlQRV9QQ0lfSE9TVF9CUklER0UpOwo+ID4gPiAtwqDCoMKgwqByZXR1cm4gcyA/IHMt PmJ1cyA6IE5VTEw7Cj4gPiA+IC19Cj4gPiA+IC0KPiA+ID4gwqAvKiBQSUlYMyBQQ0kgdG8gSVNB IGJyaWRnZSAqLwo+ID4gPiDCoHN0YXRpYyB2b2lkIHBpaXgzX3NldF9pcnFfcGljKFBJSVgzU3Rh dGUgKnBpaXgzLCBpbnQgcGljX2lycSkKPiA+ID4gwqB7Cj4gPiA+IGRpZmYgLS1naXQgYS9zdHVi cy9wY2ktaG9zdC1waWl4LmMgYi9zdHVicy9wY2ktaG9zdC1waWl4LmMKPiA+ID4gZGVsZXRlZCBm aWxlIG1vZGUgMTAwNjQ0Cj4gPiA+IGluZGV4IDZlZDgxYjFmMjEuLjAwMDAwMDAwMDAKPiA+ID4g LS0tIGEvc3R1YnMvcGNpLWhvc3QtcGlpeC5jCj4gPiA+ICsrKyAvZGV2L251bGwKPiA+ID4gQEAg LTEsNiArMCwwIEBACj4gPiA+IC0jaW5jbHVkZSAicWVtdS9vc2RlcC5oIgo+ID4gPiAtI2luY2x1 ZGUgImh3L2kzODYvcGMuaCIKPiA+ID4gLVBDSUJ1cyAqZmluZF9pNDQwZngodm9pZCkKPiA+ID4g LXsKPiA+ID4gLcKgwqDCoMKgcmV0dXJuIE5VTEw7Cj4gPiA+IC19Cj4gPiA+IGRpZmYgLS1naXQg YS9zdHVicy9NYWtlZmlsZS5vYmpzIGIvc3R1YnMvTWFrZWZpbGUub2Jqcwo+ID4gPiBpbmRleCA1 ZGQwYWVlZWM2Li43MjVmNzhiZWRjIDEwMDY0NAo+ID4gPiAtLS0gYS9zdHVicy9NYWtlZmlsZS5v YmpzCj4gPiA+ICsrKyBiL3N0dWJzL01ha2VmaWxlLm9ianMKPiA+ID4gQEAgLTQxLDYgKzQxLDUg QEAgc3R1Yi1vYmoteSArPSBwY19tYWR0X2NwdV9lbnRyeS5vCj4gPiA+IMKgc3R1Yi1vYmoteSAr PSB2bWdlbmlkLm8KPiA+ID4gwqBzdHViLW9iai15ICs9IHhlbi1jb21tb24ubwo+ID4gPiDCoHN0 dWItb2JqLXkgKz0geGVuLWh2bS5vCj4gPiA+IC1zdHViLW9iai15ICs9IHBjaS1ob3N0LXBpaXgu bwo+ID4gPiDCoHN0dWItb2JqLXkgKz0gcmFtLWJsb2NrLm8KPiA+ID4gwqBzdHViLW9iai15ICs9 IHJhbWZiLm8gIAo+IAo+IFRoYW5rcywKPiBTZWJhc3RpZW4KCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlcr-0007Oo-Qx for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:38:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOlcq-0001bR-Lb for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:38:13 -0500 Date: Mon, 19 Nov 2018 16:37:57 +0100 From: Igor Mammedov Message-ID: <20181119163757.3c975f62@redhat.com> In-Reply-To: <1542397323.18399.3.camel@intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> <20181105014047.26447-20-sameo@linux.intel.com> <20181116103909.64f35d5d@redhat.com> <1542397323.18399.3.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v5 19/24] hw: acpi: Retrieve the PCI bus from AcpiPciHpState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Boeuf, Sebastien" Cc: "sameo@linux.intel.com" , "peter.maydell@linaro.org" , "anthony.perard@citrix.com" , "sstabellini@kernel.org" , "jing2.liu@linux.intel.com" , "mst@redhat.com" , "qemu-devel@nongnu.org" , "ehabkost@redhat.com" , "shannon.zhaosl@gmail.com" , "pbonzini@redhat.com" , "qemu-arm@nongnu.org" , "rth@twiddle.net" , "marcel.apfelbaum@gmail.com" , "xen-devel@lists.xenproject.org" On Fri, 16 Nov 2018 19:42:08 +0000 "Boeuf, Sebastien" wrote: > Hi Igor, >=20 > On Fri, 2018-11-16 at 10:39 +0100, Igor Mammedov wrote: > > On Mon,=C2=A0=C2=A05 Nov 2018 02:40:42 +0100 > > Samuel Ortiz wrote: > > =20 > > >=20 > > > From: Sebastien Boeuf > > >=20 > > > Instead of using the machine type specific method find_i440fx() to > > > retrieve the PCI bus, this commit aims to rely on the fact that the > > > PCI bus is known by the structure AcpiPciHpState. > > >=20 > > > When the structure is initialized through acpi_pcihp_init() call, > > > it saves the PCI bus, which means there is no need to invoke a > > > special function later on. > > >=20 > > > Based on the fact that find_i440fx() was only used there, this > > > patch also removes the function find_i440fx() itself from the > > > entire codebase. > > >=20 > > > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > > > Tested-by: Philippe Mathieu-Daud=C3=A9 > > > Signed-off-by: Sebastien Boeuf > > > Signed-off-by: Jing Liu =20 > > Thanks for cleaning it up > >=20 > > minor nit: > > Taking in account that you're removing '/* TODO: Q35 support */' > > comment along with find_i440fx(), it might be worth to mention > > in this commit message. Something along lines that ACPI PCIHP > > exist to support guests without SHPC support on PCI > > based PC machine. Considering that Q35 provides native > > PCI-E hotplug, there is no need to add ACPI hotplug there. =20 >=20 > Oh yes sure we can update the commit message :). But just wanted to > mention that 'pc' machine type uses ACPI PCIHP and does support > SHPC, so it's not mutually exclusive. it supports both but is it relevant to this patch? Point was that one shouldn't remove something silently without any justification/explanation. So that readers that come later wouldn't wonder about the reasons why the code was removed. =20 > >=20 > > with commit message fixed > >=20 > > Reviewed-by: Igor Mammedov > > =20 > > >=20 > > > --- > > > =C2=A0include/hw/i386/pc.h=C2=A0=C2=A0|=C2=A0=C2=A01 - > > > =C2=A0hw/acpi/pcihp.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 += +++------ > > > =C2=A0hw/pci-host/piix.c=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A08 ------= -- > > > =C2=A0stubs/pci-host-piix.c |=C2=A0=C2=A06 ------ > > > =C2=A0stubs/Makefile.objs=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A01 - > > > =C2=A05 files changed, 4 insertions(+), 22 deletions(-) > > > =C2=A0delete mode 100644 stubs/pci-host-piix.c > > >=20 > > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > > > index 44cb6bf3f3..8e5f1464eb 100644 > > > --- a/include/hw/i386/pc.h > > > +++ b/include/hw/i386/pc.h > > > @@ -255,7 +255,6 @@ PCIBus *i440fx_init(const char *host_type, > > > const char *pci_type, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MemoryRegion *pci_= memory, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MemoryRegion *ram_= memory); > > > =C2=A0 > > > -PCIBus *find_i440fx(void); > > > =C2=A0/* piix4.c */ > > > =C2=A0extern PCIDevice *piix4_dev; > > > =C2=A0int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); > > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > > > index 80d42e12ff..254b2e50ab 100644 > > > --- a/hw/acpi/pcihp.c > > > +++ b/hw/acpi/pcihp.c > > > @@ -93,10 +93,9 @@ static void *acpi_set_bsel(PCIBus *bus, void > > > *opaque) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return bsel_alloc; > > > =C2=A0} > > > =C2=A0 > > > -static void acpi_set_pci_info(void) > > > +static void acpi_set_pci_info(AcpiPciHpState *s) > > > =C2=A0{ > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0static bool bsel_is_set; > > > -=C2=A0=C2=A0=C2=A0=C2=A0PCIBus *bus; > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0unsigned bsel_alloc =3D ACPI_PCIHP_BSEL= _DEFAULT; > > > =C2=A0 > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (bsel_is_set) { > > > @@ -104,10 +103,9 @@ static void acpi_set_pci_info(void) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bsel_is_set =3D true; > > > =C2=A0 > > > -=C2=A0=C2=A0=C2=A0=C2=A0bus =3D find_i440fx(); /* TODO: Q35 support = */ > > > -=C2=A0=C2=A0=C2=A0=C2=A0if (bus) { > > > +=C2=A0=C2=A0=C2=A0=C2=A0if (s->root) { > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* Scan all PCI= buses. Set property to enable acpi based > > > hotplug. */ > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0pci_for_each_bus_dep= th_first(bus, acpi_set_bsel, NULL, > > > &bsel_alloc); > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0pci_for_each_bus_dep= th_first(s->root, acpi_set_bsel, NULL, > > > &bsel_alloc); > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > > > =C2=A0} > > > =C2=A0 > > > @@ -213,7 +211,7 @@ static void acpi_pcihp_update(AcpiPciHpState > > > *s) > > > =C2=A0 > > > =C2=A0void acpi_pcihp_reset(AcpiPciHpState *s) > > > =C2=A0{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0acpi_set_pci_info(); > > > +=C2=A0=C2=A0=C2=A0=C2=A0acpi_set_pci_info(s); > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0acpi_pcihp_update(s); > > > =C2=A0} > > > =C2=A0 > > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > > > index 47293a3915..658460264b 100644 > > > --- a/hw/pci-host/piix.c > > > +++ b/hw/pci-host/piix.c > > > @@ -445,14 +445,6 @@ PCIBus *i440fx_init(const char *host_type, > > > const char *pci_type, > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return b; > > > =C2=A0} > > > =C2=A0 > > > -PCIBus *find_i440fx(void) > > > -{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0PCIHostState *s =3D OBJECT_CHECK(PCIHostStat= e, > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0object= _resolve_path("/machine/i > > > 440fx", NULL), > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0TYPE_P= CI_HOST_BRIDGE); > > > -=C2=A0=C2=A0=C2=A0=C2=A0return s ? s->bus : NULL; > > > -} > > > - > > > =C2=A0/* PIIX3 PCI to ISA bridge */ > > > =C2=A0static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq) > > > =C2=A0{ > > > diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c > > > deleted file mode 100644 > > > index 6ed81b1f21..0000000000 > > > --- a/stubs/pci-host-piix.c > > > +++ /dev/null > > > @@ -1,6 +0,0 @@ > > > -#include "qemu/osdep.h" > > > -#include "hw/i386/pc.h" > > > -PCIBus *find_i440fx(void) > > > -{ > > > -=C2=A0=C2=A0=C2=A0=C2=A0return NULL; > > > -} > > > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > > > index 5dd0aeeec6..725f78bedc 100644 > > > --- a/stubs/Makefile.objs > > > +++ b/stubs/Makefile.objs > > > @@ -41,6 +41,5 @@ stub-obj-y +=3D pc_madt_cpu_entry.o > > > =C2=A0stub-obj-y +=3D vmgenid.o > > > =C2=A0stub-obj-y +=3D xen-common.o > > > =C2=A0stub-obj-y +=3D xen-hvm.o > > > -stub-obj-y +=3D pci-host-piix.o > > > =C2=A0stub-obj-y +=3D ram-block.o > > > =C2=A0stub-obj-y +=3D ramfb.o =20 >=20 > Thanks, > Sebastien