From patchwork Tue Apr 29 14:08:14 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: 885742 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349147wrq; Tue, 29 Apr 2025 07:15:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrdcR0L8Jnyiw2r+HWt43HG1cxJd6PYDy+lDwTIXwpXUNcNQ61V5XKSYRVPe8bD+HY3LxrHg==@linaro.org X-Google-Smtp-Source: AGHT+IH8dA+GA+QW7sPGPdNhbzK7j6IoaM01SCGCWlU/Z9A0azDpm+O2NFOy7+tI2HSBVhOQkuNB X-Received: by 2002:a05:6000:2483:b0:391:31c8:ba59 with SMTP id ffacd0b85a97d-3a08ad2b7bbmr2065360f8f.4.1745936104014; Tue, 29 Apr 2025 07:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936104; cv=none; d=google.com; s=arc-20240605; b=lPIJyjF5yTgHilob6pR6alKryvfLY36e84bjS2wJqbUEBPfVK9S2eoqyVRQYUPX8Sm wYPrzLJbR2G/ABJ+19xb5RjGG5jrXs4FjxDnrQETHr1kg4ZTgfkNI1Oy+Kr9QrIMi5S7 tHs0DY0HMFQR84GMfif6FQHrgMX3x50SB2vRf2ha2sijsYKcaU0uwhIMOuNf2uIzzryr X5BJuoTxdJ1cpxfdMC0fgfzsEiSsDa2TW51pts0gIiQuhlevkadnrWsz9L246QtYBZfu haLDV5jOx1+WInuDeK+dpPn8b/JSvcVaYLmmYUWU3fh2pFF3gmfJ68b9g2x6/5t7l5To 23Yg== 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; fh=S6YL0dyAMbl4T7TfefFhbqa8nURDEApLVFSBl9ph+Ec=; b=DQSDjEfBDvvZNcak50p625m42W+AiG5S8HsGTqva2XqaYEVrJhlimQZLxrX9+me9YI 49qVMT54W+wbP5bfSTmIkQhvl+RQG9ANUmtU3Ek+BbArxVFDRTMRdqAkXHxHsxZ72f7O N15e6IhtCkZFIpD/Z8NPWKgfi4vUNUX04bmQublDRKWjiigMypBf3l8ZCgOZAFCX94GA yKj6+VBnDTmF1lp9V/Gh5DkrGjFkas4/fu8tbGtrm1mhd8caCL/L0CMrM3JoTwoUFBhU NUAkvKPqIYXxeG42iE046jPg1KM2sUPEaOKT0Xk1m4/YRQtIsSk/0XDNUrPOt3OlXPQL FUPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yak1JtEY; 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-440a5304347si75543885e9.72.2025.04.29.07.15.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15: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=Yak1JtEY; 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 1u9le6-0001oG-7E; Tue, 29 Apr 2025 10:09:14 -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 1u9le3-0001il-Vl for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:12 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9le2-0006Mt-6p for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:11 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4394a823036so59777555e9.0 for ; Tue, 29 Apr 2025 07:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=Yak1JtEYB7/rU6ct+aGcG7Tk4IRDAmsZREb2xKrC+G64CMQYDAUB49PLQfmxo4RPqg HfYCTyAvkbkMyvYw0zH4Uh6FJy1L/F+9TXkLIeyTrmxtVXDQtGSbxGnfzrDzPv/ZnoQM hIe84wuK6Ez41+gTq7pfRrk2EPU4TOaCb1oaIsV9dQdjJ6/a5x+NrU+inqk7QntVGMi+ jkY8q53ISnoVjc1BWXObdRd2R2aiCznsksSVTtCNKoV3BDoQfayJ4VX2K6iCgyuoOKSS DUN8+qXRYc+SRSQ6NMlXrIZg+ymvSDCAQ1CTswmXUE9oASB/6cI7tDClLFoFPLQAksCg /ZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=jNehzPmRxAWBeVu1bAwau+rjm0ALI7afdaOrUSORBpAIzxZmk0FmDPrX4o5wlzwBra 6FC6rFPl4H0B8v3GjkAcoqjZ4pM7xrThS6OmxEmwqJCh1+yBd4XAkQ6SzCkRND4LfGHO FKYLtko1mMcZqBPpcX+h+mR+srBbvAOp+vNDbKwhJuMcfMQYGhQdZB31/ECmwQsCnhfY TjUUZA0MlzLKAO/WJ2wLLKpl4jIiTRi16Vr9UiDrcEpuk2ziBTivKlO1IO2ibzZFl7XV L9CNzHkzj/KxfTcFRmVAsF9PCk0WDreLi4rCtI/yZP0wMp3oqfUCYvugaCMIdVu3DDPr pfjw== X-Gm-Message-State: AOJu0YwfmxW7ZRB+pzHHuy4wK8E5HXGjsLsPI8UCVChmNgo54zpv74nI vO29rx0ABG7Cayh5+Lcjr/H+ocb4OB7Y5nTHJzNK0FO3eoXwCBsjlVl2goaoiIZMkEJNgVr/9mG t X-Gm-Gg: ASbGnctNVvhxN1OpyzmrD+Mn6nNw9RoQ8fqLT38BbJZqfXU7h/te4Pxt8LyD2ESUZ0j cVLM+iAuHTs7+nVepQWWCJedfkvfF1Epq7CE30VvVpV/qj8IrFB4o0wEXZ92+zblYfKpMmeabF1 a3wHL5u8Lm5SeE1nIH+YYawXbItRole5ueQFOc2MFfyQcJvMj2JgTaBezmiQsHoKSxKHJaZyVSX fqa2hSWp79N7fRz6vbuNqFw17hKlyWDP8+4JF6EBpzFQWyvg915wDqz+N+JwSSvmYuVIcjynSsC +WTm5GcY9TbxrJpjJykAR0gBXxv/uuWyh1noy6cRG1ovx7F6ykuutqCKsvHE7SJutbtd4mTSBwW Fj+YEjzdEXa8v0gmOn8Sx X-Received: by 2002:a05:600c:1e19:b0:43d:fa59:af98 with SMTP id 5b1f17b1804b1-441ad500331mr25384995e9.33.1745935748163; Tue, 29 Apr 2025 07:09:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2e0241sm191035395e9.37.2025.04.29.07.09.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:07 -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?= , Thomas Huth Subject: [PATCH v2 08/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Date: Tue, 29 Apr 2025 16:08:14 +0200 Message-ID: <20250429140825.25964-9-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=ham 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 VIRTIO_PCI_FLAG_DISABLE_PCIE was only used by the hw_compat_2_4[] array, via the 'x-disable-pcie=false' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_DISABLE_PCIE (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index d39161766e0..f962c9116c1 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -33,7 +33,6 @@ enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, - VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, @@ -53,9 +52,6 @@ enum { * vcpu thread using ioeventfd for some devices. */ #define VIRTIO_PCI_FLAG_USE_IOEVENTFD (1 << VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT) -/* virtio version flags */ -#define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a3e2e007d6c..8d68e56641a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2349,8 +2349,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), - DEFINE_PROP_BIT("x-disable-pcie", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, false), DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, @@ -2379,8 +2377,7 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp) VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); PCIDevice *pci_dev = &proxy->pci_dev; - if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && - virtio_pci_modern(proxy)) { + if (virtio_pci_modern(proxy)) { pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; }