From nobody Sun Feb 8 18:44:15 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=1591796506; cv=none; d=zohomail.com; s=zohoarc; b=LNkj550lElWEyKmsZs3enXsV6aVVsEmwv1zfunzBczWBOO3dv+5gofIAaotHf5ojsPgrUlweHWaKlZddB3TUd2GvYd1a2/l2VWtKLX7iOujF6i7uFMfBBlJzlY4+NZv9r1l0+VyzdIp4u1NAug2eSQun5qB2maWSoEdGeyyE18A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591796506; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=MeUNCb6fLOOTRBFHQ/tsSb+KLFIjlRoaFhKWUzrGa3U=; b=cMwPmbxNxeqSro84B0r+BhSEyRV4/CQlyKFptFx0m7nmPCh44mmiPje5A+Kopz2JqnYiRC0S0kBTVM5UEBR/E14qKSJIAi/WQcugVuIV97OtfmM8fA1SzOZahInpGlPnrFYY/6AnTpu54A6FVsDTFlU2rkouh7JznSV+wOVPa+U= 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 1591796506620963.6741164701102; Wed, 10 Jun 2020 06:41:46 -0700 (PDT) Received: from localhost ([::1]:40486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj0zB-0000v3-Dv for importer@patchew.org; Wed, 10 Jun 2020 09:41:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj0uf-0003fT-Bb for qemu-devel@nongnu.org; Wed, 10 Jun 2020 09:37:05 -0400 Received: from [192.146.154.243] (port=50817 helo=mcp01.nutanix.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj0ue-0002NT-0w for qemu-devel@nongnu.org; Wed, 10 Jun 2020 09:37:04 -0400 Received: from ani-sinha1.localdomain (ani-sinha1.dev.nutanix.com [10.41.71.199]) by mcp01.nutanix.com (Postfix) with ESMTP id E2C7F101242D; Wed, 10 Jun 2020 13:36:58 +0000 (UTC) Received: by ani-sinha1.localdomain (Postfix, from userid 16671) id D8A95220A23; Wed, 10 Jun 2020 13:36:58 +0000 (UTC) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge Date: Wed, 10 Jun 2020 13:36:43 +0000 Message-Id: <1591796203-49936-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/10 09:36:59 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" Previously, the option use_acpi_pci_hotplug was 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. Change-Id: I2a6ab47e80fa2bc9504ce88e063d710efaceb842 Signed-off-by: Ani Sinha --- 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