From patchwork Wed Apr 30 14:26:05 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: 886043 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883251wrq; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLUgP8jRnR4YhjwDp81RXprvn4ICSvVwV1Jv4ilOPirK7aJsJISFzPb+tfFkZeVkJpejBq2g==@linaro.org X-Google-Smtp-Source: AGHT+IHnIt0YEtbRtXWMQKKGZoIgWhRqoF9O3KKycAgsiE25UK4mOUTABKdUW72WBN6C3J1XTl0h X-Received: by 2002:a05:622a:5818:b0:477:6eca:b40c with SMTP id d75a77b69052e-489c35bcc6emr59031571cf.1.1746023249612; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023249; cv=none; d=google.com; s=arc-20240605; b=K4FGonrJPWfyniAmOEWizoXxz+m9JEu3T7ytzkX2vCyi0DHP0O3PJTMOtFG1PBTcic cZ8T9QbGL3CM7JQRf2G7cGP6ELWk69ce4UfJOa/dCpMYsG2esnYzX8ZyZy+c5K72ziNA S6J+NEgQVmt+uSerQosvbo4pKhgWoUbaJCNhAfncPvd7Qw1cbOIct8YWQl2sOWKYcfi+ dxALqGm1XZKt+iaZtmjblRTuBCKc+m7jUEnCMls3293JxyM8I1dxLQI/AqGiBo8jx64W wEngOhvKgzCER/9Vs7YemxrxjLFz8ll3iEhNWRND7aUt19MqLSZVUKQUx6cVHunLoW7P VlQA== 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=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=RkGdCktsNqeArfsWYoNQOepl9sqjcuIbSwrcR3Wf5j2PYBTxl0t6THuHOnTo8who0+ xuRc4NID6I9+sbhOBLSQ7wig0JQ7CemddEEYk+a5GcaKOWeramQQ1PBaLDQZ81GhuUXe 7jdm6w6+ekqyA3FUaOj6basusKBCj9FH4DIT6hosR7vlhi78q1qvwXk3/EqdNH3QSSOi +iqnQpq3EMUhlkiN0pwxUh5ief6fqMX/pLTyGAaIxpCj/scNHp6ctz+rkSajyqo2ZAOY VRXlhKppYOpMFkrYialaghFVUdq1mkmqPMkyquKTtva1f23FNcDwlJzVPn9mzjkzFh+h NI3Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EorfgvUi; 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-47ea24b2804si158932291cf.516.2025.04.30.07.27.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:27:29 -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=EorfgvUi; 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 1uA8Ox-0001FG-70; Wed, 30 Apr 2025 10:27:08 -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 1uA8OH-0001Dx-Sd for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:26 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8OF-00075f-3d for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:25 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7c597760323so809354685a.3 for ; Wed, 30 Apr 2025 07:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023181; x=1746627981; 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=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=EorfgvUiqlOHDcrO4TCvkJrha4KJqb70ushd/NHHSbA6eC3KGB0MoGnWOcwgj53kbH aCL1p9G9B5qGt63PXkzn+5/HrUEEJjzGyFotyAEe3DP7Qp5o40gW4YdbG+7bYzctZJB1 qAz7kOu5TRzO+Y+pH8GVWtqvG02sQAkqq322S2Q2bKVfD/Gzf90hZEUOvPGOahp6TXdB GcNFmvJ80oxJcjfeNISkBfqROBsit+D5E+eR/VGS6FnfwYu5NH5Adclb6V3HN/fm3/LU wLZlei3AQRGuk1kfsN6vokcoiTE22hah5pMyQ5YqAD9UUtL9nNXWRxuqaKrtiZxwU9Dr wUPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023181; x=1746627981; 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=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=sYtzstLiqT3DAeDPgTppdbSeuzyVJMS+vGkIo8kQUVLNqndcmNHOMQADqa5x3MVX4d 5YGH8u55AIjP+IxbQ15aEP4soHyXlX80Dga9sBMXAAZG1R59pO8viD/puuFbz0kmEPCu dTGCe6h/oeDSx/kPPyWnsXhtmTGJkavCR8naprQ8OPwChcm84BvefPGWWRSquqkTFPCR DC5ejOIEDJTUoAMbNq4nmLcqdx2kKBkVlWJxnGYpLIUnyVFNa8wL7atdvxiJv9GEsK0s zBb1MLYn6dJoKiMAIbnhwR1YKZD32i4yyRVVYDkuI08miZJVWR3DUXMqzp+BKzfABJjP uSYg== X-Gm-Message-State: AOJu0Ywa4xxbgvT2jjA34uDbJJXIB//VC8K0WILtfUYJowTpqvCnlUGy LUYL4mpaHeQAdmw3z1WUfVisLlxOCUwcIv7Dy8BOLasyrfnXWXh0+cn3MFgfqPrV0dZ8dRPz6KV l X-Gm-Gg: ASbGncsWOdWLP8dPdIHRjMfJse5YxS9OHamcQij0M6LwrUs7YZ6g1W87kymKiT4axcW Y2aFVW9pH/eT2/drozlTjJdDFj/qGD9Kg2joZyVQVQ9x0hPLZ5Epg0hwEWUhbD/3gdYyQJ3OgPS 7FvkGLNm33iaKtlejUa9gjnB7Nwd6reeiOAOUS11zupgbklnADKpos3AHH5Mzj34zvnXNbf0ZqH YH3otif0vjdTBrjCcPfK7u5RDnEVZSlhNN+GDdy8o9WMw5XkbF3MMtgbsnPcxc2XgW9LscHHL5k nJw1Fz8YZsuTlZJJ2yjDCn0EqV62TodUJaaWkVquNkDQuLfs9UU0J3n4D10nNcVCarA/BC4hr2c s/TisaID3aTbwPe8= X-Received: by 2002:a05:620a:1985:b0:7c5:95f0:e776 with SMTP id af79cd13be357-7cac740f35cmr442128685a.1.1746023180741; Wed, 30 Apr 2025 07:26:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958cac816sm858406185a.31.2025.04.30.07.26.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 1/5] hw/i386/intel_iommu: Remove IntelIOMMUState::buggy_eim field Date: Wed, 30 Apr 2025 16:26:05 +0200 Message-ID: <20250430142609.84134-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::732; envelope-from=philmd@linaro.org; helo=mail-qk1-x732.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 The IntelIOMMUState::buggy_eim boolean was only set in the hw_compat_2_7[] array, via the 'x-buggy-eim=true' property. We removed all machines using that array, lets remove that property, simplifying vtd_decide_config(). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index e95477e8554..29304329d05 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -303,7 +303,6 @@ struct IntelIOMMUState { uint32_t intr_size; /* Number of IR table entries */ bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ - bool buggy_eim; /* Force buggy EIM unless eim=off */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ bool dma_drain; /* Whether DMA r/w draining enabled */ bool dma_translation; /* Whether DMA translation supported */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5f8ed1243d1..c980cecb4ee 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3823,7 +3823,6 @@ static const Property vtd_properties[] = { DEFINE_PROP_UINT32("version", IntelIOMMUState, version, 0), DEFINE_PROP_ON_OFF_AUTO("eim", IntelIOMMUState, intr_eim, ON_OFF_AUTO_AUTO), - DEFINE_PROP_BOOL("x-buggy-eim", IntelIOMMUState, buggy_eim, false), DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits, VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), @@ -4731,11 +4730,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (s->intr_eim == ON_OFF_AUTO_AUTO) { - s->intr_eim = (kvm_irqchip_in_kernel() || s->buggy_eim) + s->intr_eim = kvm_irqchip_in_kernel() && x86_iommu_ir_supported(x86_iommu) ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } - if (s->intr_eim == ON_OFF_AUTO_ON && !s->buggy_eim) { + if (s->intr_eim == ON_OFF_AUTO_ON) { if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { error_setg(errp, "eim=on requires support on the KVM side" "(X2APIC_API, first shipped in v4.7)"); From patchwork Wed Apr 30 14:26:06 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: 886045 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883583wrq; Wed, 30 Apr 2025 07:28:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+1Dlua9Y1hvS0xQ3zoelD5oW1Vrzwz9PPh62ol30UCy+UC83i5+9p6ka8DTjekN90xtOsig==@linaro.org X-Google-Smtp-Source: AGHT+IFgkkwQTTP42Hs9lAOvcZWdiwlx7Pb0IVRXN4kbHXYnjzytMRr8+jMOiHLgAhfQcpq1sWm2 X-Received: by 2002:a05:6102:3ecc:b0:4c3:3eb:e84d with SMTP id ada2fe7eead31-4dad4b5d3b9mr1840955137.21.1746023294731; Wed, 30 Apr 2025 07:28:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023294; cv=none; d=google.com; s=arc-20240605; b=ZQbYuC5e1mneVhHyNAutk/ftY7bG69y+3AM8OPqpP2smpUhQspmTAX6mXn2lhlKZik Ou758TXUXzpWuGRXj5Ys07FErSWuRrLP8KJOOVKNDsaaNZD+D5NMTRtskGLUUGZzl6ZG uhcbj0sgioc4+RHaFqD2kSuAOjrHE2tEpnf5QepCf5k3oooZSVJYeDxM+3heow1JWiwe haNEnEaUEOi1OD+WJT5Aj1eR766IOUSSCuom6LIFbSAa7UReDVb5C5unqXL89r3opXYR w24Ngw5ducIxpITZjBWuVwCIDm5AIoeHuPuENjXW3jDnDGWAb1RHqnC19b8ROvNalUpV B/Xg== 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=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=gA+89zCg5xhnS3hGmRZHqONwB1DqXaXEKOd8lcn2tqcJw38Ja2XvirwKTH64e2b+K0 H9OiiOtscXsutzPgfo/MM1g3kmY7xg0K4pN+iWPnRyy8LsjZb7XUwbzojkhGdbSUDUAE JgxVxGsGM70opdDG0MKfZ3RC+SfSYuW/iTO4BcyGhvq7DJBcZWs+vpwZnPRzJctDZfhK N+K5uHVyV0MGQXrCz8ga76PYN7xbNI1m3B+M1kyZoquop3W0eZLK3S/tLHT45B8qI1gY rfg1fiLNXd6Ja1AfthQ7+FsWnIt7/Q4Wlq26sZYb1dtbot3EbFFXX/G13oIl2f1JpK6j Xpgw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=laY85Oe7; 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 ada2fe7eead31-4dad40b072asi428333137.138.2025.04.30.07.28.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:28: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=@linaro.org header.s=google header.b=laY85Oe7; 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 1uA8P3-0001Pi-1S; Wed, 30 Apr 2025 10:27:13 -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 1uA8OR-0001EW-Ck for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:38 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8OM-000765-Av for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:35 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7c081915cf3so1177716085a.1 for ; Wed, 30 Apr 2025 07:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023188; x=1746627988; 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=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; b=laY85Oe7/k0g2bXHnk3xoPtuAJ06mQmd1glTk+q3ik+qFwroDjzdZE6kNscZwtjkWq aGfp6u6VJ8WyLFRopKZxAibbYUTaubi2guTzbIFsqyWDtYFDTUi1kSnDayoHnxl08Ue4 1y0KmPy00oE2IuOPM0kzC0SjTbDNmM/CkxjiJAQOoD3My0sSr2QSb2VQzntJsOLXD1K1 Q33CkaNjSrZXRJNTP+wfOktk6fFmrGJNk2ktKoWRTcZdqugWkP3Q2NwzXVxoXErx7Ooq 1pXKfjcoQL05uWxEnag7B8ec7EDK/BKbXA4Uskl6AQuqO+47jBetZcbFqhEqS9OHguXJ v84g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023188; x=1746627988; 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=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; b=NEpMYwSesLOwHYjZM+//vhHM9NIR/ww0dIw9axUQjABvauuqmSnrzC7IGrbiO5ejKP dD23+runMrH/Z3TMHs/oprYZTnJWKXPH5Kl/W8hnjiyBPIT/WJ0xpo1oLZqOX3KmkszY Dws0xc2gnnuhdVMIwqROQrb+QkVN6xeSw0MWVH/1BmKnpQ2ZpgqAGgrIyEiiCESYe9Gn rkO7IcI1Fjb2nDtl88D/DBr9lC23uZ0jgiVrfXTgjy6ucnuLjklJJW872+wDYasgZZ5v 4iKEM2DFt8RchZkZdLmrXw44HkHn61b82ojdUWa+QPeADlz1cWdv+dxh19dji0xnchIz iHwA== X-Gm-Message-State: AOJu0YzkPxrnZOOOENGeEYo3EKzLx3ogWQ5rPjeGq35w0KusKYum7vLm sJtRp3FZt/kGmDAtnItBswdq+slmFmcrYa6uVDW8WU9qhu9gH7AxCfU3lE6V+CsaNpB7e3ejoO7 P X-Gm-Gg: ASbGncssb2BIt2297KjHdZ3WqJDMgb0p2BRWAWksKrkctmscMoCf+fnx0hpGLs8ud6J AOfh6HE8Y7bt4eP4e2CBu9AOtIjA8Mq9JafPG8lBMF7JgjtcPUSkLS6Ezsh87JHHca5SIzYvdhl hT+XAUKHP84GPBi6EMtkAoAj8DwkrwhXZjH9mEg0iBshRBG9gQRKmmNJnwUSxUs6H/q3HLDPoWV AQKXFdpd7ZFxq3P10UoeMbF7YGqn9L7cSoM+iznItGqZ/BFVHMumc/5TWo+5kwoENSDQpq8LMB1 cJS9fEjYjFhUWstRejMTDO0lPSlKSfeTnJRTUDiB5MyBeRj+lVzeYsgUf55S4zowNTSzFmZlhLG sPPQX0znyz3uq9ko= X-Received: by 2002:a05:620a:469f:b0:7c7:56ac:1e89 with SMTP id af79cd13be357-7cac7dd38b8mr379745885a.3.1746023187979; Wed, 30 Apr 2025 07:26:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958d87309sm859262085a.80.2025.04.30.07.26.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 2/5] hw/intc/ioapic: Remove IOAPICCommonState::version field Date: Wed, 30 Apr 2025 16:26:06 +0200 Message-ID: <20250430142609.84134-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72d; envelope-from=philmd@linaro.org; helo=mail-qk1-x72d.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 The IOAPICCommonState::version integer was only set in the hw_compat_2_7[] array, via the 'version=0x11' property. We removed all machines using that array, lets remove that property, simplify by only using the default version (defined as IOAPIC_VER_DEF). Signed-off-by: Philippe Mathieu-Daudé --- hw/intc/ioapic_internal.h | 3 +-- hw/intc/ioapic.c | 18 ++---------------- hw/intc/ioapic_common.c | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h index 51205767f44..330ce195222 100644 --- a/hw/intc/ioapic_internal.h +++ b/hw/intc/ioapic_internal.h @@ -82,7 +82,7 @@ #define IOAPIC_ID_MASK 0xf #define IOAPIC_VER_ENTRIES_SHIFT 16 - +#define IOAPIC_VER_DEF 0x20 #define TYPE_IOAPIC_COMMON "ioapic-common" OBJECT_DECLARE_TYPE(IOAPICCommonState, IOAPICCommonClass, IOAPIC_COMMON) @@ -104,7 +104,6 @@ struct IOAPICCommonState { uint32_t irr; uint64_t ioredtbl[IOAPIC_NUM_PINS]; Notifier machine_done; - uint8_t version; uint64_t irq_count[IOAPIC_NUM_PINS]; int irq_level[IOAPIC_NUM_PINS]; int irq_eoi[IOAPIC_NUM_PINS]; diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 133bef852d1..5cc97767d9d 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -315,7 +315,7 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) val = s->id << IOAPIC_ID_SHIFT; break; case IOAPIC_REG_VER: - val = s->version | + val = IOAPIC_VER_DEF | ((IOAPIC_NUM_PINS - 1) << IOAPIC_VER_ENTRIES_SHIFT); break; default: @@ -411,8 +411,7 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val, } break; case IOAPIC_EOI: - /* Explicit EOI is only supported for IOAPIC version 0x20 */ - if (size != 4 || s->version != 0x20) { + if (size != 4) { break; } ioapic_eoi_broadcast(val); @@ -444,18 +443,10 @@ static void ioapic_machine_done_notify(Notifier *notifier, void *data) #endif } -#define IOAPIC_VER_DEF 0x20 - static void ioapic_realize(DeviceState *dev, Error **errp) { IOAPICCommonState *s = IOAPIC_COMMON(dev); - if (s->version != 0x11 && s->version != 0x20) { - error_setg(errp, "IOAPIC only supports version 0x11 or 0x20 " - "(default: 0x%x).", IOAPIC_VER_DEF); - return; - } - memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, "ioapic", 0x1000); @@ -476,10 +467,6 @@ static void ioapic_unrealize(DeviceState *dev) timer_free(s->delayed_ioapic_service_timer); } -static const Property ioapic_properties[] = { - DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DEF), -}; - static void ioapic_class_init(ObjectClass *klass, const void *data) { IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); @@ -493,7 +480,6 @@ static void ioapic_class_init(ObjectClass *klass, const void *data) */ k->post_load = ioapic_update_kvm_routes; device_class_set_legacy_reset(dc, ioapic_reset_common); - device_class_set_props(dc, ioapic_properties); } static const TypeInfo ioapic_info = { diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fce3486e519..8b3e2ba9384 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -83,7 +83,7 @@ static void ioapic_print_redtbl(GString *buf, IOAPICCommonState *s) int i; g_string_append_printf(buf, "ioapic0: ver=0x%x id=0x%02x sel=0x%02x", - s->version, s->id, s->ioregsel); + IOAPIC_VER_DEF, s->id, s->ioregsel); if (s->ioregsel) { g_string_append_printf(buf, " (redir[%u])\n", (s->ioregsel - IOAPIC_REG_REDTBL_BASE) >> 1); From patchwork Wed Apr 30 14:26:07 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: 886044 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883504wrq; Wed, 30 Apr 2025 07:28:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVUs2XYQGRmXn2GHjtQls7/aAAl4fPyEYvoovtr4P63SwLrPAuB0QzFloI1IDDPnnzUA7iZQ==@linaro.org X-Google-Smtp-Source: AGHT+IHELHdieU+baksJOZ6Nm4tWdisQAAijL7YZoaaK3j/S6iU/kGXH2dLl+KYird3Gsxk7C1OZ X-Received: by 2002:a05:6102:82c9:b0:4c3:64c0:8b14 with SMTP id ada2fe7eead31-4dad412d5aemr2100122137.3.1746023281422; Wed, 30 Apr 2025 07:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023281; cv=none; d=google.com; s=arc-20240605; b=FT6cY6ylqhmL3J+YoqwS4yMp7lPvHI71fRdn1VVLrHzqKrzX0wN6/NVJd2fl9MK1rq ojezAxjEsirNEG467Qhg0XZabRCWGr9cIoQQuD+TaO16m0G833djKZkNGO7/nMqSJHgZ opCisuaebrlsO+RnlxNmD2VW2Dz9ZbSus1Q6rX9wQOEdsMUDGYkeiHg9aZcfojICOIpe mHDfZ2GwJAN2Hrn84XGP78/OlJKNx+kgVIkHwaUviGfcbaL5XF6sMbQhosNY5I8QDt9E 9lEKAn1GDlz0KWq110vZ8KZ5SGnSrrO5XB1J8KY/es2f7SPAYq/b+naOGIu6phFHnL4Z AnGg== 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=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=lFsejEdUkSVahD/JH4Aa+5l/KJMROUzLfqJsvhsSpb4wYrOQUrrr4McY5jCGcncEV9 mm8S5nKwMtQYRV3OYToRZQ3iQSFG74JahXOyYKY/nCi1gz6pkSLJ87Q9zjRKI+5LllIh C2kaKDYnGmiQ7oYH6NIHianxr9a+djIKvFmoZhRvFrt6x1FK8oj0SHtHm7psONbHSEAV CQaN2iZHrTmTBjoRnuvo52ftVx1qKuBkLWsygi/VXBXX1l1zOG3e3lyZ17RSBtZPfvFY tZJFX1LkUcRS48rw1T01Mrv+tZmoRHrefux4oXqoAvAJd013VZ0Q+mU3/bMWz3GDxjJT RnyA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mcjjehhp; 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 ada2fe7eead31-4dad40dcfd3si445195137.180.2025.04.30.07.28.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:28:01 -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=Mcjjehhp; 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 1uA8P9-0001Yi-4F; Wed, 30 Apr 2025 10:27:19 -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 1uA8Od-0001FY-7O for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:27:00 -0400 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8Oa-00076q-VV for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:46 -0400 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-4775ccf3e56so12835111cf.0 for ; Wed, 30 Apr 2025 07:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023201; x=1746628001; 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=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; b=McjjehhpwnwT2lp1ICgRWWUoIT07IYKapu8Ch1x58d0xpLufKDFc5HfI5iGHCAh22+ tzcIRQnZqx3BUtWYyyl9A82lDcxvoUzom+2XJY6lCD5Pdm+P7OMXoGegx9oTbnxit11h NWN8X4fcbuWSbB/UcNImr1B9KGpZS4+5BpJESoqCJcV1h6XhZpERYkvhWj/7W43Sd+A2 ifLVwVasGhpkGK3zIpGJLKimgBcQazHNBWK5L7uv9fW2XUxg5AGBg+gPE1k5fe/UQyMt +8MraCjD5mzLp0XswsRIoHLBRvxOgUWBIf1HEOt2aulS+favnTmKiL19wcbd8wYXC5gF G6fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023201; x=1746628001; 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=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; b=ILHvFtYxbulEahaPXm3tjBDI9yMYA5eQK9bFLnFpFzdBsLCr7LUUCpR9T7oXj+zWDT MXugFqsTwgIIgQ8uT2Nq1syG7nvIg+hfgkvkhUlP0OEnh2sMEnPqRbnROePsH7US7jm1 NCRD8IsfqVRG6nlkNygmra4lZXkUPTXddLb7IPe0OBrLj1c5GbFgMt1/kgw3oVaIvywW 2XKuUJCpc1GT+GYhYqEanniF/0wYzZQ8ejCxe4kAd2NXgkAtUa4mrWxJE1KSeUiHnmpk udRgImaWefXEgm16q/SOG3EqPkZroj3SRJjVbL3HpPsg6KAnRTRQm9uwgmZeT77I8ZTQ xzVw== X-Gm-Message-State: AOJu0Yy2iSPUlfGNCeJQEFRvP1A6cXW0XZ0wyLw4Ddv+ceR7kkRCK/+x +hTnuFsZZESAa/D17v2vQwCTK41PVX3fwJPgSTShNboWTVP+MH0TLJyVNULO0kfUnU895ucgW4/ E X-Gm-Gg: ASbGncsh7z7lP9Bv8guxGM6BslVUKHtiKpB++3x7EeeQKkTTfFLanIXbUWzNI10Qtoe 0zm22nstEIjnKVeWFgelKBHH1a7pcsViftlBbLhSrdei0Z6058X24pBq47pN6Vic94D+anpLLWk YL5c092RaR1Bh72PpvlUXzYXy3klgUMdpSjnce97A1+grgOi7Ug2waRqpO9wGJtLeOtf2fcCsSS CN5FOc950AetnZ5Z8A7KGXpIFH77xr5WWPoVbeKuj9dSerTpvdathet/LNvFT6p886qDc0RqWxL aKg0APcbVZeSnjkLZ/cw8acSzEs8jHZtNEhvRLWcN8nnIzbVkOdkEzBWAU0ShJLH1gdGp/fN/tH xndquR5RAl2CBgNo= X-Received: by 2002:a05:622a:17c3:b0:475:19cc:a81a with SMTP id d75a77b69052e-489cdce5f30mr50498161cf.21.1746023201331; Wed, 30 Apr 2025 07:26:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47e9f7aa2absm94274001cf.46.2025.04.30.07.26.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 3/5] hw/virtio/virtio-pci: Remove VirtIOPCIProxy::ignore_backend_features field Date: Wed, 30 Apr 2025 16:26:07 +0200 Message-ID: <20250430142609.84134-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=philmd@linaro.org; helo=mail-qt1-x830.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 The VirtIOPCIProxy::ignore_backend_features boolean was only set in the hw_compat_2_7[] array, via the 'x-ignore-backend-features=on' property. We removed all machines using that array, lets remove that property, simplify by only using the default version. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pci.h | 1 - hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index f962c9116c1..9838e8650a6 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { int config_cap; uint32_t flags; bool disable_modern; - bool ignore_backend_features; OnOffAuto disable_legacy; /* Transitional device id */ uint16_t trans_devid; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 8d68e56641a..7c965771907 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1965,8 +1965,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) * Virtio capabilities present without * VIRTIO_F_VERSION_1 confuses guests */ - if (!proxy->ignore_backend_features && - !virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { + if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { virtio_pci_disable_modern(proxy); if (!legacy) { @@ -2351,8 +2350,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_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, - ignore_backend_features, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, From patchwork Wed Apr 30 14:26:08 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: 886042 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883247wrq; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAh25rsCCkS0+P9T9rPjqWa+gvVo3Vsgzug2pShKVFgngaflj5dyyxwNsPExLYERPkJ5b0dg==@linaro.org X-Google-Smtp-Source: AGHT+IGQGv2ofoqf8NjfCeYT/NU7YUcnd6cByPIgxocLE6slC+PygoHliHjfSmb4kOSJPvEnZ9nT X-Received: by 2002:a05:6102:c15:b0:4c4:e3c7:cc8e with SMTP id ada2fe7eead31-4dad4b611e0mr2104408137.24.1746023249264; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023249; cv=none; d=google.com; s=arc-20240605; b=SIdRoTk5F67mU9FQkYQYYxGuy60Irvz3PY/+q9/vaRjH6zvP699KxfcW0lyHFE1uWb J04pRxV6MoH7Z2MNhWud26gm+jo3H9Kx0kvWZfMz6XKUa5fENxdECx0llEkmbR7UyK/7 TscOwVHt7DH1PFlZszhvxdYmBvlxytrB3HCnewOGt72Tmfs9JBKA0uSF1kfk2Sr3+o+O AjC/e35TcliDD5jIkiR7nkaWUe0DCQhWEUHoboOC0HzultgsKQWVW6b6to2cT29nLWs+ pj/Thw4d42hrgwv9pFQmYMoedqO5hTTG2wJd/zy0RzCDNqIU0hRw9MnVFOI52onL7Lxl Y2Og== 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=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=bLeRDSoj3l1TbP4ZtReIfL8GLqSosE+KPgoe5e8wbgliVATmV3IfevgN44CUARfFJF TrP+F2jt6MKyd7NEdSgxGKG7IMuwbL06/Gu2sVb43RdmQSiLujxomoeCL8q8o3gnYPHk rlB8g+ntFZz89ybvdj6v7UFOfnrkh4Xi6k6RvyH0pr+oJ7n75/BVvohiZJmcWeZzWnnR ug1amYx16cLSH0mtHxsh2nNFKqT0W18sNdtECkxPMJCVEDf+El8OysDdApbgEVIxFALA lOdc69R7p2YsahBMuttMIqSF2iM6yz+1gRiR+dPmDNfT79h9jq+CQKC/yOamxdzVnTer /54g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJXNs4g4; 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 ada2fe7eead31-4dad40dce5esi408211137.167.2025.04.30.07.27.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:27:29 -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=XJXNs4g4; 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 1uA8PG-0001fW-Cb; Wed, 30 Apr 2025 10:27:26 -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 1uA8Oi-0001Hp-FU for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:27:01 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8Og-00077b-CZ for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:51 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7c59e7039eeso1002332985a.2 for ; Wed, 30 Apr 2025 07:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023209; x=1746628009; 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=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=XJXNs4g4/CECHEBVM94ehfMQKXmcE+Sn2jz7SrpxonivDIN/DwCbjAgZv38YRPmGPM j8m1m/A88SDGi2/XXxRPWuxjiqqf5sdnPIHQoc7jMSCSDY3dT7KoGhDUYStpZeMzrsJZ 1t0pH6+YyOZVVbaqKTchicolgKnYGnL7g8zDBNqHQpSCWoc8p8IBylcyhuvHLfQ83MEh YIunNBlvbf8oTVdniKqeFTBcCxzX6HPLkXaj4Xn7xKuwZcxu/wRGqvSyU87aHBsa2hGn ENbwgW65e8CJ9BwHpl33uyrT9xZWiD5lZdVu+Ucr2hG23xk1SxnnkE1a4WQ6E9RrG0tm J+jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023209; x=1746628009; 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=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=lJHv6Wx+bkQ1O3zJy/wrLsIE+lOxiz/e8T14yuc9buKX8kd+lTk49f+15Ypgd/5Pg7 OC5qmPtYaRDRzBMNLZMX6fMectOCNeyEcsd8T1+ugY1Z/Vew32MJq7qjUhnObq3DopGT FBT7SxE/fXF0hCPUU7SQoZisjlO77YTj8Ttvs9n9MrOu3Ku6BGqcMjupmQAl7ZxJrh5x 6fyjkxlOXxq5Vm3Y+GPDeCbXzayVcKpV4MR08a46XOUuQoTkRqgCRgPoZZaLHjffrpDe r6WSkQLBjY1A8hbwTsttHDCT27RHZ/LEOpRWScTR3SzRp7cFUjU2sC53Y9rBzq1JOAlD vHQQ== X-Gm-Message-State: AOJu0Yyrgzz06EEVasffm42ujor0v6i8tC3PqMl+wxwzimS9vvU9Udqu 2pDxvKZW0/v4aHcn+Mtfi7omETf6KDvlJD3zdz4MLr2m50WgBAKr1bKKazgmhtaKoyVq8C8eRud b X-Gm-Gg: ASbGnct5tZJPaaVyeYZOF17d8RdAstMRTwPYtzKGWULZz25tDKAeLf+VsZLb9/NpsTr +jA3crnpfA+f0qmT6ZFoo8Y6YYhiw3tE1QVyhXKaV1Rqq1kPGRwwyJC2pPBpTJU/nG4nTTjXV0E Bfnl3npUC30PGWrOmEnrrCKgMctId8dOJWvCmrc65xeP8OwxzrO1l1LPvA129e6pBir7HBVwxuS PZOFDM/3EnB3iiWGxGSfI8KYpysBAwCKZHfKO1irCkW7z1QlFUs39pbp0d4vH+H8S02L4yVeIpu cLaH43oxn2w1dQcvlEBjlUVfBjDCJvwl3UhTrzG3FfxbH2PXSr4aijp6ENbDKeCdciM6xO5n9GN /r9I1AEAAwYVIQOg= X-Received: by 2002:a05:620a:29d3:b0:7c5:a2f8:e6e4 with SMTP id af79cd13be357-7cac7e1db3amr389000785a.29.1746023208843; Wed, 30 Apr 2025 07:26:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958cbe447sm861896785a.46.2025.04.30.07.26.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 4/5] hw/char/virtio-serial: Do not expose the 'emergency-write' property Date: Wed, 30 Apr 2025 16:26:08 +0200 Message-ID: <20250430142609.84134-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::736; envelope-from=philmd@linaro.org; helo=mail-qk1-x736.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 The VIRTIO_CONSOLE_F_EMERG_WRITE feature bit was only set in the hw_compat_2_7[] array, via the 'emergency-write=off' property. We removed all machines using that array, lets remove that property. All instances have this feature bit set and it can not be disabled. Signed-off-by: Philippe Mathieu-Daudé --- hw/char/virtio-serial-bus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index eb79f5258b6..31bd1b7535d 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1019,6 +1019,13 @@ static void virtser_port_device_unrealize(DeviceState *dev) } } +static void virtio_serial_instance_init(Object *obj) +{ + VirtIOSerial *vser = VIRTIO_SERIAL(obj); + + vser->host_features |= BIT_ULL(VIRTIO_CONSOLE_F_EMERG_WRITE); +} + static void virtio_serial_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -1155,8 +1162,6 @@ static const VMStateDescription vmstate_virtio_console = { static const Property virtio_serial_properties[] = { DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, 31), - DEFINE_PROP_BIT64("emergency-write", VirtIOSerial, host_features, - VIRTIO_CONSOLE_F_EMERG_WRITE, true), }; static void virtio_serial_class_init(ObjectClass *klass, const void *data) @@ -1186,6 +1191,7 @@ static void virtio_serial_class_init(ObjectClass *klass, const void *data) static const TypeInfo virtio_device_info = { .name = TYPE_VIRTIO_SERIAL, .parent = TYPE_VIRTIO_DEVICE, + .instance_init = virtio_serial_instance_init, .instance_size = sizeof(VirtIOSerial), .class_init = virtio_serial_class_init, .interfaces = (const InterfaceInfo[]) { From patchwork Wed Apr 30 14:26:09 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: 886046 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883780wrq; Wed, 30 Apr 2025 07:28:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV91ANtKRoUrBNL/UPMw5vb+BwoYlogHJC/+yJOrBjSN9ch3wYcXa4WGzFhPRrktbkL2boDXg==@linaro.org X-Google-Smtp-Source: AGHT+IFKbthOPqovcm4jfB/eBBLUl7mKm5IVpGOHzN8kDp3thk1UtDhk/EGx9QH4vDO28BPPUBna X-Received: by 2002:a05:6122:46aa:b0:523:dd87:fe95 with SMTP id 71dfb90a1353d-52acd87becbmr2635583e0c.9.1746023322772; Wed, 30 Apr 2025 07:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023322; cv=none; d=google.com; s=arc-20240605; b=Sw9aOKlkxdG5+cVHVFDOEJD8joWaDwtS9Fub64BIWw4EcfoLsKlhOCYdPlRkDsNS6n 4Katom7LsgJKEzJUdGKZrar05XudDCQdkla+aEomNLoOSrwgqjOXJG31H+5I6ibj6CgM RGVrscwcjjtwc0IX6Hcxk29Cq5utZzpDXBzOBM4sODAxhyTNhNR39/JVcs6XdsJxlWgW 2Ek2E3kLVaOGjEhyvceCa2ZFuYXwcnxA9oPkgYPITH4cUBUfF9aHDR7liAGD3k8Qb6Lm fOx9J2JrZtYVJnx7VekzS7K0os8fuVq1ZjFltiOLBZqKr2ewt8OdbVWScA2iAeSpN6xG DWdg== 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=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=AtJydcQCjAyicGh6bP2DYWcOhoNhwmXnhSAI94XwRqc9VshOsKgLpOpCt+EfELAyIH MsVbD5kH//H6UKRFVYQCq4xAbo8U5ISgl6Wsh4VmQWNtjvU9dnrYNRoErS/5gf2bBdTO cmjT7TTT9eqUgKqdHX7gLoHQ5al5jrUJgYxidDGN2+qqpDrzqXm1YoAmdba5lTcLINhP Xe6x2xlIZdqlCqZZJJq8Wz2GeZVFcPY47JCZsvhmfQy/9TW6G8mSrX2CHP02qz9792OX oONFokC/q/pnm5KqM8EKKxFnS02M5TXrwRN4xQ3IMWBMJBEbHLNdnBgwslGeSjrpi/nx 8Vfw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FP2IhDW9; 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 71dfb90a1353d-52ace3168e4si464852e0c.5.2025.04.30.07.28.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:28:42 -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=FP2IhDW9; 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 1uA8P8-0001Xx-7D; Wed, 30 Apr 2025 10:27:18 -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 1uA8Ot-0001KT-B7 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:27:05 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8Op-00078I-6n for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:27:03 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-6e8f6970326so82985526d6.0 for ; Wed, 30 Apr 2025 07:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023216; x=1746628016; 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=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; b=FP2IhDW9K0SvWemtP8zwGPxWN0JiotsRyFuGOxa/Xq4Brhp2rCd0NGybgoCnlH55qu mxDHKjlnUlOIF6R77E+DBrvETXAoutCP3Fa7vzaLR48TfiZXKvgim9/ilaylgH/eQw/x JB7gj0qIMmsyXeQd0mYNUBZD20hQKcTLLe7bLqMZRXLbz/GjHBykl+dF4GpNgX5uanCf dlotbDwN4/3ZipO/A6lq1HXSK/d+xQF6vgFcm0LGwyQEDAvQUUUUM2PwQPIOhJXgaunv 1wOKKCLU28Dyn4EwSthqyeBCAfoD/WIdpaP52jbwT11aNXaFpf62He+q09fEHyr5rRVQ jvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023216; x=1746628016; 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=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; b=wg7q+nMgt/HvgMMWWkVdUUoHJnZtlyF/tiDK3+jVajXg3ZfRP1wgsyr2ksdJDoznpe +MSllc2A5A8zR3erPfWg9TS5YBNKgdsg8VXclnA3wLa9EoXg9Aj5wunB1HN52pP7FPcp dR1ufXZpEnzQfuFynJzyyW654ymHbuGb3U4DdEICDqRKH2cbRK7BdywxAd+VcCV9Y50+ lvIbDzUGr31M/9HI+GM6JDkjYbssRU5bTMyULzZi4I1ycSGfGaMjIMGDxCv8QD6NxB+y dIuvhRGmAc+Gyd2JhZSD4qaqhvcx3lgiMoF7YGjzXZqy86TZytbrzvDsx9tIXbVA2w/3 hxkQ== X-Gm-Message-State: AOJu0YwzQdwkGEXsehtqnYKSbwfTTmWT97Gv+D/II6Eukpo9FZf9RB1H IYFK9+EKuSH1SmBDiiRp+fKmUPdNUmNTfsDTNeIf7TNwxHIBR8JydTSDa3rWpGX/U3HZj9YMng/ V X-Gm-Gg: ASbGncsNTEPOgvN8d0c/A7NWaVOJ34Fwp/s2QAKa+u/NJjvchtuuwMiNAqgp2qqVoL3 NqeQXlp5UunGtucrMNRNuoP8rc9VNmEED9WoHHAQtGZ4RbnNM/rBPFf4HB0OkMEf+ZGgiTlsH8C AuZ/HgFUS4PK1XsOmxsVk3irSIZy9phjyrZnaN0NIQ/Lsdell0LzQvp8IbNQIgBHkPzMALtf55j My/RyV1d2pf9XsPZu8mErQPYBgPkAAipJP5wm9r00qKbQ/fidYrG5VJ/0ngYfShKQP9QXzrgECV kCZnAu+NRsN7cjlKFL9RFA71CLjZQowRA4bbItfg0fM1RwssmhsizMLARw+a0gcK3J+Puj72RZg 0oWvDMqt2o5JQgPc= X-Received: by 2002:a05:6214:2405:b0:6e8:fa33:2969 with SMTP id 6a1803df08f44-6f4fce7b58cmr70829346d6.10.1746023216254; Wed, 30 Apr 2025 07:26:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f4fe6d1933sm8798406d6.40.2025.04.30.07.26.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 5/5] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_PAGE_PER_VQ definition Date: Wed, 30 Apr 2025 16:26:09 +0200 Message-ID: <20250430142609.84134-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f35; envelope-from=philmd@linaro.org; helo=mail-qv1-xf35.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_PAGE_PER_VQ was only used by the hw_compat_2_7[] array, via the 'page-per-vq=on' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_PAGE_PER_VQ (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-pci.h | 1 - hw/display/virtio-vga.c | 10 ---------- hw/virtio/virtio-pci.c | 7 +------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 9838e8650a6..8abc5f8f20d 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_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 40e60f70fcd..83d01f089b5 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -141,16 +141,6 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) VIRTIO_GPU_SHM_ID_HOST_VISIBLE); } - if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) { - /* - * with page-per-vq=off there is no padding space we can use - * for the stdvga registers. Make the common and isr regions - * smaller then. - */ - vpci_dev->common.size /= 2; - vpci_dev->isr.size /= 2; - } - offset = memory_region_size(&vpci_dev->modern_bar); offset -= vpci_dev->notify.size; vpci_dev->notify.offset = offset; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 7c965771907..4e0d4bda6ed 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -314,12 +314,9 @@ static bool virtio_pci_ioeventfd_enabled(DeviceState *d) return (proxy->flags & VIRTIO_PCI_FLAG_USE_IOEVENTFD) != 0; } -#define QEMU_VIRTIO_PCI_QUEUE_MEM_MULT 0x1000 - static inline int virtio_pci_queue_mem_mult(struct VirtIOPCIProxy *proxy) { - return (proxy->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ) ? - QEMU_VIRTIO_PCI_QUEUE_MEM_MULT : 4; + return 4; } static int virtio_pci_ioeventfd_assign(DeviceState *d, EventNotifier *notifier, @@ -2348,8 +2345,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("page-per-vq", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags,