From nobody Sun Feb 8 23:06:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=nutanix.com ARC-Seal: i=1; a=rsa-sha256; t=1592310793; cv=none; d=zohomail.com; s=zohoarc; b=QWZbB578U5wyLGNtukVXy3deLhRw0Sa3g0L/PRBQ6dJ3908wv99eJi2k1fEN12U3MQmNBELCGsZp5sY4fjUWGTlSEtgoTogOxAIEt6ngi8HBC9R0xymf7WsovLby3dAWgnyro7V2y2y/wsRyPcORvtNWpEHZLIKRRXltMklpitw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592310793; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=rf47d95KvzEUWFpX9tfw+CBNdSEgZx60xDkpvqv321A=; b=k6R4/H6vEOYhiN+2/SaQV3cs0GppV2QdtaSX4mIUn33glhOVR+KcCQQ/x8o9lgkkKPsZo+tdt5kRa7nwFhZPRG0f0b5IlzVopVRz97TevEjUSoCfxxlQdYcNlm9K4zx9w+yWmLzUi4+yiwgZHtgPgSADJnVD+mH1nbR4lu9/VJA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159231079324967.65056033244366; Tue, 16 Jun 2020 05:33:13 -0700 (PDT) Received: from localhost ([::1]:42998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlAm8-00021j-0Z for importer@patchew.org; Tue, 16 Jun 2020 08:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlAko-0000i7-51 for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:31:50 -0400 Received: from [192.146.154.243] (port=16981 helo=mcp01.nutanix.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlAkl-00050x-Uc for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:31:49 -0400 Received: from ani-sinha1.localdomain (ani-sinha1.dev.nutanix.com [10.41.71.199]) by mcp01.nutanix.com (Postfix) with ESMTP id E644D1012CF2; Tue, 16 Jun 2020 12:31:41 +0000 (UTC) Received: by ani-sinha1.localdomain (Postfix, from userid 16671) id E13AF220A23; Tue, 16 Jun 2020 12:31:41 +0000 (UTC) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH V3] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge Date: Tue, 16 Jun 2020 12:31:39 +0000 Message-Id: <1592310699-58916-1-git-send-email-ani.sinha@nutanix.com> X-Mailer: git-send-email 1.8.3.1 X-Host-Lookup-Failed: Reverse DNS lookup failed for 192.146.154.243 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=192.146.154.243; envelope-from=ani.sinha@ani-sinha1.localdomain; helo=mcp01.nutanix.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 08:31:42 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: 19 X-Spam_score: 1.9 X-Spam_bar: + X-Spam_report: (1.9 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=1, NO_DNS_FOR_FROM=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, SUBJ_OBFU_PUNCT_FEW=1, SUBJ_OBFU_PUNCT_MANY=1 autolearn=_AUTOLEARN 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: Ani Sinha , "Michael S. Tsirkin" , Aleksandar Markovic , ani@anisinha.ca, Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, the option use_acpi_pci_hotplug is being used to control device hotplug capability using ACPI for slots of cold plugged bridges. Hence, we are renaming this option to better reflect what it actually does. Signed-off-by: Ani Sinha Reviewed-by: Igor Mammedov --- hw/acpi/piix4.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 85c199b..7de44bc 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -77,7 +77,7 @@ typedef struct PIIX4PMState { Notifier powerdown_notifier; =20 AcpiPciHpState acpi_pci_hotplug; - bool use_acpi_pci_hotplug; + bool use_acpi_hotplug_bridge; =20 uint8_t disable_s3; uint8_t disable_s4; @@ -204,16 +204,17 @@ static const VMStateDescription vmstate_pci_status = =3D { } }; =20 -static bool vmstate_test_use_acpi_pci_hotplug(void *opaque, int version_id) +static bool vmstate_test_use_acpi_hotplug_bridge(void *opaque, int version= _id) { PIIX4PMState *s =3D opaque; - return s->use_acpi_pci_hotplug; + return s->use_acpi_hotplug_bridge; } =20 -static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version= _id) +static bool vmstate_test_no_use_acpi_hotplug_bridge(void *opaque, + int version_id) { PIIX4PMState *s =3D opaque; - return !s->use_acpi_pci_hotplug; + return !s->use_acpi_hotplug_bridge; } =20 static bool vmstate_test_use_memhp(void *opaque) @@ -290,11 +291,11 @@ static const VMStateDescription vmstate_acpi =3D { VMSTATE_STRUCT_TEST( acpi_pci_hotplug.acpi_pcihp_pci_status[ACPI_PCIHP_BSEL_DEFAULT= ], PIIX4PMState, - vmstate_test_no_use_acpi_pci_hotplug, + vmstate_test_no_use_acpi_hotplug_bridge, 2, vmstate_pci_status, struct AcpiPciHpPciStatus), VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState, - vmstate_test_use_acpi_pci_hotplug), + vmstate_test_use_acpi_hotplug_bridge), VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription*[]) { @@ -528,7 +529,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t = smb_io_base, s->smi_irq =3D smi_irq; s->smm_enabled =3D smm_enabled; if (xen_enabled()) { - s->use_acpi_pci_hotplug =3D false; + s->use_acpi_hotplug_bridge =3D false; } =20 qdev_init_nofail(dev); @@ -593,7 +594,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion= *parent, memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); =20 acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_pci_hotplug); + s->use_acpi_hotplug_bridge); =20 s->cpu_hotplug_legacy =3D true; object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", @@ -631,7 +632,7 @@ static Property piix4_pm_properties[] =3D { DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, = 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, - use_acpi_pci_hotplug, true), + use_acpi_hotplug_bridge, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), DEFINE_PROP_END_OF_LIST(), --=20 1.9.4