From nobody Fri Mar 29 11:52:49 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620055210; cv=none; d=zohomail.com; s=zohoarc; b=IrqOFAFodvbnL+6EdNSCOnyKORY3CkWbXlhpne3Ty2W+uSZfFeuegkS7zmcN6Vue7B01S0Hv4c6xmYQITfitx4LkpQwm3fY5/qH/ci1ZH2HzqJ/glbLZAm9GC90DZv9xreGE5DBNnPq3E3qMzNiYYH1XSzemGyugtx1sQuxnbtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620055210; h=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=QSfXWYH/MWSLGgnMJhCDq7XAHXg2fV0Y8Gx8cAHkbQ0=; b=FUe5GfRAURgfgLyYc+U1V/gnbSbNCgU1b9z4jd8nDloFc38nkdPZ8x6PIRIMQFoI5Ecn4wnceKa3OUJ2fDO3Cq2vsOI2XdWSi9YXkw+d3G9++AJUGnxmI3qnS09inKNyTBUdT+TZSmvXcPe0WV+MkPUndaA+QXwQtK0+OCWrD48= 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 1620055210512259.73792276158747; Mon, 3 May 2021 08:20:10 -0700 (PDT) Received: from localhost ([::1]:44818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldaMi-0004oZ-7w for importer@patchew.org; Mon, 03 May 2021 11:20:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldaLX-0003Pp-VU for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:56 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldaLV-0000w5-9R for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:55 -0400 Received: by mail-wr1-x42c.google.com with SMTP id h4so5961063wrt.12 for ; Mon, 03 May 2021 08:18:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u5sm11778254wrt.38.2021.05.03.08.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 08:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QSfXWYH/MWSLGgnMJhCDq7XAHXg2fV0Y8Gx8cAHkbQ0=; b=qvwzo45OMvvbxGmvifZHW6kEdTMFuS9cWGzlWFYMdPFpdJm3drsKqJLeFcZPF0t9p8 qmpPCzv3Dr+6Il0q71kTR2poXoaht2zQAHskUYV7ewA05kePOZRwg53Sxs7uv8D2ynG2 iL1zB64vTQk64DZ8Qst1PTiMLf2pGGHSWrhv7hmBZ6c9jHqfKDx/1iXIDAxPVrLeRCeU plgAhZww/1ClHv7QoYxzp9OGMkHFpGxDkM4eKiP5dFvrfWIfm3pYdfCNaRv87HV8wY9e umWdT7egjKbusFet3b2fKfruIUpzsEqDrrhqRt/PeIHO23wJRkqQMNbO1EwG3c9o4ZVe NZtg== 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=QSfXWYH/MWSLGgnMJhCDq7XAHXg2fV0Y8Gx8cAHkbQ0=; b=paQwMtgqrTBjyn+q+Br3x7L0xU4klN5iRU52Wj+tVIIw+DnGAp6Z8QPbNe3FAiz61S t5+9yKN1O31AWqaFb7V0pCyQ42p+RDKCCmcEIVC/JjSE1ni+9gpIkUba2EMtSvPCwxF8 tMWYZDtlx7nuSY5Go9BZJS2STlnn5nFDmpolubzHAFkVFwG1foxRgUGUC4df0X7U7r+l TV30NIgtJidfsfKJlkMxG4ZHgkR2kblCmvz99S9sH+zkydngjkuFpP2bpHWIBeXNgDl7 5czOUiPPBIXQOCzRPQZbmQFJSh6moeUlABveX8VwDziQDSO3VeiwtOJU4cA/B6MqbGLO 2bug== X-Gm-Message-State: AOAM532oW4pamBnAcFkDFKWbugTCGHlWEkxMDIeqwaLwa2/NBdvOMHXn ieK1Fw0QykjfUocO+BErFQCxl3NqD1Gvtg== X-Google-Smtp-Source: ABdhPJxLqc3L2sBfxSVoDzt4UcQvomwhC3Qv4B2BdTdJtLVy49ZEPkwVfH89n3owAT4IsaMLfov98A== X-Received: by 2002:a5d:6484:: with SMTP id o4mr9259564wri.8.1620055131904; Mon, 03 May 2021 08:18:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/intc/spapr_xive: Use device_cold_reset() instead of device_legacy_reset() Date: Mon, 3 May 2021 16:18:47 +0100 Message-Id: <20210503151849.8766-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503151849.8766-1-peter.maydell@linaro.org> References: <20210503151849.8766-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=unavailable 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The h_int_reset() function resets the XIVE interrupt controller via device_legacy_reset(). We know that the interrupt controller does not have a qbus of its own, so the new device_cold_reset() function (which resets both the device and its child buses) is equivalent here to device_legacy_reset() and we can just switch to the new API. Signed-off-by: Peter Maydell --- hw/intc/spapr_xive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 801bc193416..89cfa018f59 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -1798,7 +1798,7 @@ static target_ulong h_int_reset(PowerPCCPU *cpu, return H_PARAMETER; } =20 - device_legacy_reset(DEVICE(xive)); + device_cold_reset(DEVICE(xive)); =20 if (spapr_xive_in_kernel(xive)) { Error *local_err =3D NULL; --=20 2.20.1 From nobody Fri Mar 29 11:52:49 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620055350; cv=none; d=zohomail.com; s=zohoarc; b=AI1hAIie2f3gU75lDGdUZItddKw4CAgg6GUadRVeXkprLtVXxVLmUKeDdz3D0WIzp5HZ5gA5C7oFOweLZO/EP+8S4/XazkzE9vbUr2UHqGAGeVhO1A9hhQH4RkhTBfHNsSZj+eoHDqzfAoFVQTbw1wNE8AwRkEbhOH13hE1BBDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620055350; h=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=Xfn4AYQKFGrvOYwzo5Ei84iKPoWu92o75Jz8/sEuH+8=; b=aYx0kXieGNTawkgRJJ6rvtWa3CIIUaOkZdUxsXfAb6xD/KZtn8Dy/NZhmzIZX17JZAEB/mPXya5Xgm7yHdEcVGlb6o+pqnRH/FS/3zyU0qpI9v6mHie2Tb3aFdvb91GDUiFJz7remNoR33qDGp4eCnnZzTmH21kgM9vgNk0L4D0= 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 1620055350109499.63592810652233; Mon, 3 May 2021 08:22:30 -0700 (PDT) Received: from localhost ([::1]:51708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldaOw-0007hO-Eo for importer@patchew.org; Mon, 03 May 2021 11:22:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldaLZ-0003SS-Tg for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:57 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:43648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldaLV-0000wG-VG for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:57 -0400 Received: by mail-wr1-x436.google.com with SMTP id x7so5981092wrw.10 for ; Mon, 03 May 2021 08:18:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u5sm11778254wrt.38.2021.05.03.08.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 08:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xfn4AYQKFGrvOYwzo5Ei84iKPoWu92o75Jz8/sEuH+8=; b=Yd6re/fF9R0D04QmOKQLLukCZ3jJFRsfy0gco1jmnA1vDTXD2xyHbT8B0a2c7D043P LW4qJepxHFWnpA+9IWck1xen1PrJ9j5v+BC+cge5M7PqMB92I1gMFlfv1Cn589UXhxw0 kUnwAOA3bhQPDI5zrgVDsFa3vws3muPiE8oZvBAiCaAtC/CiALDzG/9L3uS94QuGdgB4 uKzFOi3xXTHllyzlgJuxigqgU/c/VInd3K/aaxiH5MJZA9EZq3OiGpUkZTH2fDfiuMHV RNV6jPjYIZojTcOQSFbg7lqhegn1Sjf+AdXvdZOnickMToVsPfHHwmT2jcssVrwTgr/N dI/g== 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=Xfn4AYQKFGrvOYwzo5Ei84iKPoWu92o75Jz8/sEuH+8=; b=WehT7uPyCfgXUHs+a1ji10tpUZkHNQu9+xwer5QXDs7rJ4IrGdO5gt8rIgkQ3Uz0iu hpsRQ0pCitDaUFK6/vHtKiRZbgE3rxXbHukl2iIyOWo+3xgK3y9CKK57QITll+2Ndd+7 kvouc4mFB5i1egSfYt0YmDaUFtToyyywRdvvjPSZiaJIGwScCa07e+ewbtxFGOGiTw4y 1gquuAYYy3oJ1QH0o49y1xi+fz9puESElcMnIzOmPDJHYeYsD7qLiRTgsKGVfSMsnnS1 j7VbSSYCvE+l841e0xMdiqF5Pq7hVnTHSaSFaF8gMizoPWsPGsLoS3W76PZ8tv17uGRw hUCg== X-Gm-Message-State: AOAM531tkw37o9mkFiDwXATUMreH9vXOOoKC/+heX9ljaJacgjSGq359 DhzOI6mlFq/acOPY7U2ZCMXBqTQibbINBA== X-Google-Smtp-Source: ABdhPJydBpnVEutMnxFS6NWOMc0WliTlbaH1/cTRmZRhb7/e+eO7TvcH13nnTOG4NqqNkh6TGJfFPg== X-Received: by 2002:adf:f9c5:: with SMTP id w5mr17708708wrr.222.1620055132665; Mon, 03 May 2021 08:18:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/ppc/spapr_vio: Reset TCE table object with device_cold_reset() Date: Mon, 3 May 2021 16:18:48 +0100 Message-Id: <20210503151849.8766-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503151849.8766-1-peter.maydell@linaro.org> References: <20210503151849.8766-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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=unavailable 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The spapr_vio_quiesce_one() function resets the TCE table object (TYPE_SPAPR_TCE_TABLE) via device_legacy_reset(). We know that objects of that type do not have a qbus of their own, so the new device_cold_reset() function (which resets both the device and its child buses) is equivalent here to device_legacy_reset() and we can just switch to the new API. Signed-off-by: Peter Maydell --- hw/ppc/spapr_vio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index ef06e0362c8..b59452bcd62 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -310,7 +310,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *cr= q) static void spapr_vio_quiesce_one(SpaprVioDevice *dev) { if (dev->tcet) { - device_legacy_reset(DEVICE(dev->tcet)); + device_cold_reset(DEVICE(dev->tcet)); } free_crq(dev); } --=20 2.20.1 From nobody Fri Mar 29 11:52:49 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620055249; cv=none; d=zohomail.com; s=zohoarc; b=PhOS0b4cIk3YjtGtY9xGSaqp6X4jbR4N4gTJFG8RBjGp8WaWPbQS5ggwm3bZ8igvWVEjIigYriFmk0zGzCvQlMdct/xNVNOgzVY8V6Zf3RRSjOuXVGTARHKHlOTBHu0vqR21XdxsBw/L7m4A+dQfg4ywt7MdTkZrYHFjlwWiSzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620055249; h=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=Oi4njrzLK0pfsT3o6sZlJ4iKa/xeGzHyeEr0ump21y8=; b=kbr0ipgi4hv+Bb2omlnZxFJQgtBpoiqi4TCrGMztkCeaTndK0ILFOBcXgnNJlDdkxh9+m/onPOHQgsDyO4+IRry606OslULP4b5GLW4xr7AnzZUDnBum8xusNmYcNLmtcZ2qkP02wspdo4tTOBdmGX3xMK4D4d+tqRzjsDaPCEQ= 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 1620055249004323.1438941844957; Mon, 3 May 2021 08:20:49 -0700 (PDT) Received: from localhost ([::1]:46296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldaNM-0005Pm-3q for importer@patchew.org; Mon, 03 May 2021 11:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldaLa-0003Tb-9F for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:58 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:56154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldaLW-0000wr-TH for qemu-devel@nongnu.org; Mon, 03 May 2021 11:18:57 -0400 Received: by mail-wm1-x329.google.com with SMTP id i128so1575224wma.5 for ; Mon, 03 May 2021 08:18:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u5sm11778254wrt.38.2021.05.03.08.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 08:18:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Oi4njrzLK0pfsT3o6sZlJ4iKa/xeGzHyeEr0ump21y8=; b=K96zJOQ+OIxJdG3Zh3umby8c2BcJGCalFC9QMO9fXPVgKWr75GyDDJcmvJ6JgplS8V kZl/GK5QULgyTecuu8PgMpOWlPIKcFf2XA9BDthbFAlk1k9rfeiWnJpZ36bYM+3mXDlz oaa8zJUFWlGTgg3cPbdu5VztJmOhb4F7DN1DnNNRzgQIcF4/JiYZA/qqwp0EDy6tyjmu l/8tDRF+l1Wr7wGlNfE1Eb+Dj1SzigRcPzCUr3l18ryvhI0LX+UoOIX1r5P+E1+mM9fy 9CGUnxjeCFUpBuk3ISlKvSmBAcp6tUeQtz090+l+9wZMZSnOC4W2/k37BLm3EMaBfatD 0/Ow== 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=Oi4njrzLK0pfsT3o6sZlJ4iKa/xeGzHyeEr0ump21y8=; b=FK5lBPp3UBTklqguqFiub8TqMu+86Pd9HsTaWR22edRtBU8KdojLTHVYdRlyKeuKRM n06DCCJua/kv2GjGv9+F62ZBd6b3hUgjIgyKagaN8V+17g/4kvIM64WBzbMQgYrJDc6c CZLcXh474ql+Js2tCPx/ezRaxiDOZlT17SoJx0Bj2C/FhsCRo6Uddpl9Jx9Yx4ZZy5nR QQPMIbu/IdLvjWJNR3jRCYWKXkmG+NH2cnpbFaLA9j7SO0yLk7trApct92AFiciIIydr H0wb9XRQXwqz6IOp5ufB7jjFNvJ0x7g70tvwkaKMDpln3qLj5Md9oszDBT2tIoLuq9vS kOjg== X-Gm-Message-State: AOAM532H0vjLEYju901H83RzMUbrHhl8eeZpv25TAvRAFrs7wIN023Fc wRjoC4K8Wr0uMc7aFDij/WbzylR0CQuG5Q== X-Google-Smtp-Source: ABdhPJyIyiDE9+ASHgw0OY94CzL2jLqtwKW2HKRNcC9/8krM8EgBO0PxjhHCRSvBNN1VfPFR1LymBQ== X-Received: by 2002:a7b:c444:: with SMTP id l4mr22297056wmi.36.1620055133409; Mon, 03 May 2021 08:18:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/3] hw/ppc/pnv_psi: Use device_cold_reset() instead of device_legacy_reset() Date: Mon, 3 May 2021 16:18:49 +0100 Message-Id: <20210503151849.8766-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503151849.8766-1-peter.maydell@linaro.org> References: <20210503151849.8766-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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=unavailable 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The pnv_psi.c code uses device_legacy_reset() for two purposes: * to reset itself from its qemu_register_reset() handler * to reset a XiveSource object it has Neither it nor the XiveSource have any qbuses, so the new device_cold_reset() function (which resets both the device and its child buses) is equivalent here to device_legacy_reset() and we can just switch to the new API. Signed-off-by: Peter Maydell --- hw/ppc/pnv_psi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 3e868c8c8da..292b373f93f 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -466,7 +466,7 @@ static void pnv_psi_reset(DeviceState *dev) =20 static void pnv_psi_reset_handler(void *dev) { - device_legacy_reset(DEVICE(dev)); + device_cold_reset(DEVICE(dev)); } =20 static void pnv_psi_realize(DeviceState *dev, Error **errp) @@ -710,7 +710,7 @@ static void pnv_psi_p9_mmio_write(void *opaque, hwaddr = addr, break; case PSIHB9_INTERRUPT_CONTROL: if (val & PSIHB9_IRQ_RESET) { - device_legacy_reset(DEVICE(&psi9->source)); + device_cold_reset(DEVICE(&psi9->source)); } psi->regs[reg] =3D val; break; --=20 2.20.1