From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17D69C433E0 for ; Mon, 13 Jul 2020 09:39:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6584206F0 for ; Mon, 13 Jul 2020 09:39:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UDuD5gy+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6584206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juuw4-0007Ok-5e for qemu-devel@archiver.kernel.org; Mon, 13 Jul 2020 05:39:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juuuB-0005SE-7K for qemu-devel@nongnu.org; Mon, 13 Jul 2020 05:37:47 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:46596 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1juuu8-0007iR-O7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 05:37:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594633064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DktgHhAmsU6UDKMxt4cMu1Z86673AuBmrWcWUoXoOEo=; b=UDuD5gy+RGgnHfrTOSPcgjFW8faeHj/9sK39Pu+4mAxqXJPL9YxiaSPNtCX5Kf/AQWsXU6 xl482RUjFKS4D0UI8c5b2yaoHLCjLT+7+bbxstNCV7ZTbz7QyYCSv2l/u+IoSz5mQbCHRh HYAnF2+HjsSqZ6i/2QBtHUk1C7Dyxuw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-nWe4UFuCOMymWFJZlOmDkg-1; Mon, 13 Jul 2020 05:37:42 -0400 X-MC-Unique: nWe4UFuCOMymWFJZlOmDkg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18B9A19067E5; Mon, 13 Jul 2020 09:37:41 +0000 (UTC) Received: from localhost (unknown [10.40.208.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72E460BEC; Mon, 13 Jul 2020 09:37:32 +0000 (UTC) Date: Mon, 13 Jul 2020 11:37:30 +0200 From: Igor Mammedov To: Julia Suvorova Subject: Re: [RFC PATCH 1/5] hw/acpi/pcihp: Introduce find_host() Message-ID: <20200713113730.3a8e850f@redhat.com> In-Reply-To: <20200708224615.114077-2-jusual@redhat.com> References: <20200708224615.114077-1-jusual@redhat.com> <20200708224615.114077-2-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 01:36:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 9 Jul 2020 00:46:11 +0200 Julia Suvorova wrote: > Returns the current host bus with ACPI PCI hot-plug support: q35 or i440fx. > > Signed-off-by: Julia Suvorova > --- > hw/i386/acpi-build.h | 2 ++ > hw/acpi/pcihp.c | 13 +++++++++++++ > hw/i386/acpi-build.c | 2 +- > 3 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h > index 74df5fc612..0696b4e48d 100644 > --- a/hw/i386/acpi-build.h > +++ b/hw/i386/acpi-build.h > @@ -7,4 +7,6 @@ extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio; > > void acpi_setup(void); > > +Object *acpi_get_i386_pci_host(void); > + > #endif > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index d42906ea19..3d4ee3af72 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -33,10 +33,12 @@ > #include "hw/acpi/acpi.h" > #include "exec/address-spaces.h" > #include "hw/pci/pci_bus.h" > +#include "hw/pci/pci_host.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > #include "qom/qom-qobject.h" > #include "trace.h" > +#include "hw/i386/acpi-build.h" > > #define ACPI_PCIHP_ADDR 0xae00 > #define ACPI_PCIHP_SIZE 0x0014 > @@ -86,6 +88,17 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) > return bsel_alloc; > } > > +static PCIBus *find_host(void) > +{ > + Object *obj = acpi_get_i386_pci_host(); > + > + if (obj) { > + return PCI_HOST_BRIDGE(obj)->bus; > + } > + > + return NULL; > +} My guess you are adding it for 5/5, with a function name a bit off compared to what you are doing (probably you've tried to reuse find_i440fx() idea) I'd just make acpi_get_i386_pci_host() public, drop find_host and use host = acpi_get_i386_pci_host() bus = PCI_HOST_BRIDGE(pci_host)->bus like it's done elsewhere > static void acpi_set_pci_info(void) > { > static bool bsel_is_set; > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 900f786d08..11c598f955 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -270,7 +270,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info) > * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. > * On i386 arch we only have two pci hosts, so we can look only for them. > */ > -static Object *acpi_get_i386_pci_host(void) > +Object *acpi_get_i386_pci_host(void) > { > PCIHostState *host; >