From patchwork Wed May 28 10:05:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 892971 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp2115841wrz; Wed, 28 May 2025 03:12:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEEv4wCYE/WKXS7a2vp0NP4s8L/voTpzmaBE2slEAdV1AMRmms+mUyl40Ipcy40DdTXYJdOg==@linaro.org X-Google-Smtp-Source: AGHT+IEBXwUWap4n51ii/dqaU/T+y5LW/YZzYflgGrYBXpG3YmcisvX3li24ROyMfaPMPowSceSz X-Received: by 2002:ac8:6903:0:b0:4a3:76eb:2824 with SMTP id d75a77b69052e-4a376eb2de0mr33441721cf.38.1748427134117; Wed, 28 May 2025 03:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748427134; cv=none; d=google.com; s=arc-20240605; b=iHsFJ50ZoZQInC4Zj39aSnVNEmAivhTrbkjJqYogcGBNVUNCFjOSw3THk6To50BMUC v6DTDapaFckxY5+9TqDVoykaNE9HlmgBMNV4/PsPeXOAabS2vOg80YWn97yY4UPjNi0w ueNvvmqgz2iAuB6w6tDDa91Bnl6TOwur3KyXM72DxPECcIViaa6xDG9+laA05VuZBJBp 99YB56ym/mHWxKo60t/gh6td8Ws86P4CSKZCWSbecWp2M2MfmLVqbTa0NbLL0goS3tv0 p09XGHZLfK6EdNws6p7uRi81BDMtgAMWpQIcT4dKnQ8FRMfjULYuW2sQtB0HqGkvLJGf FHCg== 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=SjKpU/nYfX8v4Il/bQ/hdOg2oevNS7Qmgj1ruv54cLk=; fh=7aRxDtZP1Aq9vpCPLaCABi2Dx/PnTfPUrTuYqgFFRwg=; b=ewAgTIod4+8fNbpkAilM+3aPY67NLned06uobPV0mFYHzJgoxOG7RwQKo6vENzgK2O p68DXZgJD1MjNl0clRNcrLTX6CnDS/TU8/Hg+ry5eQE857BGyTGzL1AqlyeZlfuT9ak2 8maH3yVufP4vV3iv6oEI1akDj/E4ittgwZLujDtiTdIu/x3c0d0I6aWiVLKT5T4GSSbu FrMNN4M1AZ5oi5prVdlAuZwePDMY5Jxxhr7NxCgT5mPO3vYYawWpC6Pm7EEV7KwPfHnZ TMEJ9fFZwKM6uJl6aTH/qYKQ1qanz4JYAU91klYv41cGhyQMx3QKIX/awHR3UuDsQhIR wz6Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M7UkAYzK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a3cfefe941si9136581cf.519.2025.05.28.03.12.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 May 2025 03:12:14 -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=@redhat.com header.s=mimecast20190719 header.b=M7UkAYzK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKDgb-0005lN-UL; Wed, 28 May 2025 06:07:03 -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 1uKDgO-0004rI-JR for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKDgL-0007JT-97 for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748426802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SjKpU/nYfX8v4Il/bQ/hdOg2oevNS7Qmgj1ruv54cLk=; b=M7UkAYzKimP4/5ONUBqmnp5UXQ5sLUD20712zOar0rUYlTkqKCK5wSM0I66+EX1l9hXKz2 xssXo7l99DIBsfHgA4m4c5CIxggJJsliwbKiRD+lbUMoG7ajd4L3FAMoDHZ6U8cgDTuKj3 en9iJ07Ww2Hdqe6nuLa9ociuru9eyPc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-7gMxvagKMqGE4NouRKzgsQ-1; Wed, 28 May 2025 06:06:39 -0400 X-MC-Unique: 7gMxvagKMqGE4NouRKzgsQ-1 X-Mimecast-MFC-AGG-ID: 7gMxvagKMqGE4NouRKzgsQ_1748426798 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14A1F18004AD; Wed, 28 May 2025 10:06:38 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.34.110]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ADF69180049D; Wed, 28 May 2025 10:06:34 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Zhao Liu , Xiaoyao Li Subject: [PULL 25/27] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Date: Wed, 28 May 2025 12:05:05 +0200 Message-ID: <20250528100507.313906-26-thuth@redhat.com> In-Reply-To: <20250528100507.313906-1-thuth@redhat.com> References: <20250528100507.313906-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) DKIMWL_WL_HIGH=-2.907, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé VMXNET3_COMPAT_FLAG_DISABLE_PCIE was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=on' property. We removed all machines using that array, lets remove all the code around VMXNET3_COMPAT_FLAG_DISABLE_PCIE. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu Reviewed-by: Xiaoyao Li Message-ID: <20250512083948.39294-19-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/net/vmxnet3.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 3cf5d71f478..d080fe9b38a 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -41,11 +41,6 @@ #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 #define VMXNET3_MSIX_BAR_SIZE 0x2000 -/* Compatibility flags for migration */ -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT 1 -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE \ - (1 << VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT) - #define VMXNET3_EXP_EP_OFFSET (0x48) #define VMXNET3_MSI_OFFSET (0x84) #define VMXNET3_MSIX_OFFSET (0x9c) @@ -2466,8 +2461,6 @@ static const VMStateDescription vmstate_vmxnet3 = { static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; static void vmxnet3_realize(DeviceState *qdev, Error **errp) @@ -2476,9 +2469,7 @@ static void vmxnet3_realize(DeviceState *qdev, Error **errp) PCIDevice *pci_dev = PCI_DEVICE(qdev); VMXNET3State *s = VMXNET3(qdev); - if (!(s->compat_flags & VMXNET3_COMPAT_FLAG_DISABLE_PCIE)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; vc->parent_dc_realize(qdev, errp); }