From nobody Mon Feb 9 12:43:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593040696; cv=none; d=zohomail.com; s=zohoarc; b=UlghokX+WJv6MKZmRZdv2ULPfJY2YmOA6PVxNU44dwrz+ZwNNHjwr21RdVTSc2XmgSpDJJfMnbT4RMx+B19PLwDkvqMQ5M9tj+wXtNxtvd+dhxVruC32orU3APzwesoeKfkngi4jg2cmrO9X7wDgx6AqmCSw+y0Iy7ujzaMRIV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593040696; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GrIw3oNFPuimxxA3bj46vEVZmWwWe/K09lvhh8ororc=; b=dIU9D6Mny1aEIwOCBwzBiytGNO2Ch9hKCeV7vxt7s0GJMIw7Y0Gz6YVL7vP3rpqfJt2aGOfhVbOB5JMP2VMzCWjiEvQ8pKgvx0aI0dvgAB6YxMR+kByzamcWU8lumIrVBmyQybJDhz7tF6FpILt+csMlmRzwKZQl9vGT6qcsd0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1593040696362715.6127172495294; Wed, 24 Jun 2020 16:18:16 -0700 (PDT) Received: from localhost ([::1]:53978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEel-0002s4-4X for importer@patchew.org; Wed, 24 Jun 2020 19:18:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joEUF-0000yR-IT for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23981 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 1joEUD-0001iK-IG for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:23 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-wQbgNtHlN-izSKfsT1xwLQ-1; Wed, 24 Jun 2020 19:07:16 -0400 Received: by mail-wr1-f69.google.com with SMTP id a6so4735195wrq.3 for ; Wed, 24 Jun 2020 16:07:16 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id z1sm15419081wrh.14.2020.06.24.16.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040040; 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: in-reply-to:in-reply-to:references:references; bh=GrIw3oNFPuimxxA3bj46vEVZmWwWe/K09lvhh8ororc=; b=BxTddLnKN2nXyrvhpzWtmgHz05Js+pk34mnVH3Zp2B6DEkjxPizedNQjWHo6fXwhQN2Drq jyldFrDI+49PdFdtDtgJrh+Rjl+aHycTBckwWrs8FpETNaWURFF4CwHBMz3FGVqH1jiQLd Y8i/iXVBA5TSP51KR3gpIlxuMDSUEaI= X-MC-Unique: wQbgNtHlN-izSKfsT1xwLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GrIw3oNFPuimxxA3bj46vEVZmWwWe/K09lvhh8ororc=; b=sZ0OEuwE+DDfthXoGjljlGHCDwjymM1rSYgGnpAOrfapw8y1kcF496FjJrOCwZfIx6 5Q2/GsVWdngngA966WFeACyato/JQ18hAKi1RH77B8urT7Mt3sTIH+ImcQ6c1WTeLU1I GN9HVe2RBBieadkyuB9gwjE/Fc2uVl44rIxhjFwx3yjLpYfHk4ulautecfjKa/CU0hTt TDzdvaj+oi5EJz3G0pF0LUSjpAMVNckskDGEkmU2P79LaHsF/nK3572G/krkJycYOb0z oETW3Nap8Kms3FVmQN2sF1Rw3sAbfOK5fAvl/u4ZzAeRr78IAYADhMALobFLUIQ2IUe9 +SPQ== X-Gm-Message-State: AOAM532WiO4PcY0cqIhYafzfhtzi2S2Ad/5/Twx09vduy1VS/sM2Ivne /pAw4sK4BGM9nDLJvwB0oJkEOICYcZPAKbKATCozaTIjK5t9T4uJi9lv3O8KfUKCKn+LPrQ+mwP JUChV2AjI3Ox9BIg= X-Received: by 2002:a5d:4a0c:: with SMTP id m12mr33964045wrq.156.1593040035403; Wed, 24 Jun 2020 16:07:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfnNWE/9sqXv8jL47+sOvwuQDOYi+8r96QzAn/CWjvk58AmKZl9o3x0PxqfVESffrUI5+H4Q== X-Received: by 2002:a5d:4a0c:: with SMTP id m12mr33964028wrq.156.1593040035222; Wed, 24 Jun 2020 16:07:15 -0700 (PDT) Date: Wed, 24 Jun 2020 19:07:12 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 17/19] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge Message-ID: <20200624230609.703104-18-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline 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: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Peter Maydell , Ani Sinha , Aleksandar Markovic , Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ani Sinha 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 Message-Id: <1592310699-58916-1-git-send-email-ani.sinha@nutanix.com> Reviewed-by: Igor Mammedov Signed-off-by: Ani Sinha Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 1262abc77a..630ca6ec87 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*[]) { @@ -530,7 +531,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 pci_realize_and_unref(pci_dev, bus, &error_fatal); @@ -595,7 +596,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", @@ -633,7 +634,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 MST