Message ID | 20221013160623.1296109-3-peter.maydell@linaro.org |
---|---|
State | Handled Elsewhere |
Headers | show
Return-Path: <qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=gi2Qw5jh; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MpDxS4NZ5z23jn for <incoming@patchwork.ozlabs.org>; Fri, 14 Oct 2022 03:09:48 +1100 (AEDT) Received: from localhost ([::1]:52118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1oj0mI-0004df-HQ for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2022 12:09:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1oj0jC-0001x4-Sy for qemu-ppc@nongnu.org; Thu, 13 Oct 2022 12:06:35 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:42549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1oj0j9-0001dR-4Q for qemu-ppc@nongnu.org; Thu, 13 Oct 2022 12:06:34 -0400 Received: by mail-wm1-x335.google.com with SMTP id o20-20020a05600c4fd400b003b4a516c479so1806753wmq.1 for <qemu-ppc@nongnu.org>; Thu, 13 Oct 2022 09:06:30 -0700 (PDT) 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=/F3jjKAvJ3qDIMnXa9+7zQrGXCzXqsolcdSC4WnXfXc=; b=gi2Qw5jhIgHEAcK7aLG+WGJ+IJ31/JfQx/oAxoidkWkTOUnFzBAvuOfufMrBV8gnup 80zi4jEo3as7JTsJW+wexsDHZ5K13J33nuNJ97HQlAjmf3FQABXqnX7P4SKQo4K0jibw b6Sa9Sg6ZRz+GBBUDaYDA+AbQUuKJArbXlRzivjHd7BmFicDxqpFldS8GYICMbUKA+Qg sr8IrcF2TQ3i99ahmpVosNO521badAA08aA8qMhFTLs3JMDpzqErIr/SAvDK9umXn9N0 czIxkr04yUCNQiZxXrl59JrJ9P0Ni6QeLzs3cQVYJsOABPaFSfcf48JfWr4Vpn2gfCV7 eHVA== 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=/F3jjKAvJ3qDIMnXa9+7zQrGXCzXqsolcdSC4WnXfXc=; b=XXteqVsJz/PIP7y0CfaHrOLnZghiqVv3ZmCua0KR8B0QK0Trmj6W2QDSoai/eSEhkU t5w699FEOTqs5baMrKW/GKEG4HCY6ZfCsEtn4cTx5Pt7n3NL1BiTmnHnz5YgPAh0Wjmb OFxIhxo1S5fXw1URZqw27PfaPhUAnXrEn/zcD3HVL21HlfrTm/8tSh5tY0VGsewKRsNL 2CGCR6WtCCls/TBKv0iLDmY0aznABo5nWcj5WiRdAhdF4gj4hwQgM4X0EV+KwXTHa2hf /zc793Ssed2k0yKktiIGj95elhvxBlDjN0Z0ne+W9R/WM2oP4yfDciQXfJU5t9TmoboM tOog== X-Gm-Message-State: ACrzQf0ee10Z67dZqGyjaFwiiFO6mudWWxJivRs50ddIaVzr+SD8GvK3 KvS4eu3a1VazwzaEFKM576mx0Q== X-Google-Smtp-Source: AMsMyM4/J9ZRwI0LDia5Wym9nkeYc9q9lerxf9XFV8kXP788uHkqNidxJJ97Y96tm6/0gPk9dMnNgg== X-Received: by 2002:a05:600c:230d:b0:3c4:2975:321a with SMTP id 13-20020a05600c230d00b003c42975321amr7125540wmo.155.1665677189669; Thu, 13 Oct 2022 09:06:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o14-20020a05600c4fce00b003c6b67426b0sm5125617wmq.12.2022.10.13.09.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 09:06:29 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Cc: Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>, Hannes Reinecke <hare@suse.com>, =?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org>, Daniel Henrique Barboza <danielhb413@gmail.com>, Greg Kurz <groug@kaod.org>, "Michael S. Tsirkin" <mst@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 2/2] hw/scsi/vmw_pvscsi.c: Use device_cold_reset() to reset SCSI devices Date: Thu, 13 Oct 2022 17:06:23 +0100 Message-Id: <20221013160623.1296109-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221013160623.1296109-1-peter.maydell@linaro.org> References: <20221013160623.1296109-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <qemu-ppc.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-ppc>, <mailto:qemu-ppc-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-ppc> List-Post: <mailto:qemu-ppc@nongnu.org> List-Help: <mailto:qemu-ppc-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-ppc>, <mailto:qemu-ppc-request@nongnu.org?subject=subscribe> Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-ppc" <qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
scsi: Switch to bus_cold_reset() and device_cold_reset()
|
expand
|
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 3ea2c8c9f23..fa766968550 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -880,7 +880,7 @@ pvscsi_on_cmd_reset_device(PVSCSIState *s) if (sdev != NULL) { s->resetting++; - device_legacy_reset(&sdev->qdev); + device_cold_reset(&sdev->qdev); s->resetting--; return PVSCSI_COMMAND_PROCESSING_SUCCEEDED; }
Currently the vwm_pvscsi controller resets individual SCSI devices with the device_legacy_reset() function. The only difference between this and device_cold_reset() is that device_legacy_reset() resets the device but not any child qbuses it might have. In this case, no SCSI device has a child qbus, so the functions have the same behaviour. Switch to device_cold_reset() to move away from using the deprecated function, and bring this SCSI controller in to line with what all the others do. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/scsi/vmw_pvscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)