From nobody Sat Apr 11 23:08:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772708017; cv=none; d=zohomail.com; s=zohoarc; b=YPTedt+Dp39Ws2QFSbHuFEklryrbylqzp+DLIqetF9EnnBLIv6SPZwZyt4ARqN8Bkn6epPRBCGGHyMmT53/TwuJc+0C/ipeVhdBaaZ29qcyY0J4uXyJ404Xiw6EfI+O4xgiRuzpR9/3c66bFwjQVzat30DeiLoAIMsWg3QDU0zQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708017; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bregcc+4oQuYkY0w0aiE1hvjZsqGY726rP2gyP7fHSY=; b=S89D3meddl4IIXW6AZt2s1CcpFBBUHpWivrYq06p3biSVjVwY6UaQ//KXQ2tojKShgxzcJyrxiIMRloY/A/ce51fCgWpoM19Xb2t9KQ2tHaoSqR2rLIPXF0tSSYpk/9sc7B8HjmHCaJy4mNCR1HG0wS0+BEYPbRDL8YBMHiEz8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772708017497307.85210693164777; Thu, 5 Mar 2026 02:53:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6K3-0001Kw-BJ; Thu, 05 Mar 2026 05:52:51 -0500 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 1vy6K2-0001Jv-5F for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vy6K0-0005Uq-L2 for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:49 -0500 Received: from mx-prod-mc-06.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-671-yYUk5moPMXy0maEdYyqlDg-1; Thu, 05 Mar 2026 05:52:45 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9B2518005B3; Thu, 5 Mar 2026 10:52:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 50E5A3003E9C; Thu, 5 Mar 2026 10:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707967; 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=Bregcc+4oQuYkY0w0aiE1hvjZsqGY726rP2gyP7fHSY=; b=duyXrBzUvwYAd0pdsFihooeYJSJarxNDSt2m8G/JpX2eGN6wBQkAhkViSK4A1LeQKFq3vD aqhoKNmr8CFYwihgxRbQd2+11z6bdQeVusb+oBitUN8zNGPFfFcIIg+pnDfinr9eHFXDDp p7Gvk3VDUE9e4tLgJJ42PLJ1zDh1/nQ= X-MC-Unique: yYUk5moPMXy0maEdYyqlDg-1 X-Mimecast-MFC-AGG-ID: yYUk5moPMXy0maEdYyqlDg_1772707965 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 08/28] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_LNKCTL definition Date: Thu, 5 Mar 2026 11:51:55 +0100 Message-ID: <20260305105215.302571-9-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772708018890158500 From: Philippe Mathieu-Daud=C3=A9 VIRTIO_PCI_FLAG_INIT_LNKCTL was only used by the hw_compat_2_8[] array, via the 'x-pcie-lnkctl-init=3Doff' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_INIT_LNKCTL (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-10-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-9-thuth@redhat.com> --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 405e33a3165..9760a3837fa 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -35,7 +35,6 @@ enum { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_PM_BIT, VIRTIO_PCI_FLAG_INIT_FLR_BIT, VIRTIO_PCI_FLAG_AER_BIT, @@ -62,9 +61,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) =20 -/* Init Link Control register */ -#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) - /* Init Power Management */ #define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT) =20 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 91d736d71c1..9e2201be13c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2310,10 +2310,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) /* Init error enabling flags */ pcie_cap_deverr_init(pci_dev); =20 - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) { - /* Init Link Control Register */ - pcie_cap_lnkctl_init(pci_dev); - } + /* Init Link Control Register */ + pcie_cap_lnkctl_init(pci_dev); =20 if (proxy->flags & VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET) { pci_set_word(pci_dev->config + pos + PCI_PM_CTRL, @@ -2444,8 +2442,6 @@ static const Property virtio_pci_properties[] =3D { VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), - DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_INIT_PM_BIT, true), DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags, --=20 2.53.0