From nobody Fri May 17 02:41:19 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625618141019529.78503954476; Tue, 6 Jul 2021 17:35:41 -0700 (PDT) Received: from localhost ([::1]:60844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0vXP-0006XU-Pm for importer@patchew.org; Tue, 06 Jul 2021 20:35:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0vVU-0004mx-KB; Tue, 06 Jul 2021 20:33:40 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:35720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0vVS-0001PF-P6; Tue, 06 Jul 2021 20:33:40 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d12so630151pfj.2; Tue, 06 Jul 2021 17:33:36 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:7611:b123:7cbc:3065:30b1]) by smtp.gmail.com with ESMTPSA id co12sm4004871pjb.33.2021.07.06.17.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 17:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nTJFZwW5vyFCs62BJSu4TQwetq1pKuyftiRFQ5EI70o=; b=LY1nc7baCcE6K6UWwfqkaacD83dUctYvIB1ezfD8zY7E3YR7qNlAUOX4kda1fsKYXA eY9A2F9+iJ5/Ozm+5d1uzaLb9dTgpcwzmh9awAOfU9vtqHPGWFZPbfd7AHtlVwiTUgM+ xho61awwtJsZShDxaj3ya0fg+nl5RpJDELubti6yRi+6R+5lDY8vjdxw1cu0xlF9sbRY lw6M9LDWWbIdr8VWzU+k+JlnHuP9VYWKcQMSNbPemucsrunhAYHOUmxIA4JjBllTCmGX /dYiFpFA9j8PwugM84su+gOPoSD56tujk852EU700ht+FYfI0KDJyT4Was2ydVYKKA9d lA8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nTJFZwW5vyFCs62BJSu4TQwetq1pKuyftiRFQ5EI70o=; b=aaYtWd+jyjiklECaGzq1vecetu15p3R5Uer4+kGtRods4ktEJbn9TVz5V0C8PKOTuf j/ulu62Q3LP3C56R1vTRqBzq+Sj8D2/iyOTpcSZjeMW/Ebtc7OtmGyT2MMQIVGPkOo0/ X+J8wtNwa9+QqitKqCMg/+Bi4a8H/DApV/9xdWtQRQ0JRixqDj6RM6T6SyqwSusB/8N1 4e7OYY2A/j4gVD2q1W0C7+IR6+grA0hw+VP/Gqqqo9E9vkjWwWYCSCgXtOa2rQdXf2Rr pv6G8jUn3mtzumPCRjEJb1NUPqNBXUcJ2ajRHfK2rBrnoVST24TA0R3PY4h+Uc1BEjwR cNLw== X-Gm-Message-State: AOAM530JRsNl+LUi3hRwqrbusgmz3OLj6qyFIK8/TWm6hWRn4I6g9YTG U7x6zsEJC62cf9IeIpJ7AsEkYYw29f4JWw== X-Google-Smtp-Source: ABdhPJxhnvd7lg/jQcQ6Wo6Tau5kyyMzyJGRB67d1Jl4jtOetSG1GzT6sv5B0TOhPvQwn/U0JK2VIA== X-Received: by 2002:a62:1447:0:b029:31d:15fa:a309 with SMTP id 68-20020a6214470000b029031d15faa309mr15865680pfu.71.1625618015483; Tue, 06 Jul 2021 17:33:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v4 1/3] qapi/qdev.json: add DEVICE_UNPLUG_ERROR QAPI event Date: Tue, 6 Jul 2021 21:33:12 -0300 Message-Id: <20210707003314.37110-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707003314.37110-1-danielhb413@gmail.com> References: <20210707003314.37110-1-danielhb413@gmail.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=danielhb413@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , armbru@redhat.com, groug@kaod.org, qemu-ppc@nongnu.org, eblake@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625618142909100001 Content-Type: text/plain; charset="utf-8" At this moment we only provide one event to report a hotunplug error, MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries machine is now able to report unplug errors for other device types, such as CPUs. Instead of creating a (device_type)_UNPLUG_ERROR for each new device, create a generic DEVICE_UNPLUG_ERROR event that can be used by all unplug errors in the future. With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. Reviewed-by: David Gibson Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz --- docs/system/deprecated.rst | 10 ++++++++++ qapi/machine.json | 6 +++++- qapi/qdev.json | 27 ++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 70e08baff6..ca6c7f9d43 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -204,6 +204,16 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, wh= ich is deprecated (the ISA has never been upstreamed to a compiler toolchain). Therefore this CPU is also deprecated. =20 + +QEMU API (QAPI) events +---------------------- + +``MEM_UNPLUG_ERROR`` (since 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use the more generic event ``DEVICE_UNPLUG_ERROR`` instead. + + System emulator machines ------------------------ =20 diff --git a/qapi/machine.json b/qapi/machine.json index c3210ee1fb..a595c753d2 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1271,6 +1271,9 @@ # # @msg: Informative message # +# Features: +# @deprecated: This event is deprecated. Use @DEVICE_UNPLUG_ERROR instead. +# # Since: 2.4 # # Example: @@ -1283,7 +1286,8 @@ # ## { 'event': 'MEM_UNPLUG_ERROR', - 'data': { 'device': 'str', 'msg': 'str' } } + 'data': { 'device': 'str', 'msg': 'str' }, + 'features': ['deprecated'] } =20 ## # @SMPConfiguration: diff --git a/qapi/qdev.json b/qapi/qdev.json index b83178220b..349d7439fa 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -84,7 +84,9 @@ # This command merely requests that the guest begin the hot removal # process. Completion of the device removal process is signaled wi= th a # DEVICE_DELETED event. Guest reset will automatically complete rem= oval -# for all devices. +# for all devices. If an error in the hot removal process is detect= ed, +# the device will not be removed and a DEVICE_UNPLUG_ERROR event is +# sent. # # Since: 0.14 # @@ -124,3 +126,26 @@ ## { 'event': 'DEVICE_DELETED', 'data': { '*device': 'str', 'path': 'str' } } + +## +# @DEVICE_UNPLUG_ERROR: +# +# Emitted when a device hot unplug error occurs. +# +# @device: device name +# +# @msg: Informative message +# +# Since: 6.1 +# +# Example: +# +# <- { "event": "DEVICE_UNPLUG_ERROR" +# "data": { "device": "dimm1", +# "msg": "Memory hotunplug rejected by the guest for device= dimm1" +# }, +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } +# +## +{ 'event': 'DEVICE_UNPLUG_ERROR', + 'data': { 'device': 'str', 'msg': 'str' } } --=20 2.31.1 From nobody Fri May 17 02:41:19 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625618285028569.6468433720028; Tue, 6 Jul 2021 17:38:05 -0700 (PDT) Received: from localhost ([::1]:38358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0vZk-0001rM-2u for importer@patchew.org; Tue, 06 Jul 2021 20:38:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0vVW-0004nt-7p; Tue, 06 Jul 2021 20:33:42 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:37452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0vVT-0001PS-Ts; Tue, 06 Jul 2021 20:33:42 -0400 Received: by mail-pf1-x42d.google.com with SMTP id 17so623343pfz.4; Tue, 06 Jul 2021 17:33:39 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:7611:b123:7cbc:3065:30b1]) by smtp.gmail.com with ESMTPSA id co12sm4004871pjb.33.2021.07.06.17.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 17:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R4QKEhIXYz4bPh2oxMeDqNLW7Ym0Fnk9LSFZ9G/1Tbc=; b=juTuJniVdj+qfyLWq2mBHWTi5iklikIA8b8utwauAUT5ujnHb0VXdDf2rGPBUEDkXX ZX2ERdu817wn3DiEL5Kv1Oa4DQ4/tPli3nV6P1zjYdD4KhN2GkC5WzozhvaGTc8heW67 vVFdGLJ8bnv2gCS6tBQtAyhoyJG2fRE11RW8NYiAmDhEv06m/iayYMTGokWYtOaJDqHz m3k7ClYV59/N23t6axh74KiE5/DTc22VWwXx3piWoKegy39PCpfgXJygLVrGP5B/rlik m5YfXwr40CzdIF4P2GugJOOOaatWgvVSxurklp4afRrqKIOo5XFl8eAwrNuYzdUcMwyd oqBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R4QKEhIXYz4bPh2oxMeDqNLW7Ym0Fnk9LSFZ9G/1Tbc=; b=DbmrOzFMds0OGvv7X1qw/BUmQzpY0Do6xyy7mvFrUEHA1HdaY8c2FrY4N5dkXCS1gh t1A9ey0FyiWXLhZhsXnN4hmBzXXhI0J+XL3No7iRXQP7Mu+bRbH+TJXurst7+XLzq/LF IPEw7usWGzI3TKiPslHsIRZEr4qqpzCKdWeGmpG7UkzCvNvqn8h7mR7V1lBOJeylX9/c qglH0HL2nXl8nNbH1ejlXgFkPhn0dhBV6AAd9PVXsvjy7JRe4K+wKi+28BJAY67G8W7r MzxhvrpsTQ7wNaDFMFyIguTIjkNydno4qG1IVK43zt9JEbakoSHemH4EE8DJM913i09W 8ftQ== X-Gm-Message-State: AOAM531zoRBYxXQ2X74KsJH7NM74YFjDf0X5LN4KWPEe1y/fgP/dzDgm 1+CWphRaCC0H1aWePPxmKei7fbg7jgQOcw== X-Google-Smtp-Source: ABdhPJwjgIXae/saa9m81FWcim3E5tKS/u2qqo8vWQGt9dq5KMXumQt0OqgWdQ14Gtb+YreL3yUr8A== X-Received: by 2002:a63:d014:: with SMTP id z20mr23346943pgf.203.1625618018268; Tue, 06 Jul 2021 17:33:38 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v4 2/3] spapr: use DEVICE_UNPLUG_ERROR to report unplug errors Date: Tue, 6 Jul 2021 21:33:13 -0300 Message-Id: <20210707003314.37110-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707003314.37110-1-danielhb413@gmail.com> References: <20210707003314.37110-1-danielhb413@gmail.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=danielhb413@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , armbru@redhat.com, groug@kaod.org, qemu-ppc@nongnu.org, eblake@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625618286850100001 Content-Type: text/plain; charset="utf-8" Linux Kernel 5.12 is now unisolating CPU DRCs in the device_removal error path, signalling that the hotunplug process wasn't successful. This allow us to send a DEVICE_UNPLUG_ERROR in drc_unisolate_logical() to signal this error to the management layer. We also have another error path in spapr_memory_unplug_rollback() for configured LMB DRCs. Kernels older than 5.13 will not unisolate the LMBs in the hotunplug error path, but it will reconfigure them. Let's send the DEVICE_UNPLUG_ERROR event in that code path as well to cover the case of older kernels. Reviewed-by: David Gibson Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 8 ++++++++ hw/ppc/spapr_drc.c | 15 +++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4dd90b75cc..fc071a1767 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -29,6 +29,7 @@ #include "qemu/datadir.h" #include "qapi/error.h" #include "qapi/qapi-events-machine.h" +#include "qapi/qapi-events-qdev.h" #include "qapi/visitor.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" @@ -3641,7 +3642,14 @@ void spapr_memory_unplug_rollback(SpaprMachineState = *spapr, DeviceState *dev) */ qapi_error =3D g_strdup_printf("Memory hotunplug rejected by the guest= " "for device %s", dev->id); + + /* + * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_ERROR + * while the deprecation of MEM_UNPLUG_ERROR is + * pending. + */ qapi_event_send_mem_unplug_error(dev->id, qapi_error); + qapi_event_send_device_unplug_error(dev->id, qapi_error); } =20 /* Callback to be called during DRC release. */ diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index a2f2634601..45a7b1aa16 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -17,6 +17,8 @@ #include "hw/ppc/spapr_drc.h" #include "qom/object.h" #include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/qapi-events-qdev.h" #include "qapi/visitor.h" #include "qemu/error-report.h" #include "hw/ppc/spapr.h" /* for RTAS return codes */ @@ -160,6 +162,10 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) * means that the kernel is refusing the removal. */ if (drc->unplug_requested && drc->dev) { + const char qapi_error_fmt[] =3D "Device hotunplug rejected by = the " + "guest for device %s"; + g_autofree char *qapi_error =3D NULL; + if (spapr_drc_type(drc) =3D=3D SPAPR_DR_CONNECTOR_TYPE_LMB) { spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 @@ -167,13 +173,10 @@ static uint32_t drc_unisolate_logical(SpaprDrc *drc) } =20 drc->unplug_requested =3D false; - error_report("Device hotunplug rejected by the guest " - "for device %s", drc->dev->id); + error_report(qapi_error_fmt, drc->dev->id); =20 - /* - * TODO: send a QAPI DEVICE_UNPLUG_ERROR event when - * it is implemented. - */ + qapi_error =3D g_strdup_printf(qapi_error_fmt, drc->dev->id); + qapi_event_send_device_unplug_error(drc->dev->id, qapi_error); } =20 return RTAS_OUT_SUCCESS; /* Nothing to do */ --=20 2.31.1 From nobody Fri May 17 02:41:20 2024 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625618372380110.87294106296577; Tue, 6 Jul 2021 17:39:32 -0700 (PDT) Received: from localhost ([::1]:40528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0vb9-0003I0-5t for importer@patchew.org; Tue, 06 Jul 2021 20:39:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0vVZ-0004rr-PN; Tue, 06 Jul 2021 20:33:49 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:34417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0vVX-0001QZ-Ds; Tue, 06 Jul 2021 20:33:45 -0400 Received: by mail-pj1-x102c.google.com with SMTP id g6-20020a17090adac6b029015d1a9a6f1aso2516179pjx.1; Tue, 06 Jul 2021 17:33:42 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:7611:b123:7cbc:3065:30b1]) by smtp.gmail.com with ESMTPSA id co12sm4004871pjb.33.2021.07.06.17.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 17:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1QTX+UnLiIoOH0MxdsoyMTOCoon+Kk8iQXgj5XX0WP8=; b=NpoK06rJrNpaj04ghKrb9gAmDiGdoCFm73jiGaQ+jyho8TGOsITaM44mHh0B4HW3CV qY4uIHUcdG2cOHriC5ZtzaoXE+9U58Z731NnnMdRpejQcDgxcn5ddpvNksfdOFF8b8Wy UhZWEBbtadhb1mB31iLfr3tu21mTWyvGwjYKCewNUrNIF4A3GVX9R4Fq6qJWqYo+SUt0 kef/bzBiCFPOnv9wTF49v06JIxCBc9ctS07pTd/a/cflMdCJcAfcXjtobkuLkUNaiJfC pT1adzHJDi2hyOz4C5WzUgr2uYmIF95ZBQ2naEdtpbuFZ7DD+ff/70s4IIDzUeXwgwhI pZhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1QTX+UnLiIoOH0MxdsoyMTOCoon+Kk8iQXgj5XX0WP8=; b=PBGh1p+LGfBN8cPIl5mCaNQA3ux/hjYe3z7IQMrd8qdocGjefZWw0bFmnZI5edYOe5 C8sjuK0YcGlVGVuo54d2KJjz/bTUJ9MezkbUrM/Uez5j03jdEUCuHI371sVSwRTo2XVZ 3qbO9WGIjtJo4HqN27VVhO6AdECsb8IZRPP8yBSWX5jjIcyjyu6z1DgL7IdAqT4aytmP ogrQmxk/COpfvIq0hHjqwkmFeSSTqzVtNZfL3Nvic+xJ3OjX+QBkumcqeSfcJHmJwBtK BZYZGW1sYrOYK6mzSa1MopLK/pYk0uKIk/mak7GGVnZKBEyxc+KJ+KsQdAf/151dpKqb ZsrA== X-Gm-Message-State: AOAM530cQEH+Sl1H7Qz94RviWEh7ccLadJHdcmoSvUXV40xpHt4YFy3d qqemQL+UTvPXxGlG7ELKIcydA6hwbTn2vg== X-Google-Smtp-Source: ABdhPJz8o1LLY14dN/caHAP+wI8/rWnH+eAso8H7xWWdwypbE8j09jVXP47L2ZQvJXxl2RRdU5Ov0Q== X-Received: by 2002:a17:90a:e649:: with SMTP id ep9mr3019612pjb.9.1625618021644; Tue, 06 Jul 2021 17:33:41 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v4 3/3] memory_hotplug.c: send DEVICE_UNPLUG_ERROR in acpi_memory_hotplug_write() Date: Tue, 6 Jul 2021 21:33:14 -0300 Message-Id: <20210707003314.37110-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707003314.37110-1-danielhb413@gmail.com> References: <20210707003314.37110-1-danielhb413@gmail.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=danielhb413@gmail.com; helo=mail-pj1-x102c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S . Tsirkin" , Daniel Henrique Barboza , armbru@redhat.com, groug@kaod.org, qemu-ppc@nongnu.org, Igor Mammedov , eblake@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625618372590100001 Content-Type: text/plain; charset="utf-8" MEM_UNPLUG_ERROR is deprecated since the introduction of DEVICE_UNPLUG_ERROR. Keep emitting both while the deprecation of MEM_UNPLUG_ERROR is pending. CC: Michael S. Tsirkin CC: Igor Mammedov Reviewed-by: David Gibson Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz --- hw/acpi/memory_hotplug.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index af37889423..fb9f4d2de7 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -8,6 +8,7 @@ #include "qapi/error.h" #include "qapi/qapi-events-acpi.h" #include "qapi/qapi-events-machine.h" +#include "qapi/qapi-events-qdev.h" =20 #define MEMORY_SLOTS_NUMBER "MDNR" #define MEMORY_HOTPLUG_IO_REGION "HPMR" @@ -177,9 +178,17 @@ static void acpi_memory_hotplug_write(void *opaque, hw= addr addr, uint64_t data, /* call pc-dimm unplug cb */ hotplug_handler_unplug(hotplug_ctrl, dev, &local_err); if (local_err) { + const char *error_pretty =3D error_get_pretty(local_err); + trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector); - qapi_event_send_mem_unplug_error(dev->id, - error_get_pretty(local_er= r)); + + /* + * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_ERROR + * while the deprecation of MEM_UNPLUG_ERROR is + * pending. + */ + qapi_event_send_mem_unplug_error(dev->id, error_pretty); + qapi_event_send_device_unplug_error(dev->id, error_pretty); error_free(local_err); break; } --=20 2.31.1