From patchwork Tue May 6 14:39:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 887796 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586236wrq; Tue, 6 May 2025 07:43:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPo+bLqu30dhpuBcAnV1qyYjqBzOvfzZYbuQcKQN3iJGfaCzhbX11PBmjmIiMGL1wmF29tgw==@linaro.org X-Google-Smtp-Source: AGHT+IFrWN/EeRBLtG57jYjYxvo4XdEdgshxHIddyGayB7kNr8O3Bpihj7GXc8vHXfr+2y9iO7GK X-Received: by 2002:ac8:5ac2:0:b0:48b:512a:a919 with SMTP id d75a77b69052e-48dff2e4097mr160741121cf.3.1746542637818; Tue, 06 May 2025 07:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542637; cv=none; d=google.com; s=arc-20240605; b=bjUqCqdH5OYOWg2tdYs7YUV3cCNlbxHqKZA4LWunn298ARdpwke4xe1qIxB5KtCuLi EDVJmkjjo2km+I1dIKGharCRYYT0TyFB/MYk76RMldN+jN6O2+/wu/ErX43egpm3CNeq eJJJNAt/ijoH2qHiMdPHhIw/fRV3RBYr+tiim2fIEHPLnGHhOVHQyd0OGLtz0eZ2B/Oz uGnAFJfVtS3uHrZJSVxegIb2B40KyggMb1uS46wGpfQXCorM+KYfAWKhJJ5Jtjvr7EHk z1iAKugjqabj3PJQSmUrWvIkd8/judqOXewRkAP0Awg0xOFbDPttqctdFXlyXEDPYcpH RIHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=f0XCM+d0roSrh6SjzjW/pfr7EfgWUdmXoNk2UcIXddAdM64i28h8E+Nc9/nhsBtLgx 4jxsqhzRnGXc09N7OJa+TDbq+zvDTa74VeA1tveZgL9Fnxft9Fc6NOJl8Dpem+KpwFPl eUfXYNUEspcQKcBVETrUNCSKeqBwk9551dYbQ+w/qpZIvZiEdvBg9joTEvTiraEQkq93 OBDJ5TKpACNRtJkOUzaNglKZbHw7DsG+CV2boOVZ+kLikrkYeHixdceg24tpu4Io2RhX 8q+iN2VcssLlEhp/2+VTM89LMu2jPmWSiluirsFrkAvwXeK8NDvRtr7imrypkY8G2prh 0ihw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvnUsUCF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98d13314si112889061cf.564.2025.05.06.07.43.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvnUsUCF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJVz-0003fi-6U; Tue, 06 May 2025 10:43:23 -0400 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 1uCJT3-0007yG-1u for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:25 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJT1-0001pZ-15 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:40:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cf848528aso43093275e9.2 for ; Tue, 06 May 2025 07:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542417; x=1747147217; darn=nongnu.org; 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=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; b=QvnUsUCFJB+HrKDHRFIZdiQo7IZWyK7Jh0orFIjxnlutMSa/R5bi7tCWlBGtrGLA/o i3vkMWdEfEsTJ61IDzGNhhfddvHHxEwCTT8Td817klCdfrZ+TAlYFOnRSSselCb4vSOI 3eDOv3kOvlU8ZU97W9Hyl189fCJ8PpwTnCnvk1YVb+XkaZM53dKpSxKQsZcScwkdY8QS VjL2K9ULueLw3FZucTlDhpedcnK/ot5f6043crH+YlnRi+EGf1/zaaqdVL2GPGF/+MV/ xz966IY8ufnrNTubJBq2x/DR9SkM+l+DTWgA3DmZeL42eFX9fWxVRYsvOT9+JNHJqqvB M/7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542417; x=1747147217; 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=MjppJwO3PoPneuGtrvBsUFRU7aSrgebY1jdyuvD/TSQ=; b=MaOszceIU15NmoPoH5WmLNwsbOL3AMiySVzzaLN0btKJX08QcObjCt2wLYYPl5yKRQ MFHQt2yLVJjgjlBA0rmHYWdxU1veuy7awYCG/5EBu9dY4Y1nPP0QMAUfVZ13tlO/w1CT QMacHNtyboggCdu+LA6ToN3fO/u/AXsohcs+zIz45h2y6fx2nNdgiLCz9XYvn/ILt6tm /JMGmAkb/v6Vc6zlNj1lsh8EWJUKaceboN2YzKdtghBLqtktYGD8bPdMsOhLyc/Dpw4b 4GZoRHSbfb7ZVf5Ml0v9kRVHS2YCIYV77zx8VW3A0Gyn4YCWUElvTtsixYaWZ+IF0i5n ZlZw== X-Gm-Message-State: AOJu0Yz7hoHBNVKWheDZrSlS0BrHZF7IAMbzzw+zQTVfPlTRyNEyFIuj nauhGpki7n6VWqViVZ+IE8q/nG2v669gFJRKOlQku9wSrdp4qlSb7BmRWCRgzS8FPFuL9Qc9i8d q X-Gm-Gg: ASbGnctO/zQww9QXoPhdFQTPwm4BkDPZP7wqP6v5dMJ/1dUq0dC0Ke2GJwXtlxpw9Dx kHguMCEeSrhNlOkroobdm6fQqZAmBWxzK7Gxre1ebXeGlT6GjgrN+k23mvtiCmwZ8eS5elVeuaF LaEu3PObmBFph1+nQ1vljWZDihygroPBKuJoKBUi5KlRd44uh3X6LAbg5HKSsfHqhUeoWUtHmk5 UXm45T6c+c6onHv8iruTkBBikguJK05bGaUscM7GQajGBLGFNiiwjG6UJrpGnUl1oPnQCYcA1nS ovKP5i8Yb6vLqf9sdd1hM/qx5Q8mfswf3MzPnptSkutJPDIpBOacXE2fEYp8s9lR2ip5cBYnv7b rabaQp236BtuT/7DPbeYe X-Received: by 2002:a05:6000:40ce:b0:3a0:a3f3:5034 with SMTP id ffacd0b85a97d-3a0ac0ecdeemr2882530f8f.34.1746542416925; Tue, 06 May 2025 07:40:16 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b16f9dsm14156691f8f.93.2025.05.06.07.40.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:40:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Tue, 6 May 2025 16:39:00 +0200 Message-ID: <20250506143905.4961-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org PVSCSI_COMPAT_OLD_PCI_CONFIGURATION was only used by the hw_compat_2_5[] array, via the 'x-old-pci-configuration=on' property. We removed all machines using that array, lets remove all the code around PVSCSI_COMPAT_OLD_PCI_CONFIGURATION. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- hw/scsi/vmw_pvscsi.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index d5825b67868..34de59a7cf6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -69,17 +69,11 @@ OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) /* Compatibility flags for migration */ -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ - (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) #define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 #define PVSCSI_COMPAT_DISABLE_PCIE \ (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) -#define PVSCSI_USE_OLD_PCI_CONFIGURATION(s) \ - ((s)->compat_flags & PVSCSI_COMPAT_OLD_PCI_CONFIGURATION) -#define PVSCSI_MSI_OFFSET(s) \ - (PVSCSI_USE_OLD_PCI_CONFIGURATION(s) ? 0x50 : 0x7c) +#define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) typedef struct PVSCSIRingInfo { @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) int res; PCIDevice *d = PCI_DEVICE(s); - res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, + res = msi_init(d, PVSCSI_MSI_OFFSET, PVSCSI_MSIX_NUM_VECTORS, PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); if (res < 0) { trace_pvscsi_init_msi_fail(res); @@ -1158,15 +1152,11 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) trace_pvscsi_state("init"); /* PCI subsystem ID, subsystem vendor ID, revision */ - if (PVSCSI_USE_OLD_PCI_CONFIGURATION(s)) { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, 0x1000); - } else { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, - PCI_VENDOR_ID_VMWARE); - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, - PCI_DEVICE_ID_VMWARE_PVSCSI); - pci_config_set_revision(pci_dev->config, 0x2); - } + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, + PCI_VENDOR_ID_VMWARE); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, + PCI_DEVICE_ID_VMWARE_PVSCSI); + pci_config_set_revision(pci_dev->config, 0x2); /* PCI latency timer = 255 */ pci_dev->config[PCI_LATENCY_TIMER] = 0xff; @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi = { static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags, - PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), };