From nobody Wed May 1 12:48:19 2024 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=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1660643623; cv=none; d=zohomail.com; s=zohoarc; b=mHxmwJ2iRP4/Vp4rWRq1NNVfaCqLt7qMa6p8jIR01vMD6lBywNMHwrfBvxwkmhvFaP+secVTNXoPMub09iG1HpArFlGFzdSGV5v3Uq6vFn9ui9UlMnaAahxKUhwT+XRprVkqmh6ARIgNGUXqxce7+0+T5BNId9LLYT8P0bjBmvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660643623; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=8VBu0JktVgSLQ8BBldfsJpmmi4HJF/zbQDAkLyo/fRE=; b=m41NcDeA/SAEhvLA1nbOrCNvnssCjARDX06Nf84y44wG5336oqtrfESZMG6OOOzQfyZm8FCAK0q4oYCEYGiYARBTt8S8iMU7gBm3I3KfM/XvvKlUoTgMJRAxYehH8wy1MPBNXF7/dsgdU9UR/oOB47IpcQjU32xJSqBQHYu7jCQ= 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=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 1660643623347338.47863494974933; Tue, 16 Aug 2022 02:53:43 -0700 (PDT) Received: from localhost ([::1]:42608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNtGX-000765-A2 for importer@patchew.org; Tue, 16 Aug 2022 05:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNtDH-0004CP-Mn; Tue, 16 Aug 2022 05:50:19 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNtD6-0007fA-Ub; Tue, 16 Aug 2022 05:50:19 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4M6RCV4HYxzhYQn; Tue, 16 Aug 2022 17:47:50 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 16 Aug 2022 17:50:01 +0800 Received: from DESKTOP-5IS4806.china.huawei.com (10.174.187.224) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 16 Aug 2022 17:50:00 +0800 To: , , CC: Peter Maydell , Eric Auger , Peter Xu , Igor Mammedov , Subject: [PATCH v2] hw/acpi: Add ospm_status hook implementation for acpi-ged Date: Tue, 16 Aug 2022 17:49:57 +0800 Message-ID: <20220816094957.31700-1-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.187.224] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected 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=45.249.212.187; envelope-from=zhukeqian1@huawei.com; helo=szxga01-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Keqian Zhu From: Keqian Zhu via X-ZM-MESSAGEID: 1660643623641100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Setup an ARM virtual machine of machine virt and execute qmp "query-acpi-os= pm-status" causes segmentation fault with following dumpstack: #1 0x0000aaaaab64235c in qmp_query_acpi_ospm_status (errp=3Derrp@entry=3D= 0xfffffffff030) at ../monitor/qmp-cmds.c:312 #2 0x0000aaaaabfc4e20 in qmp_marshal_query_acpi_ospm_status (args=3D, ret=3D0xffffea4ffe90, errp=3D0xffffea4ffe88) at qapi/qapi-comma= nds-acpi.c:63 #3 0x0000aaaaabff8ba0 in do_qmp_dispatch_bh (opaque=3D0xffffea4ffe98) at = ../qapi/qmp-dispatch.c:128 #4 0x0000aaaaac02e594 in aio_bh_call (bh=3D0xffffe0004d80) at ../util/asy= nc.c:150 #5 aio_bh_poll (ctx=3Dctx@entry=3D0xaaaaad0f6040) at ../util/async.c:178 #6 0x0000aaaaac00bd40 in aio_dispatch (ctx=3Dctx@entry=3D0xaaaaad0f6040) = at ../util/aio-posix.c:421 #7 0x0000aaaaac02e010 in aio_ctx_dispatch (source=3D0xaaaaad0f6040, callb= ack=3D, user_data=3D) at ../util/async.c:320 #8 0x0000fffff76f6884 in g_main_context_dispatch () at /usr/lib64/libglib= -2.0.so.0 #9 0x0000aaaaac0452d4 in glib_pollfds_poll () at ../util/main-loop.c:297 #10 os_host_main_loop_wait (timeout=3D0) at ../util/main-loop.c:320 #11 main_loop_wait (nonblocking=3Dnonblocking@entry=3D0) at ../util/main-l= oop.c:596 #12 0x0000aaaaab5c9e50 in qemu_main_loop () at ../softmmu/runstate.c:734 #13 0x0000aaaaab185370 in qemu_main (argc=3Dargc@entry=3D47, argv=3Dargv@e= ntry=3D0xfffffffff518, envp=3Denvp@entry=3D0x0) at ../softmmu/main.c:38 #14 0x0000aaaaab16f99c in main (argc=3D47, argv=3D0xfffffffff518) at ../so= ftmmu/main.c:47 Fixes: ebb62075021a ("hw/acpi: Add ACPI Generic Event Device Support") Signed-off-by: Keqian Zhu Reviewed-by: Igor Mammedov --- hw/acpi/generic_event_device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index e28457a7d1..a3d31631fe 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -267,6 +267,13 @@ static void acpi_ged_unplug_cb(HotplugHandler *hotplug= _dev, } } =20 +static void acpi_ged_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***li= st) +{ + AcpiGedState *s =3D ACPI_GED(adev); + + acpi_memory_ospm_status(&s->memhp_state, list); +} + static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) { AcpiGedState *s =3D ACPI_GED(adev); @@ -409,6 +416,7 @@ static void acpi_ged_class_init(ObjectClass *class, voi= d *data) hc->unplug_request =3D acpi_ged_unplug_request_cb; hc->unplug =3D acpi_ged_unplug_cb; =20 + adevc->ospm_status =3D acpi_ged_ospm_status; adevc->send_event =3D acpi_ged_send_event; } =20 --=20 2.33.0