From nobody Fri Apr 26 07:53:06 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1675441925; cv=none; d=zohomail.com; s=zohoarc; b=kZqDakParaIQEAdur1WFX5FDr7uJlTOb+IOC0fPDp+nIJPk/8RYFGPW4u/BgzN/cL54sDQR6QNv2Gjtl6z8+3jjAlLH54Qn7/Gs7HyGys7pIhTU+6suLZL/RHp451El9xcLabYSmM4nRc1CE24QvWlwUrOmuB4tI2b9IlN8rh6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675441925; h=Content-Type:Content-Transfer-Encoding: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=rI8YBskLtC8mMs+vacOa3C62UUOa+s+K2Ki5NU8X6dw=; b=UkLoI9mhm5YqEFSzBRfsL825bhJ+Vn75WTExYDilb15gUwZGuG6ZKNVjsSE70oVVvIakNXsWMyuvp0EOMkgv4oX1FQ4nhLuiXi3r0YACuq2QVqE9D98Fxf5FF5BvZTxO6DSWlHtOQfF6SO0WS+5a4Is3Orl3+zL376wnWp2EPNQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675441925017101.95406567052316; Fri, 3 Feb 2023 08:32:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNyxY-0001NG-8m; Fri, 03 Feb 2023 11:30:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNyxU-0001KB-WC for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:41 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNyxP-0007mp-2R for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:37 -0500 Received: by mail-wr1-x433.google.com with SMTP id j25so1611952wrc.4 for ; Fri, 03 Feb 2023 08:30:30 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id z16-20020a5d4d10000000b002bbed1388a5sm2348052wrt.15.2023.02.03.08.30.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Feb 2023 08:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rI8YBskLtC8mMs+vacOa3C62UUOa+s+K2Ki5NU8X6dw=; b=P4p9vMoYeGHLOtIRjTyP8rs+AoGOwUYjOPjdDUUL/ej3rquQ1e1WNMGK/jxuoBCZzj AlmuHpFIkyOalCcVkvOM+HAKiahel/q7gMqywE27avxsEzukSLkDyPvTw7YbzqV94ONu 3UznkYYheR4UG6HkuHIo/RIoeFRdcmtkrXNEE9xT+uQSD347Guc298I0WvIKMjTJrbl+ 8KGgl6Ga4EB5EtW4xh/rHnAmk99tD2mxNS8y9LtLKtRHhESYGogBDoH50WFdvd/8vvxY aePaUpqPKsV4rw3g0bGUhnGWrPgXN35/TTVSmFK1lksgGmORGqHPDrjfzDArzzJAX4X2 aqcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rI8YBskLtC8mMs+vacOa3C62UUOa+s+K2Ki5NU8X6dw=; b=aFBPmYRuvQP1uGeHwcvDxWXx4nk8Jr7+DuHPMqwktuVgn77ASqgogbGu9WsukhyzYc VfKUcqSB+86y6aVI39ak5GbrtU3Hw++7zhmPOD2J2YoXfnad0+5QwajUaX9x925irlsp nOwjOmcmbmEGOEDhIWtRz8+b10Yr2O6Tmfi5J7TBvFpQ4yPDPc6OJvCwxy72Q7dPOKie fjC2ZXZRhf87jYZ6DnvTE5+7e5t1HSROkW/jBqGyKQt5abXB0z0UPb/7aBQ3qp4SV6Zf ECVSIJex6WwxBIYT3IgA9FNNd1R+P4Nv5VCWp9vJbVAN3lJdRMMLtTe+9yRcCEPL175N AYrQ== X-Gm-Message-State: AO0yUKXGVPxz80D/FH/yv1ut0lQ2OJ+lqPC/kuYZRyJKAKDEtfi8hth6 xXNE5xpdBo77yGl1WCj8uNzb1cMmiRfOQhVP X-Google-Smtp-Source: AK7set/1dRdAPSfHG+ldHsgFOg6TO/tX79indbVy6ARyWomSbGZ6jMkQvFBybrLE1wrczTzXoGY1aA== X-Received: by 2002:a05:6000:1005:b0:2bf:b35d:2797 with SMTP id a5-20020a056000100500b002bfb35d2797mr9074032wrx.11.1675441829644; Fri, 03 Feb 2023 08:30:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , "Michael S. Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Subject: [PATCH 1/3] hw/acpi/cpu_hotplug: Rename gpe_cpu -> gpe Date: Fri, 3 Feb 2023 17:30:19 +0100 Message-Id: <20230203163021.35754-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230203163021.35754-1-philmd@linaro.org> References: <20230203163021.35754-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1675441926763100001 Rename 'g' and 'gpe_cpu' variables as 'gpe' to simplify. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/acpi-cpu-hotplug-stub.c | 6 ++--- hw/acpi/cpu_hotplug.c | 40 ++++++++++++++++----------------- hw/acpi/ich9.c | 8 +++---- hw/acpi/piix4.c | 6 ++--- include/hw/acpi/cpu_hotplug.h | 8 +++---- include/hw/acpi/ich9.h | 2 +- include/hw/acpi/piix4.h | 2 +- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stu= b.c index 3fc4b14c26..b590ad57e1 100644 --- a/hw/acpi/acpi-cpu-hotplug-stub.c +++ b/hw/acpi/acpi-cpu-hotplug-stub.c @@ -6,7 +6,7 @@ /* Following stubs are all related to ACPI cpu hotplug */ const VMStateDescription vmstate_cpu_hotplug; =20 -void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, +void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, CPUHotplugState *cpuhp_state, uint16_t io_port) { @@ -14,7 +14,7 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, } =20 void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, - AcpiCpuHotplug *gpe_cpu, uint16_t base) + AcpiCpuHotplug *gpe, uint16_t base) { return; } @@ -31,7 +31,7 @@ void acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, } =20 void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, - AcpiCpuHotplug *g, DeviceState *dev, Error **= errp) + AcpiCpuHotplug *gpe, DeviceState *dev, Error = **errp) { return; } diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index ff14c3f410..3cfa4f45dc 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -26,8 +26,8 @@ =20 static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int si= ze) { - AcpiCpuHotplug *cpus =3D opaque; - uint64_t val =3D cpus->sts[addr]; + AcpiCpuHotplug *gpe =3D opaque; + uint64_t val =3D gpe->sts[addr]; =20 return val; } @@ -40,8 +40,8 @@ static void cpu_status_write(void *opaque, hwaddr addr, u= int64_t data, mode by writing 0 at the beginning of legacy CPU bitmap */ if (addr =3D=3D 0 && data =3D=3D 0) { - AcpiCpuHotplug *cpus =3D opaque; - object_property_set_bool(cpus->device, "cpu-hotplug-legacy", false, + AcpiCpuHotplug *gpe =3D opaque; + object_property_set_bool(gpe->device, "cpu-hotplug-legacy", false, &error_abort); } } @@ -59,51 +59,51 @@ static const MemoryRegionOps AcpiCpuHotplug_ops =3D { }, }; =20 -static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu) +static void acpi_set_cpu_present_bit(AcpiCpuHotplug *gpe, CPUState *cpu) { CPUClass *k =3D CPU_GET_CLASS(cpu); int64_t cpu_id; =20 cpu_id =3D k->get_arch_id(cpu); if ((cpu_id / 8) >=3D ACPI_GPE_PROC_LEN) { - object_property_set_bool(g->device, "cpu-hotplug-legacy", false, + object_property_set_bool(gpe->device, "cpu-hotplug-legacy", false, &error_abort); return; } =20 - g->sts[cpu_id / 8] |=3D (1 << (cpu_id % 8)); + gpe->sts[cpu_id / 8] |=3D (1 << (cpu_id % 8)); } =20 -void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, - AcpiCpuHotplug *g, DeviceState *dev, Error **= errp) +void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *= gpe, + DeviceState *dev, Error **errp) { - acpi_set_cpu_present_bit(g, CPU(dev)); + acpi_set_cpu_present_bit(gpe, CPU(dev)); acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); } =20 void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, - AcpiCpuHotplug *gpe_cpu, uint16_t base) + AcpiCpuHotplug *gpe, uint16_t base) { CPUState *cpu; =20 - memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops, - gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN); - memory_region_add_subregion(parent, base, &gpe_cpu->io); - gpe_cpu->device =3D owner; + memory_region_init_io(&gpe->io, owner, &AcpiCpuHotplug_ops, + gpe, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN); + memory_region_add_subregion(parent, base, &gpe->io); + gpe->device =3D owner; =20 CPU_FOREACH(cpu) { - acpi_set_cpu_present_bit(gpe_cpu, cpu); + acpi_set_cpu_present_bit(gpe, cpu); } } =20 -void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, +void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, CPUHotplugState *cpuhp_state, uint16_t io_port) { - MemoryRegion *parent =3D pci_address_space_io(PCI_DEVICE(gpe_cpu->devi= ce)); + MemoryRegion *parent =3D pci_address_space_io(PCI_DEVICE(gpe->device)); =20 - memory_region_del_subregion(parent, &gpe_cpu->io); - cpu_hotplug_hw_init(parent, gpe_cpu->device, cpuhp_state, io_port); + memory_region_del_subregion(parent, &gpe->io); + cpu_hotplug_hw_init(parent, gpe->device, cpuhp_state, io_port); } =20 void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index a93c470e9d..4f8385b894 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -197,7 +197,7 @@ static bool vmstate_test_use_cpuhp(void *opaque) static int vmstate_cpuhp_pre_load(void *opaque) { ICH9LPCPMRegs *s =3D opaque; - Object *obj =3D OBJECT(s->gpe_cpu.device); + Object *obj =3D OBJECT(s->gpe.device); object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abor= t); return 0; } @@ -338,7 +338,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_register_powerdown_notifier(&pm->powerdown_notifier); =20 legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), - OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE); + OBJECT(lpc_pci), &pm->gpe, ICH9_CPU_HOTPLUG_IO_BASE); =20 if (pm->acpi_memory_hotplug.is_enabled) { acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc= _pci), @@ -385,7 +385,7 @@ static void ich9_pm_set_cpu_hotplug_legacy(Object *obj,= bool value, =20 assert(!value); if (s->pm.cpu_hotplug_legacy && value =3D=3D false) { - acpi_switch_to_modern_cphp(&s->pm.gpe_cpu, &s->pm.cpuhp_state, + acpi_switch_to_modern_cphp(&s->pm.gpe, &s->pm.cpuhp_state, ICH9_CPU_HOTPLUG_IO_BASE); } s->pm.cpu_hotplug_legacy =3D value; @@ -514,7 +514,7 @@ void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev= , DeviceState *dev, } } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { if (lpc->pm.cpu_hotplug_legacy) { - legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, er= rp); + legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe, dev, errp); } else { acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); } diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 724294b378..c702d83f27 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -353,7 +353,7 @@ static void piix4_device_plug_cb(HotplugHandler *hotplu= g_dev, acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, = errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { if (s->cpu_hotplug_legacy) { - legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp); + legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe, dev, errp); } else { acpi_cpu_plug_cb(hotplug_dev, &s->cpuhp_state, dev, errp); } @@ -549,7 +549,7 @@ static void piix4_set_cpu_hotplug_legacy(Object *obj, b= ool value, Error **errp) =20 assert(!value); if (s->cpu_hotplug_legacy && value =3D=3D false) { - acpi_switch_to_modern_cphp(&s->gpe_cpu, &s->cpuhp_state, + acpi_switch_to_modern_cphp(&s->gpe, &s->cpuhp_state, PIIX4_CPU_HOTPLUG_IO_BASE); } s->cpu_hotplug_legacy =3D value; @@ -571,7 +571,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion= *parent, object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", piix4_get_cpu_hotplug_legacy, piix4_set_cpu_hotplug_legacy); - legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu, + legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe, PIIX4_CPU_HOTPLUG_IO_BASE); =20 if (s->acpi_memory_hotplug.is_enabled) { diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 3b932abbbb..99c11b7151 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -25,13 +25,13 @@ typedef struct AcpiCpuHotplug { uint8_t sts[ACPI_GPE_PROC_LEN]; } AcpiCpuHotplug; =20 -void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, - AcpiCpuHotplug *g, DeviceState *dev, Error **= errp); +void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *= gpe, + DeviceState *dev, Error **errp); =20 void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, - AcpiCpuHotplug *gpe_cpu, uint16_t base); + AcpiCpuHotplug *gpe, uint16_t base); =20 -void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, +void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, CPUHotplugState *cpuhp_state, uint16_t io_port); =20 diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index d41866a229..3ec706c0d7 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -53,7 +53,7 @@ typedef struct ICH9LPCPMRegs { Notifier powerdown_notifier; =20 bool cpu_hotplug_legacy; - AcpiCpuHotplug gpe_cpu; + AcpiCpuHotplug gpe; CPUHotplugState cpuhp_state; =20 bool keep_pci_slot_hpc; diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h index be1f8ea80e..b88ef92455 100644 --- a/include/hw/acpi/piix4.h +++ b/include/hw/acpi/piix4.h @@ -66,7 +66,7 @@ struct PIIX4PMState { uint8_t s4_val; =20 bool cpu_hotplug_legacy; - AcpiCpuHotplug gpe_cpu; + AcpiCpuHotplug gpe; CPUHotplugState cpuhp_state; =20 MemHotplugState acpi_memory_hotplug; --=20 2.38.1 From nobody Fri Apr 26 07:53:06 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1675441916; cv=none; d=zohomail.com; s=zohoarc; b=IHeCtFPLaeeSfqtfINGVREqC26yZo5iKYUs3bTHJehzAp8Xt4tDpePcrjALUrI316mfdFSFb1c9DTwCbTZ4duWGHU84UVO6fiZ84sHPJ/pOYNuRjIAu1bmS+Yyi/Kj2H8oaSLnTfiD1U8LfMb8/fQm1a1mvTvHwu/+3S6XBfobE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675441916; h=Content-Type:Content-Transfer-Encoding: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=ptROtNuE3lb04ckVNKyGxQMWre2p5gfgVUcEG2lqtgQ=; b=kooVjgeblbGncx2TC65XcC4DGAnZIITUve27/kwDKGm3yoinhq8JpeP2CqGN1fqR0EJPBkpMkSabU5bDoP+VKL3czS0jNybl4t8QDc7FxdXfJibCFv9TePGPYfODMQhFmgatjVw8v40g2DN44AxF919zwJWITe+hS9+G1rWYOPM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675441916569302.3104246668846; Fri, 3 Feb 2023 08:31:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNyxY-0001NJ-Oa; Fri, 03 Feb 2023 11:30:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNyxW-0001ML-Bp for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:43 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNyxT-0007qE-Gx for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:42 -0500 Received: by mail-wm1-x333.google.com with SMTP id hn2-20020a05600ca38200b003dc5cb96d46so6375590wmb.4 for ; Fri, 03 Feb 2023 08:30:37 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id m2-20020a05600c4f4200b003dc522dd25esm3439513wmq.30.2023.02.03.08.30.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Feb 2023 08:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ptROtNuE3lb04ckVNKyGxQMWre2p5gfgVUcEG2lqtgQ=; b=VK5KjYlqlL6hd+FMx2A9gdVLSVw6j7WZvvGBxsn8DC4nfXGmtwSTP0U3ZmDaQO3jto Fc3XfItGxhpeHP8DoX542kSKvjlM+IVHKxxmO1OjflEE7fyOZPprND+iTTCpBAIibu5H 1LAGcf7n0BOA7WTh0gwhvczN2/FojUs03AUxmMs+tC9ElshNCD8uNZLDTpqmuaODbnfY FyL0OLWymZW4GQt3Qxzivan3OzpAhb3eL3u5a/7idA36vPPpCReC7lb1SWviIu3wVaIG SXzTLOARooNykVPXkXC0ypEHLk72/F753f9h0dAjaCWysS80HFSknlSlQ6qX1NCR8AeP wR2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ptROtNuE3lb04ckVNKyGxQMWre2p5gfgVUcEG2lqtgQ=; b=JhWMH9Zpuhd8YIN2jmp5DbInK1ZGdlgySPl7zROaihLWGncR6x8Q/7CZMS6LiEQMUl m+fUbkD8hXK/Ty8gW3bnw8Aukpt26sbv77Tnsy/z0pabDRuCMJ1eyiKUWXPMWHA/+05r S59eRctnIV2CNvmTTBYPXY3KrXO6nTGg9U4YRSEwZDIOblnO3aGT2xiO9zt6/BMjlhCi 73OIizKHEZj0fAMOP5MwXPey4wQurUkiqWljSGj2FJmpha1P0fvvxxYySia/4Gmbw10c /hh0il62EaYWDIJFFnsIo9FIZNZ8w2S/kSL2haZOq3RxNERLqhgA0/5s7sYaK9ULS0av jQpg== X-Gm-Message-State: AO0yUKWbxmLG0ylJ36LvEvN/P8+gZcTB2x/O+eCQGhYA0s9YziMnRM5C 2I3NSITT5DWXC/+H8RMbIxqqo+q/5qMm1IgZ X-Google-Smtp-Source: AK7set9fcZ1JEpakNePHMV908vh2DVSb2pYsYjcSnsVpW/Z/CfWo+x16ty3EKMrMUdLuesdz9svqEQ== X-Received: by 2002:a05:600c:601b:b0:3dc:557f:6129 with SMTP id az27-20020a05600c601b00b003dc557f6129mr9946409wmb.2.1675441835935; Fri, 03 Feb 2023 08:30:35 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , "Michael S. Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Subject: [PATCH 2/3] hw/acpi/cpu_hotplug: Rename 'parent' MemoryRegion as 'container' Date: Fri, 3 Feb 2023 17:30:20 +0100 Message-Id: <20230203163021.35754-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230203163021.35754-1-philmd@linaro.org> References: <20230203163021.35754-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1675441918684100002 No logical change, rename for clarity. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/acpi-cpu-hotplug-stub.c | 2 +- hw/acpi/cpu_hotplug.c | 10 +++++----- hw/acpi/piix4.c | 10 +++++----- include/hw/acpi/cpu_hotplug.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stu= b.c index b590ad57e1..cbd7a6ec00 100644 --- a/hw/acpi/acpi-cpu-hotplug-stub.c +++ b/hw/acpi/acpi-cpu-hotplug-stub.c @@ -13,7 +13,7 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, return; } =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, AcpiCpuHotplug *gpe, uint16_t base) { return; diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 3cfa4f45dc..636e985c50 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -81,14 +81,14 @@ void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_de= v, AcpiCpuHotplug *gpe, acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); } =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, AcpiCpuHotplug *gpe, uint16_t base) { CPUState *cpu; =20 memory_region_init_io(&gpe->io, owner, &AcpiCpuHotplug_ops, gpe, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN); - memory_region_add_subregion(parent, base, &gpe->io); + memory_region_add_subregion(container, base, &gpe->io); gpe->device =3D owner; =20 CPU_FOREACH(cpu) { @@ -100,10 +100,10 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, CPUHotplugState *cpuhp_state, uint16_t io_port) { - MemoryRegion *parent =3D pci_address_space_io(PCI_DEVICE(gpe->device)); + MemoryRegion *container =3D pci_address_space_io(PCI_DEVICE(gpe->devic= e)); =20 - memory_region_del_subregion(parent, &gpe->io); - cpu_hotplug_hw_init(parent, gpe->device, cpuhp_state, io_port); + memory_region_del_subregion(container, &gpe->io); + cpu_hotplug_hw_init(container, gpe->device, cpuhp_state, io_port); } =20 void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c702d83f27..5595fe5be5 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -555,15 +555,15 @@ static void piix4_set_cpu_hotplug_legacy(Object *obj,= bool value, Error **errp) s->cpu_hotplug_legacy =3D value; } =20 -static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, +static void piix4_acpi_system_hot_add_init(MemoryRegion *container, PCIBus *bus, PIIX4PMState *s) { memory_region_init_io(&s->io_gpe, OBJECT(s), &piix4_gpe_ops, s, "acpi-gpe0", GPE_LEN); - memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); + memory_region_add_subregion(container, GPE_BASE, &s->io_gpe); =20 if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, container, s->use_acpi_hotplug_bridge, ACPI_PCIHP_ADDR_PIIX4); } =20 @@ -571,11 +571,11 @@ static void piix4_acpi_system_hot_add_init(MemoryRegi= on *parent, object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", piix4_get_cpu_hotplug_legacy, piix4_set_cpu_hotplug_legacy); - legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe, + legacy_acpi_cpu_hotplug_init(container, OBJECT(s), &s->gpe, PIIX4_CPU_HOTPLUG_IO_BASE); =20 if (s->acpi_memory_hotplug.is_enabled) { - acpi_memory_hotplug_init(parent, OBJECT(s), &s->acpi_memory_hotplu= g, + acpi_memory_hotplug_init(container, OBJECT(s), &s->acpi_memory_hot= plug, ACPI_MEMORY_HOTPLUG_BASE); } } diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 99c11b7151..5ff24ec417 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -28,7 +28,7 @@ typedef struct AcpiCpuHotplug { void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *= gpe, DeviceState *dev, Error **errp); =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, AcpiCpuHotplug *gpe, uint16_t base); =20 void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, --=20 2.38.1 From nobody Fri Apr 26 07:53:06 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1675441866; cv=none; d=zohomail.com; s=zohoarc; b=G5BWreNFNaf8A3udkvM7AzWN3+LTqbDd6NZ8n8aGZ83KYtE79h1S2aLJZwt6Iza77jJrPM1lTwNUNt4O/lH2jNA1VJixQPVRIZ5l/cpz+J5It03NJ12BLB8kBoPUSg5QUR3S3uXTKa78I63YAZilBq1dmF7XPJq4/p8LTgA1qaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675441866; h=Content-Type:Content-Transfer-Encoding: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=1wBCF9bWIkPB8j4jWU6kzH466hslSu/AUgLyaE+mSGQ=; b=kC8+M2uDumI85nOzAhDnD8/hyOPyj6Z0qbjQWbYigE01ZQFuQGaiEN44qldzUfo4Ebh+aTq9E6yZ4zix5b0USs4ZuhA4ffdUh4x311aEKhzSlP0kkgNdHXDRDwKL8Dw0yOIOYyo8PXMVTXFI5ZeCgCYSjRFoQrukz52Kbpnvu4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675441866885857.4965954309499; Fri, 3 Feb 2023 08:31:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNyxh-0001O7-NK; Fri, 03 Feb 2023 11:30:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNyxa-0001Ns-S1 for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:47 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNyxY-0007rb-Gw for qemu-devel@nongnu.org; Fri, 03 Feb 2023 11:30:46 -0500 Received: by mail-wm1-x334.google.com with SMTP id m5-20020a05600c4f4500b003db03b2559eso4269102wmq.5 for ; Fri, 03 Feb 2023 08:30:44 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k19-20020a05600c1c9300b003dc43a10fa5sm3469387wms.13.2023.02.03.08.30.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Feb 2023 08:30:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1wBCF9bWIkPB8j4jWU6kzH466hslSu/AUgLyaE+mSGQ=; b=QN9H+AW+vRzJxaF7JIpaCv1AhDLbjcDzscI6nE9ha05QCfQg94A+uqgSxnvzqsWcCj LYcauZVv4GYuLpCVQU1tonk1xE4zMh+OG2sp6nCvFscWOF92BxXWfZUaMLdc2PDApHq3 llJT3bGwyChXsyXkYVbA4BQWHg1NsHPo6BqcEDcrcnsMYo22K9opQFiYYIzg0PBKmwe+ MYCNG0zm+AbBvddg6UvXSF7n2j/GtIQ069RDpx8OiW6Uoz5Wkn8gaJ06NkB965yxAuCi 56ZCMM1y7wIEsECst76zfbiz0sOU5PjgAtY6/G5yYxYJEwnMb4l+yasCidUHlAWDo96l gKmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1wBCF9bWIkPB8j4jWU6kzH466hslSu/AUgLyaE+mSGQ=; b=5gI3GAlxwuXTvXopqs0FV0LPvXFSchEDg2Y9qwR5QZa7m79n4QzBZ85kwkf7sQXg1J Yqk1L3PJMH7rhCzJkCD3wEnDTRgfJMHhu9J9DV0fxvlNWXn9STPapqQ7i/U1jzQ2EPEn BiMV3NBwv7Yc85taWe+ZiFhX1i+La2T6014iQUyfkAZYEXdlHyJjnihz5bCi0v85hAbU cBPJgKxfo8o0fzCCIs90vM6J+yCi5FSWHrl6zRTdqF/rrQuS3Aa2MsihgaQ6FxjDvs7Z 3YXpEfFOKnyZhrArxHyKhPwkZObLjlAENBP0YOeZrWexpBYMym2Qe6Xsz1MLH1gtLQih kt2w== X-Gm-Message-State: AO0yUKUtTCViinvwqmk3nS/J2cxi1tjDVMB/L56OU/MtyqmaSq9TCgYL 3BUp1p7rcFYXRbnad4SLEVUqrH44Fq12Pg0H X-Google-Smtp-Source: AK7set+I5yonGaxfAm+fi5x5Zdis1wrgCyP/GjknOWnJoNuCAufBM8uqnGSU35bpHcXJ6HdW7b68nw== X-Received: by 2002:a05:600c:1f0c:b0:3dd:97d6:8f2e with SMTP id bd12-20020a05600c1f0c00b003dd97d68f2emr10069500wmb.17.1675441842881; Fri, 03 Feb 2023 08:30:42 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , "Michael S. Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Subject: [PATCH 3/3] hw/acpi/cpu_hotplug: Convert 'Object *device' -> 'DeviceState *parent' Date: Fri, 3 Feb 2023 17:30:21 +0100 Message-Id: <20230203163021.35754-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230203163021.35754-1-philmd@linaro.org> References: <20230203163021.35754-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1675441868216100001 ACPI CPU hotplug parent can't be any QOM object, it must be a QDev. Convert AcpiCpuHotplug::device field as QDev to enforce this. Rename 'owner' and 'device' variables as 'parent'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/acpi-cpu-hotplug-stub.c | 2 +- hw/acpi/cpu_hotplug.c | 18 +++++++++--------- hw/acpi/ich9.c | 5 +++-- hw/acpi/piix4.c | 2 +- include/hw/acpi/cpu_hotplug.h | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stu= b.c index cbd7a6ec00..0fcc1ec8ea 100644 --- a/hw/acpi/acpi-cpu-hotplug-stub.c +++ b/hw/acpi/acpi-cpu-hotplug-stub.c @@ -13,7 +13,7 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, return; } =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, DeviceState *pa= rent, AcpiCpuHotplug *gpe, uint16_t base) { return; diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 636e985c50..b8c9081738 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -41,8 +41,8 @@ static void cpu_status_write(void *opaque, hwaddr addr, u= int64_t data, */ if (addr =3D=3D 0 && data =3D=3D 0) { AcpiCpuHotplug *gpe =3D opaque; - object_property_set_bool(gpe->device, "cpu-hotplug-legacy", false, - &error_abort); + object_property_set_bool(OBJECT(gpe->parent), "cpu-hotplug-legacy", + false, &error_abort); } } =20 @@ -66,8 +66,8 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *gpe,= CPUState *cpu) =20 cpu_id =3D k->get_arch_id(cpu); if ((cpu_id / 8) >=3D ACPI_GPE_PROC_LEN) { - object_property_set_bool(gpe->device, "cpu-hotplug-legacy", false, - &error_abort); + object_property_set_bool(OBJECT(gpe->parent), "cpu-hotplug-legacy", + false, &error_abort); return; } =20 @@ -81,15 +81,15 @@ void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_de= v, AcpiCpuHotplug *gpe, acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); } =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, DeviceState *pa= rent, AcpiCpuHotplug *gpe, uint16_t base) { CPUState *cpu; =20 - memory_region_init_io(&gpe->io, owner, &AcpiCpuHotplug_ops, + memory_region_init_io(&gpe->io, OBJECT(parent), &AcpiCpuHotplug_ops, gpe, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN); memory_region_add_subregion(container, base, &gpe->io); - gpe->device =3D owner; + gpe->parent =3D parent; =20 CPU_FOREACH(cpu) { acpi_set_cpu_present_bit(gpe, cpu); @@ -100,10 +100,10 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, CPUHotplugState *cpuhp_state, uint16_t io_port) { - MemoryRegion *container =3D pci_address_space_io(PCI_DEVICE(gpe->devic= e)); + MemoryRegion *container =3D pci_address_space_io(PCI_DEVICE(gpe->paren= t)); =20 memory_region_del_subregion(container, &gpe->io); - cpu_hotplug_hw_init(container, gpe->device, cpuhp_state, io_port); + cpu_hotplug_hw_init(container, OBJECT(gpe->parent), cpuhp_state, io_po= rt); } =20 void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4f8385b894..6c9a737479 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -197,7 +197,7 @@ static bool vmstate_test_use_cpuhp(void *opaque) static int vmstate_cpuhp_pre_load(void *opaque) { ICH9LPCPMRegs *s =3D opaque; - Object *obj =3D OBJECT(s->gpe.device); + Object *obj =3D OBJECT(s->gpe.parent); object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abor= t); return 0; } @@ -338,7 +338,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_register_powerdown_notifier(&pm->powerdown_notifier); =20 legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), - OBJECT(lpc_pci), &pm->gpe, ICH9_CPU_HOTPLUG_IO_BASE); + DEVICE(lpc_pci), &pm->gpe, + ICH9_CPU_HOTPLUG_IO_BASE); =20 if (pm->acpi_memory_hotplug.is_enabled) { acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc= _pci), diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5595fe5be5..3a61d89f92 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -571,7 +571,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion= *container, object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", piix4_get_cpu_hotplug_legacy, piix4_set_cpu_hotplug_legacy); - legacy_acpi_cpu_hotplug_init(container, OBJECT(s), &s->gpe, + legacy_acpi_cpu_hotplug_init(container, DEVICE(s), &s->gpe, PIIX4_CPU_HOTPLUG_IO_BASE); =20 if (s->acpi_memory_hotplug.is_enabled) { diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 5ff24ec417..b2f990f0b8 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -20,7 +20,7 @@ #include "hw/acpi/cpu.h" =20 typedef struct AcpiCpuHotplug { - Object *device; + DeviceState *parent; MemoryRegion io; uint8_t sts[ACPI_GPE_PROC_LEN]; } AcpiCpuHotplug; @@ -28,7 +28,7 @@ typedef struct AcpiCpuHotplug { void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *= gpe, DeviceState *dev, Error **errp); =20 -void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, Object *owner, +void legacy_acpi_cpu_hotplug_init(MemoryRegion *container, DeviceState *pa= rent, AcpiCpuHotplug *gpe, uint16_t base); =20 void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe, --=20 2.38.1