From patchwork Tue Apr 29 14:08:20 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: 885737 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp347207wrq; Tue, 29 Apr 2025 07:12:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+GEGcr0ZrlUkh6pPJAiZLno49lyd/CszrbnKv2UhE6ijsw0gXW7TYeG2XoHU8+tucwh+zlw==@linaro.org X-Google-Smtp-Source: AGHT+IHn/okPzMPhPLQLq5DpPC6vz/4L+o0lAZRc4GSE2ei3tW9Spk0hDCnlTjDm9JuSOAvNuATx X-Received: by 2002:a05:600c:8411:b0:43d:fa58:8378 with SMTP id 5b1f17b1804b1-440ab873e30mr103038865e9.33.1745935924012; Tue, 29 Apr 2025 07:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935923; cv=none; d=google.com; s=arc-20240605; b=ECNpdgm1LVsEWjJlebb8i6exYfQqC4EJULLNnncqTpQXaq1cAuGkoh/dMCKgh6NFiO C7RVBrv3X+wf78QFKylD+X4Pp4a1lArGCfTgmxITTDYFO1VjpYfRXno91t8Jk++G4jij TPN7XFdH3FyvP9QI8Lek++vdf5b+LFYt7JfxbZ7pUFL1mqO4XH6L8XGnJbsqeKqaXFf5 U0eb/U0q736RzsfpQXkOVPiLIDX2NsoTCgckm/mNvMpxTX1Qb+knBN5RUEoaGrNynpu2 G5VKMkZcFGnp4aBRnNrtm3ZMKnG19gS6mapTY+slIvlZDY80UsHeiZuQpM1v/jgtua7i Qa6g== 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=LoPXZjDHM1nviWxWtbFjL+x1mDE/c6Z5R+Gfu+HvpXeQh7tYRAs8axmgQWE5Hw/enH 8YEhiDu9dG3joFm0P4Nn6W9pshv/JZ14Tm5Q8UZrzWvAhgXfthQBEBifslCozpPFApV4 xQ94+3lZqqWOANexlel2MRsxca6k+w12LL8o+bXYiPXXTC/SO8bXerjEwKo/0jN06JbU 7g06+KLbDakrUdPMlth5soez2yehGas1bRYhDF9bQedQravdHGK7vHB1BRAce4gpixlr Ibs2/PGuLmknHw3K+kf1rMMJV7lWP1k+JIkWC+brw9mg9GO06eLAx1asTXqLlfPYnGLb uAOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y838GGm3; 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 5b1f17b1804b1-440a53ee524si76061415e9.171.2025.04.29.07.12.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:12:03 -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=Y838GGm3; 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 1u9lf2-0003TO-AL; Tue, 29 Apr 2025 10:10:15 -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 1u9leZ-0003As-B9 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leX-0006TU-Nw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so23664365e9.1 for ; Tue, 29 Apr 2025 07:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=Y838GGm3mFEK6Q7WaC5H/eNdklCYSMjUbxJGxA41F4ELmmWUxbfkwnGBHsP/3ixJWH DThO5mMsn1L+eMJ+POVEFJXhgX1irvx5pXnZjsMNW093oIpAPMLSgStkV0/+doj9xUfp /aSxr9F+0f3pNGw2nWLfjZjAWglEsGWqosl+uLhbJat+VUX7ieMmqMNFSsnZYRL+yLfO pcNyqlU+TTUVXxjijbSK/YcZMEKpfUOKPvF4+0V/lXX9NdYly4QWFQ9vNQDRYXckslHk kM0L5ne1hgvSXyfLiaER6b8jmQy/tLwIpJJUAnY05zf9/QafC9aM2rx/5PtItCxTFru6 kr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=wUfx8TDFNPyDRzyeTBkLT6bT51WcPsGfhMMVIxlgApVvtOGnKxq2wQ3Rhxjx6oGCDZ YT0PA1FS0/ItqmFI1kpqFya43eHxOw743NRQEsR5/WbLmJfmx7k27ESbC0ngG8b6j0P6 XKi3SdSoSvdS1bXSEdmpbX7L+0Pti0NHSqwnB4357vFKkXQroyVjPF+hrrDTlk2GEUXB 7E/K8YV5Y/+nnHORDZkd1yvNOt4QHqhkQtQszBq7vI23IBG4jXYkC/hFTgTrpZlM4g7s HdVwDJlWDstemoaHAaHtXggADDd1zOhGdjUlOSorgbKyA7X9/mqD9OGY7sbeEMMUIRTn Vs0g== X-Gm-Message-State: AOJu0YwFy29u/qZVoCUwAVP4szf1DSi9kKxkbO6MNjrA9yhMf0XrJ8KF 73uPOe4YuSEc9clqpHmh+Z/GUsZs5Gqxvkd+89E1Mr5iE4wXZUW7UzNOR2qt4b3W1H2HL1t8y+t P X-Gm-Gg: ASbGncsRGQd8J1D1TBckMt4gWwgv02t9MDhv68hW1S1LJUHZ/gt0OlcNjj2iyvSGoWt An4l4kKXL2LwazLGTJicey2PcYvXSs1TivhtJ64HDdQesxlRX4qJ3c45DlwTkfIL7QQ/fZBui3r P1R/Q5N3hlRWcJZCsaCA3hrpGlop/QI/qgCkKO5vpTHuAAejvMcpe1YbUTpBcOf8uld7Jtl9vK8 iOGDJoPf7Yu/maAJ8PBNXILkjVQByoyHK+JpmHyDTPFtcouFDc2x2bY1THkXLafdoiV75ayztno JvQQaFU4W3kOjDBJeO7/bvTTzJ7QJmtanKoHnis69wNyk63XdqKeSg5TBL1DNbZF2h5sexymwGr PDJS4Q8UuvaJyMru9LTgt X-Received: by 2002:a05:600c:b9b:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-440ab782a91mr132704845e9.3.1745935778149; Tue, 29 Apr 2025 07:09:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073bbeb5esm14012581f8f.0.2025.04.29.07.09.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Tue, 29 Apr 2025 16:08:20 +0200 Message-ID: <20250429140825.25964-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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), };