From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:6089:0:0:0:0:0 with SMTP id w9csp286981wrt; Tue, 20 Nov 2018 00:26:34 -0800 (PST) X-Google-Smtp-Source: AJdET5fptELv7gLB8nETKYsq/m+eAtGLDt/TEjtB55peX6rS/eFvD2vAEwSgPlMHtHYoYBDeCyOC X-Received: by 2002:a25:4cca:: with SMTP id z193-v6mr823997yba.279.1542702394538; Tue, 20 Nov 2018 00:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542702394; cv=none; d=google.com; s=arc-20160816; b=C9IUCYZrJBjBP8oqclysRrDNmcSaWlPrt7m2LZulMIbvKdTCFc09jHy/IL17gqthZD T0FI6eFqwRMzGGJzRY2J8n6XW3bwwZQAZnnzggsgBrFvvis/BQQOxEFlB55EW44GcR1C zDYgsdNdHeqtfwP383etaTqTf50SHY8rwl/hfiD5oxgSLYPoGnSlZdj+vqVHvlhXyMzw +2kxj3+XSL4ET1tkITSc45TV4dfYP+fgbfew8wXVE8HI30pOPszCp09NFQu4BkoK3v4f +uDF0QY30FQB/jp1M59ZqHb1iUzlsEssMbtLd3jawldTjmtTvDEtBfoNQ0YKz6fHgLNL 7X7Q== 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=5BeJX1rMVEdFlWC/exdFOnpkcil6pP8i05Q5vAG4cRs=; b=NuyeYSi+/zMta5C6yjlydRxB0kIodUGV/Rf1eGhL4BxG54ZjbfC81LqnwxSUT3DBnb ZUfaeQ8plCnH5Q9TcQLv85Z90Q5JY8lakeWjmG4PN/p6hsyjfrbo8+gygSuqsNyefNIp r/wTU79ooA9R3eGvAIWdX64y/t5JuiTbl1Ffh9HlHJZOvKWDngY8UZ6jS+ifZiZL06MD zGaUJzy4tbRNjCQvvvsH3ZoykmGZOEUMw9bZMET7eIdPqyJwXNvKdy/b+M+VRac1BnPb w7DLtpAs0ZDxe2N+zFg/XlEC0PTW1Cm6QdmUyQIe8xKOZV7CS5haDo749zVseJKNSiHT +pKA== 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 d64-v6si22907414ybh.367.2018.11.20.00.26.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Nov 2018 00:26:34 -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]:60749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP1Mf-0000d0-S0 for alex.bennee@linaro.org; Tue, 20 Nov 2018 03:26:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP1MN-0000aD-8t for qemu-arm@nongnu.org; Tue, 20 Nov 2018 03:26:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP1ML-0002mh-LT for qemu-arm@nongnu.org; Tue, 20 Nov 2018 03:26:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gP1ML-0002ji-Aa; Tue, 20 Nov 2018 03:26:13 -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 D044D89AC2; Tue, 20 Nov 2018 08:26:11 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F08F6013A; Tue, 20 Nov 2018 08:26:03 +0000 (UTC) Date: Tue, 20 Nov 2018 09:26:02 +0100 From: Igor Mammedov To: "Boeuf, Sebastien" Message-ID: <20181120092602.676ff8f1@redhat.com> In-Reply-To: <1542650570.24389.5.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> <20181119163757.3c975f62@redhat.com> <1542650570.24389.5.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.26]); Tue, 20 Nov 2018 08:26:12 +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: baIuNfo1At44 On Mon, 19 Nov 2018 18:02:53 +0000 "Boeuf, Sebastien" wrote: > On Mon, 2018-11-19 at 16:37 +0100, Igor Mammedov wrote: > > On Fri, 16 Nov 2018 19:42:08 +0000 > > "Boeuf, Sebastien" wrote: > > =20 > > >=20 > > > Hi Igor, > > >=20 > > > On Fri, 2018-11-16 at 10:39 +0100, Igor Mammedov wrote: =20 > > > >=20 > > > > On Mon,=C2=A0=C2=A05 Nov 2018 02:40:42 +0100 > > > > Samuel Ortiz wrote: > > > > =C2=A0=C2=A0 =20 > > > > >=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 =C2=A0=C2=A0 = =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.=C2=A0=C2= =A0 =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. =20 > > it supports both but is it relevant to this patch? > >=20 > > 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 > I understand the point but I think the comment was wrong in the first > place since q35 never tried to support ACPI PCIHP, as they support PCIe > native hotplug as you mentioned. ok. when you have something ready, feel free to ping me (I don't mind to review on github if that helps to speed up process) >=20 > > =C2=A0 =20 > > > =20 > > > >=20 > > > >=20 > > > > with commit message fixed > > > >=20 > > > > Reviewed-by: Igor Mammedov > > > > =C2=A0=C2=A0 =20 > > > > >=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 supp= ort */ > > > > > -=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= _depth_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= _depth_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(PCIHost= State, > > > > > -=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=A0obj= ect_resolve_path("/machi > > > > > ne/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=A0TYP= E_PCI_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_ir= q) > > > > > =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=C2=A0=C2=A0 =20 > > > Thanks, > > > Sebastie =20 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: Tue, 20 Nov 2018 09:26:02 +0100 Message-ID: <20181120092602.676ff8f1@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> <20181119163757.3c975f62@redhat.com> <1542650570.24389.5.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gP1ML-0004i4-Qv for xen-devel@lists.xenproject.org; Tue, 20 Nov 2018 08:26:13 +0000 In-Reply-To: <1542650570.24389.5.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 T24gTW9uLCAxOSBOb3YgMjAxOCAxODowMjo1MyArMDAwMAoiQm9ldWYsIFNlYmFzdGllbiIgPHNl YmFzdGllbi5ib2V1ZkBpbnRlbC5jb20+IHdyb3RlOgoKPiBPbiBNb24sIDIwMTgtMTEtMTkgYXQg MTY6MzcgKzAxMDAsIElnb3IgTWFtbWVkb3Ygd3JvdGU6Cj4gPiBPbiBGcmksIDE2IE5vdiAyMDE4 IDE5OjQyOjA4ICswMDAwCj4gPiAiQm9ldWYsIFNlYmFzdGllbiIgPHNlYmFzdGllbi5ib2V1ZkBp bnRlbC5jb20+IHdyb3RlOgo+ID4gICAKPiA+ID4gCj4gPiA+IEhpIElnb3IsCj4gPiA+IAo+ID4g PiBPbiBGcmksIDIwMTgtMTEtMTYgYXQgMTA6MzkgKzAxMDAsIElnb3IgTWFtbWVkb3Ygd3JvdGU6 ICAKPiA+ID4gPiAKPiA+ID4gPiBPbiBNb24swqDCoDUgTm92IDIwMTggMDI6NDA6NDIgKzAxMDAK PiA+ID4gPiBTYW11ZWwgT3J0aXogPHNhbWVvQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gPiA+ ID4gwqDCoCAgCj4gPiA+ID4gPiAKPiA+ID4gPiA+IAo+ID4gPiA+ID4gRnJvbTogU2ViYXN0aWVu IEJvZXVmIDxzZWJhc3RpZW4uYm9ldWZAaW50ZWwuY29tPgo+ID4gPiA+ID4gCj4gPiA+ID4gPiBJ bnN0ZWFkIG9mIHVzaW5nIHRoZSBtYWNoaW5lIHR5cGUgc3BlY2lmaWMgbWV0aG9kIGZpbmRfaTQ0 MGZ4KCkKPiA+ID4gPiA+IHRvCj4gPiA+ID4gPiByZXRyaWV2ZSB0aGUgUENJIGJ1cywgdGhpcyBj b21taXQgYWltcyB0byByZWx5IG9uIHRoZSBmYWN0IHRoYXQKPiA+ID4gPiA+IHRoZQo+ID4gPiA+ ID4gUENJIGJ1cyBpcyBrbm93biBieSB0aGUgc3RydWN0dXJlIEFjcGlQY2lIcFN0YXRlLgo+ID4g PiA+ID4gCj4gPiA+ID4gPiBXaGVuIHRoZSBzdHJ1Y3R1cmUgaXMgaW5pdGlhbGl6ZWQgdGhyb3Vn aCBhY3BpX3BjaWhwX2luaXQoKQo+ID4gPiA+ID4gY2FsbCwKPiA+ID4gPiA+IGl0IHNhdmVzIHRo ZSBQQ0kgYnVzLCB3aGljaCBtZWFucyB0aGVyZSBpcyBubyBuZWVkIHRvIGludm9rZSBhCj4gPiA+ ID4gPiBzcGVjaWFsIGZ1bmN0aW9uIGxhdGVyIG9uLgo+ID4gPiA+ID4gCj4gPiA+ID4gPiBCYXNl ZCBvbiB0aGUgZmFjdCB0aGF0IGZpbmRfaTQ0MGZ4KCkgd2FzIG9ubHkgdXNlZCB0aGVyZSwgdGhp cwo+ID4gPiA+ID4gcGF0Y2ggYWxzbyByZW1vdmVzIHRoZSBmdW5jdGlvbiBmaW5kX2k0NDBmeCgp IGl0c2VsZiBmcm9tIHRoZQo+ID4gPiA+ID4gZW50aXJlIGNvZGViYXNlLgo+ID4gPiA+ID4gCj4g PiA+ID4gPiBSZXZpZXdlZC1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRo YXQuY29tPgo+ID4gPiA+ID4gVGVzdGVkLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8cGhp bG1kQHJlZGhhdC5jb20+Cj4gPiA+ID4gPiBTaWduZWQtb2ZmLWJ5OiBTZWJhc3RpZW4gQm9ldWYg PHNlYmFzdGllbi5ib2V1ZkBpbnRlbC5jb20+Cj4gPiA+ID4gPiBTaWduZWQtb2ZmLWJ5OiBKaW5n IExpdSA8amluZzIubGl1QGxpbnV4LmludGVsLmNvbT7CoMKgICAKPiA+ID4gPiBUaGFua3MgZm9y IGNsZWFuaW5nIGl0IHVwCj4gPiA+ID4gCj4gPiA+ID4gbWlub3Igbml0Ogo+ID4gPiA+IFRha2lu ZyBpbiBhY2NvdW50IHRoYXQgeW91J3JlIHJlbW92aW5nICcvKiBUT0RPOiBRMzUgc3VwcG9ydCAq LycKPiA+ID4gPiBjb21tZW50IGFsb25nIHdpdGggZmluZF9pNDQwZngoKSwgaXQgbWlnaHQgYmUg d29ydGggdG8gbWVudGlvbgo+ID4gPiA+IGluIHRoaXMgY29tbWl0IG1lc3NhZ2UuIFNvbWV0aGlu ZyBhbG9uZyBsaW5lcyB0aGF0IEFDUEkgUENJSFAKPiA+ID4gPiBleGlzdCB0byBzdXBwb3J0IGd1 ZXN0cyB3aXRob3V0IFNIUEMgc3VwcG9ydCBvbiBQQ0kKPiA+ID4gPiBiYXNlZCBQQyBtYWNoaW5l LiBDb25zaWRlcmluZyB0aGF0IFEzNSBwcm92aWRlcyBuYXRpdmUKPiA+ID4gPiBQQ0ktRSBob3Rw bHVnLCB0aGVyZSBpcyBubyBuZWVkIHRvIGFkZCBBQ1BJIGhvdHBsdWcgdGhlcmUuwqDCoCAgCj4g PiA+IE9oIHllcyBzdXJlIHdlIGNhbiB1cGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIDopLiBCdXQg anVzdCB3YW50ZWQgdG8KPiA+ID4gbWVudGlvbiB0aGF0ICdwYycgbWFjaGluZSB0eXBlIHVzZXMg QUNQSSBQQ0lIUCBhbmQgZG9lcyBzdXBwb3J0Cj4gPiA+IFNIUEMsIHNvIGl0J3Mgbm90IG11dHVh bGx5IGV4Y2x1c2l2ZS4gIAo+ID4gaXQgc3VwcG9ydHMgYm90aCBidXQgaXMgaXQgcmVsZXZhbnQg dG8gdGhpcyBwYXRjaD8KPiA+IAo+ID4gUG9pbnQgd2FzIHRoYXQgb25lIHNob3VsZG4ndCByZW1v dmUgc29tZXRoaW5nIHNpbGVudGx5IHdpdGhvdXQKPiA+IGFueSBqdXN0aWZpY2F0aW9uL2V4cGxh bmF0aW9uLiBTbyB0aGF0IHJlYWRlcnMgdGhhdCBjb21lIGxhdGVyCj4gPiB3b3VsZG4ndCB3b25k ZXIgYWJvdXQgdGhlIHJlYXNvbnMgd2h5IHRoZSBjb2RlIHdhcyByZW1vdmVkLgo+ID4gICAKPiAK PiBJIHVuZGVyc3RhbmQgdGhlIHBvaW50IGJ1dCBJIHRoaW5rIHRoZSBjb21tZW50IHdhcyB3cm9u ZyBpbiB0aGUgZmlyc3QKPiBwbGFjZSBzaW5jZSBxMzUgbmV2ZXIgdHJpZWQgdG8gc3VwcG9ydCBB Q1BJIFBDSUhQLCBhcyB0aGV5IHN1cHBvcnQgUENJZQo+IG5hdGl2ZSBob3RwbHVnIGFzIHlvdSBt ZW50aW9uZWQuCm9rLgoKd2hlbiB5b3UgaGF2ZSBzb21ldGhpbmcgcmVhZHksIGZlZWwgZnJlZSB0 byBwaW5nIG1lCihJIGRvbid0IG1pbmQgdG8gcmV2aWV3IG9uIGdpdGh1YiBpZiB0aGF0IGhlbHBz IHRvIHNwZWVkIHVwIHByb2Nlc3MpCgo+IAo+ID4gwqAgIAo+ID4gPiAgIAo+ID4gPiA+IAo+ID4g PiA+IAo+ID4gPiA+IHdpdGggY29tbWl0IG1lc3NhZ2UgZml4ZWQKPiA+ID4gPiAKPiA+ID4gPiBS ZXZpZXdlZC1ieTogSWdvciBNYW1tZWRvdiA8aW1hbW1lZG9AcmVkaGF0LmNvbT4KPiA+ID4gPiDC oMKgICAKPiA+ID4gPiA+IAo+ID4gPiA+ID4gCj4gPiA+ID4gPiAtLS0KPiA+ID4gPiA+IMKgaW5j bHVkZS9ody9pMzg2L3BjLmjCoMKgfMKgwqAxIC0KPiA+ID4gPiA+IMKgaHcvYWNwaS9wY2locC5j wqDCoMKgwqDCoMKgwqB8IDEwICsrKystLS0tLS0KPiA+ID4gPiA+IMKgaHcvcGNpLWhvc3QvcGlp eC5jwqDCoMKgwqB8wqDCoDggLS0tLS0tLS0KPiA+ID4gPiA+IMKgc3R1YnMvcGNpLWhvc3QtcGlp eC5jIHzCoMKgNiAtLS0tLS0KPiA+ID4gPiA+IMKgc3R1YnMvTWFrZWZpbGUub2Jqc8KgwqDCoHzC oMKgMSAtCj4gPiA+ID4gPiDCoDUgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAyMiBk ZWxldGlvbnMoLSkKPiA+ID4gPiA+IMKgZGVsZXRlIG1vZGUgMTAwNjQ0IHN0dWJzL3BjaS1ob3N0 LXBpaXguYwo+ID4gPiA+ID4gCj4gPiA+ID4gPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9pMzg2 L3BjLmggYi9pbmNsdWRlL2h3L2kzODYvcGMuaAo+ID4gPiA+ID4gaW5kZXggNDRjYjZiZjNmMy4u OGU1ZjE0NjRlYiAxMDA2NDQKPiA+ID4gPiA+IC0tLSBhL2luY2x1ZGUvaHcvaTM4Ni9wYy5oCj4g PiA+ID4gPiArKysgYi9pbmNsdWRlL2h3L2kzODYvcGMuaAo+ID4gPiA+ID4gQEAgLTI1NSw3ICsy NTUsNiBAQCBQQ0lCdXMgKmk0NDBmeF9pbml0KGNvbnN0IGNoYXIgKmhvc3RfdHlwZSwKPiA+ID4g PiA+IGNvbnN0IGNoYXIgKnBjaV90eXBlLAo+ID4gPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgTWVtb3J5UmVnaW9uICpwY2lfbWVtb3J5LAo+ID4gPiA+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgTWVtb3J5UmVnaW9uICpy YW1fbWVtb3J5KTsKPiA+ID4gPiA+IMKgCj4gPiA+ID4gPiAtUENJQnVzICpmaW5kX2k0NDBmeCh2 b2lkKTsKPiA+ID4gPiA+IMKgLyogcGlpeDQuYyAqLwo+ID4gPiA+ID4gwqBleHRlcm4gUENJRGV2 aWNlICpwaWl4NF9kZXY7Cj4gPiA+ID4gPiDCoGludCBwaWl4NF9pbml0KFBDSUJ1cyAqYnVzLCBJ U0FCdXMgKippc2FfYnVzLCBpbnQgZGV2Zm4pOwo+ID4gPiA+ID4gZGlmZiAtLWdpdCBhL2h3L2Fj cGkvcGNpaHAuYyBiL2h3L2FjcGkvcGNpaHAuYwo+ID4gPiA+ID4gaW5kZXggODBkNDJlMTJmZi4u MjU0YjJlNTBhYiAxMDA2NDQKPiA+ID4gPiA+IC0tLSBhL2h3L2FjcGkvcGNpaHAuYwo+ID4gPiA+ ID4gKysrIGIvaHcvYWNwaS9wY2locC5jCj4gPiA+ID4gPiBAQCAtOTMsMTAgKzkzLDkgQEAgc3Rh dGljIHZvaWQgKmFjcGlfc2V0X2JzZWwoUENJQnVzICpidXMsIHZvaWQKPiA+ID4gPiA+ICpvcGFx dWUpCj4gPiA+ID4gPiDCoMKgwqDCoMKgcmV0dXJuIGJzZWxfYWxsb2M7Cj4gPiA+ID4gPiDCoH0K PiA+ID4gPiA+IMKgCj4gPiA+ID4gPiAtc3RhdGljIHZvaWQgYWNwaV9zZXRfcGNpX2luZm8odm9p ZCkKPiA+ID4gPiA+ICtzdGF0aWMgdm9pZCBhY3BpX3NldF9wY2lfaW5mbyhBY3BpUGNpSHBTdGF0 ZSAqcykKPiA+ID4gPiA+IMKgewo+ID4gPiA+ID4gwqDCoMKgwqDCoHN0YXRpYyBib29sIGJzZWxf aXNfc2V0Owo+ID4gPiA+ID4gLcKgwqDCoMKgUENJQnVzICpidXM7Cj4gPiA+ID4gPiDCoMKgwqDC oMKgdW5zaWduZWQgYnNlbF9hbGxvYyA9IEFDUElfUENJSFBfQlNFTF9ERUZBVUxUOwo+ID4gPiA+ ID4gwqAKPiA+ID4gPiA+IMKgwqDCoMKgwqBpZiAoYnNlbF9pc19zZXQpIHsKPiA+ID4gPiA+IEBA IC0xMDQsMTAgKzEwMyw5IEBAIHN0YXRpYyB2b2lkIGFjcGlfc2V0X3BjaV9pbmZvKHZvaWQpCj4g PiA+ID4gPiDCoMKgwqDCoMKgfQo+ID4gPiA+ID4gwqDCoMKgwqDCoGJzZWxfaXNfc2V0ID0gdHJ1 ZTsKPiA+ID4gPiA+IMKgCj4gPiA+ID4gPiAtwqDCoMKgwqBidXMgPSBmaW5kX2k0NDBmeCgpOyAv KiBUT0RPOiBRMzUgc3VwcG9ydCAqLwo+ID4gPiA+ID4gLcKgwqDCoMKgaWYgKGJ1cykgewo+ID4g PiA+ID4gK8KgwqDCoMKgaWYgKHMtPnJvb3QpIHsKPiA+ID4gPiA+IMKgwqDCoMKgwqDCoMKgwqDC oC8qIFNjYW4gYWxsIFBDSSBidXNlcy4gU2V0IHByb3BlcnR5IHRvIGVuYWJsZSBhY3BpCj4gPiA+ ID4gPiBiYXNlZAo+ID4gPiA+ID4gaG90cGx1Zy4gKi8KPiA+ID4gPiA+IC3CoMKgwqDCoMKgwqDC oMKgcGNpX2Zvcl9lYWNoX2J1c19kZXB0aF9maXJzdChidXMsIGFjcGlfc2V0X2JzZWwsIE5VTEws Cj4gPiA+ID4gPiAmYnNlbF9hbGxvYyk7Cj4gPiA+ID4gPiArwqDCoMKgwqDCoMKgwqDCoHBjaV9m b3JfZWFjaF9idXNfZGVwdGhfZmlyc3Qocy0+cm9vdCwgYWNwaV9zZXRfYnNlbCwKPiA+ID4gPiA+ IE5VTEwsCj4gPiA+ID4gPiAmYnNlbF9hbGxvYyk7Cj4gPiA+ID4gPiDCoMKgwqDCoMKgfQo+ID4g PiA+ID4gwqB9Cj4gPiA+ID4gPiDCoAo+ID4gPiA+ID4gQEAgLTIxMyw3ICsyMTEsNyBAQCBzdGF0 aWMgdm9pZAo+ID4gPiA+ID4gYWNwaV9wY2locF91cGRhdGUoQWNwaVBjaUhwU3RhdGUKPiA+ID4g PiA+ICpzKQo+ID4gPiA+ID4gwqAKPiA+ID4gPiA+IMKgdm9pZCBhY3BpX3BjaWhwX3Jlc2V0KEFj cGlQY2lIcFN0YXRlICpzKQo+ID4gPiA+ID4gwqB7Cj4gPiA+ID4gPiAtwqDCoMKgwqBhY3BpX3Nl dF9wY2lfaW5mbygpOwo+ID4gPiA+ID4gK8KgwqDCoMKgYWNwaV9zZXRfcGNpX2luZm8ocyk7Cj4g PiA+ID4gPiDCoMKgwqDCoMKgYWNwaV9wY2locF91cGRhdGUocyk7Cj4gPiA+ID4gPiDCoH0KPiA+ ID4gPiA+IMKgCj4gPiA+ID4gPiBkaWZmIC0tZ2l0IGEvaHcvcGNpLWhvc3QvcGlpeC5jIGIvaHcv cGNpLWhvc3QvcGlpeC5jCj4gPiA+ID4gPiBpbmRleCA0NzI5M2EzOTE1Li42NTg0NjAyNjRiIDEw MDY0NAo+ID4gPiA+ID4gLS0tIGEvaHcvcGNpLWhvc3QvcGlpeC5jCj4gPiA+ID4gPiArKysgYi9o dy9wY2ktaG9zdC9waWl4LmMKPiA+ID4gPiA+IEBAIC00NDUsMTQgKzQ0NSw2IEBAIFBDSUJ1cyAq aTQ0MGZ4X2luaXQoY29uc3QgY2hhciAqaG9zdF90eXBlLAo+ID4gPiA+ID4gY29uc3QgY2hhciAq cGNpX3R5cGUsCj4gPiA+ID4gPiDCoMKgwqDCoMKgcmV0dXJuIGI7Cj4gPiA+ID4gPiDCoH0KPiA+ ID4gPiA+IMKgCj4gPiA+ID4gPiAtUENJQnVzICpmaW5kX2k0NDBmeCh2b2lkKQo+ID4gPiA+ID4g LXsKPiA+ID4gPiA+IC3CoMKgwqDCoFBDSUhvc3RTdGF0ZSAqcyA9IE9CSkVDVF9DSEVDSyhQQ0lI b3N0U3RhdGUsCj4gPiA+ID4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoG9iamVjdF9yZXNvbHZlX3BhdGgoIi9t YWNoaQo+ID4gPiA+ID4gbmUvaQo+ID4gPiA+ID4gNDQwZngiLCBOVUxMKSwKPiA+ID4gPiA+IC3C oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgVFlQRV9QQ0lfSE9TVF9CUklER0UpOwo+ID4gPiA+ID4gLcKgwqDCoMKgcmV0 dXJuIHMgPyBzLT5idXMgOiBOVUxMOwo+ID4gPiA+ID4gLX0KPiA+ID4gPiA+IC0KPiA+ID4gPiA+ IMKgLyogUElJWDMgUENJIHRvIElTQSBicmlkZ2UgKi8KPiA+ID4gPiA+IMKgc3RhdGljIHZvaWQg cGlpeDNfc2V0X2lycV9waWMoUElJWDNTdGF0ZSAqcGlpeDMsIGludCBwaWNfaXJxKQo+ID4gPiA+ ID4gwqB7Cj4gPiA+ID4gPiBkaWZmIC0tZ2l0IGEvc3R1YnMvcGNpLWhvc3QtcGlpeC5jIGIvc3R1 YnMvcGNpLWhvc3QtcGlpeC5jCj4gPiA+ID4gPiBkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKPiA+ ID4gPiA+IGluZGV4IDZlZDgxYjFmMjEuLjAwMDAwMDAwMDAKPiA+ID4gPiA+IC0tLSBhL3N0dWJz L3BjaS1ob3N0LXBpaXguYwo+ID4gPiA+ID4gKysrIC9kZXYvbnVsbAo+ID4gPiA+ID4gQEAgLTEs NiArMCwwIEBACj4gPiA+ID4gPiAtI2luY2x1ZGUgInFlbXUvb3NkZXAuaCIKPiA+ID4gPiA+IC0j aW5jbHVkZSAiaHcvaTM4Ni9wYy5oIgo+ID4gPiA+ID4gLVBDSUJ1cyAqZmluZF9pNDQwZngodm9p ZCkKPiA+ID4gPiA+IC17Cj4gPiA+ID4gPiAtwqDCoMKgwqByZXR1cm4gTlVMTDsKPiA+ID4gPiA+ IC19Cj4gPiA+ID4gPiBkaWZmIC0tZ2l0IGEvc3R1YnMvTWFrZWZpbGUub2JqcyBiL3N0dWJzL01h a2VmaWxlLm9ianMKPiA+ID4gPiA+IGluZGV4IDVkZDBhZWVlYzYuLjcyNWY3OGJlZGMgMTAwNjQ0 Cj4gPiA+ID4gPiAtLS0gYS9zdHVicy9NYWtlZmlsZS5vYmpzCj4gPiA+ID4gPiArKysgYi9zdHVi cy9NYWtlZmlsZS5vYmpzCj4gPiA+ID4gPiBAQCAtNDEsNiArNDEsNSBAQCBzdHViLW9iai15ICs9 IHBjX21hZHRfY3B1X2VudHJ5Lm8KPiA+ID4gPiA+IMKgc3R1Yi1vYmoteSArPSB2bWdlbmlkLm8K PiA+ID4gPiA+IMKgc3R1Yi1vYmoteSArPSB4ZW4tY29tbW9uLm8KPiA+ID4gPiA+IMKgc3R1Yi1v YmoteSArPSB4ZW4taHZtLm8KPiA+ID4gPiA+IC1zdHViLW9iai15ICs9IHBjaS1ob3N0LXBpaXgu bwo+ID4gPiA+ID4gwqBzdHViLW9iai15ICs9IHJhbS1ibG9jay5vCj4gPiA+ID4gPiDCoHN0dWIt b2JqLXkgKz0gcmFtZmIub8KgwqAgIAo+ID4gPiBUaGFua3MsCj4gPiA+IFNlYmFzdGllICAKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwg bWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3Rz LnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP1MU-0000e6-7f for qemu-devel@nongnu.org; Tue, 20 Nov 2018 03:26:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP1MS-0002tW-WE for qemu-devel@nongnu.org; Tue, 20 Nov 2018 03:26:22 -0500 Date: Tue, 20 Nov 2018 09:26:02 +0100 From: Igor Mammedov Message-ID: <20181120092602.676ff8f1@redhat.com> In-Reply-To: <1542650570.24389.5.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> <20181119163757.3c975f62@redhat.com> <1542650570.24389.5.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 Mon, 19 Nov 2018 18:02:53 +0000 "Boeuf, Sebastien" wrote: > On Mon, 2018-11-19 at 16:37 +0100, Igor Mammedov wrote: > > On Fri, 16 Nov 2018 19:42:08 +0000 > > "Boeuf, Sebastien" wrote: > > =20 > > >=20 > > > Hi Igor, > > >=20 > > > On Fri, 2018-11-16 at 10:39 +0100, Igor Mammedov wrote: =20 > > > >=20 > > > > On Mon,=C2=A0=C2=A05 Nov 2018 02:40:42 +0100 > > > > Samuel Ortiz wrote: > > > > =C2=A0=C2=A0 =20 > > > > >=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 =C2=A0=C2=A0 = =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.=C2=A0=C2= =A0 =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. =20 > > it supports both but is it relevant to this patch? > >=20 > > 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 > I understand the point but I think the comment was wrong in the first > place since q35 never tried to support ACPI PCIHP, as they support PCIe > native hotplug as you mentioned. ok. when you have something ready, feel free to ping me (I don't mind to review on github if that helps to speed up process) >=20 > > =C2=A0 =20 > > > =20 > > > >=20 > > > >=20 > > > > with commit message fixed > > > >=20 > > > > Reviewed-by: Igor Mammedov > > > > =C2=A0=C2=A0 =20 > > > > >=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 supp= ort */ > > > > > -=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= _depth_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= _depth_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(PCIHost= State, > > > > > -=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=A0obj= ect_resolve_path("/machi > > > > > ne/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=A0TYP= E_PCI_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_ir= q) > > > > > =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=C2=A0=C2=A0 =20 > > > Thanks, > > > Sebastie =20