From nobody Sat Nov 15 09:31:56 2025 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=1752776415; cv=none; d=zohomail.com; s=zohoarc; b=aZrx2ewiIA9+wZwKEzTqJyLUAU4np+5YQnmyGPkp9uC2CqcsPZys2mg6pDmhrk3/NgAcavQ7YiEoZaNA/ft5TX7GxCu5Y9xPVKDL5s0gxvZdW8H80mJHqvrmV8DmUUUkGC+uVPv6iUGdKcUaJOEhvFoY5Ks8CeCM1E3KSMusRks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776415; 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=PLrQp95rvm2mOaUAqrOiIgoBJpm3/ZUBPdW5pZC03uU=; b=DEicqqiGiS6MmcEOUqodus6kuhX3Bx597s7unbBo1PBQpSd/EVIWtFLaMO6kZOsM0Zd3kZfNXCRnNfasbqPK2F9nqNzBgIIyV3My85suHZJzFvRfr0qdJkX1d0gcY5tL9FZpnJah65qxtThOv1HqageT9rVLFQe0QEiFdmBzt4E= 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 1752776415512652.4214726669975; Thu, 17 Jul 2025 11:20:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCl-0004bw-2r; Thu, 17 Jul 2025 14:19:39 -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 1ucQSI-0004Ze-5s for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:37 -0400 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 1ucQSD-0004Ix-BU for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:27 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-K1fR04njPfOHjuetRlhS7w-1; Thu, 17 Jul 2025 11:23:22 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a579058758so514545f8f.1 for ; Thu, 17 Jul 2025 08:23:22 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8dc201asm20872582f8f.22.2025.07.17.08.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765803; 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=PLrQp95rvm2mOaUAqrOiIgoBJpm3/ZUBPdW5pZC03uU=; b=PYIuIYBWUaNem7sPX4/eva6+03RURBx+cCMLLWXeLIALAYIFVirjll7yqHPES+DLWyciX4 oCI2YznxiCz51BdBI4BFIFQ1agh9jz/drykY86hPHgLlWwEzo70fbAyPFC3honImcIoQct qiqjKMdqZzz4lRyQoLHXlvBHIBmuGg8= X-MC-Unique: K1fR04njPfOHjuetRlhS7w-1 X-Mimecast-MFC-AGG-ID: K1fR04njPfOHjuetRlhS7w_1752765801 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765801; x=1753370601; 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=PLrQp95rvm2mOaUAqrOiIgoBJpm3/ZUBPdW5pZC03uU=; b=hpz1uJgGRhYnLOT7Oz7TAHQRUFxgh5VDnB4/qC5JGD3Z/L/P/IP+X3GFNa3ks/bopr 6xt7LfH7EFIjHqmmLiaqOmCnn6D+EqaMks9TyhP1XfV5SNFgF2lHpJvrc5Wz0lEgW8cv kWkI7CB4/1OrAFf+YGABa48TNoMl+MGBKJv1qlssKMirMSC3dgWjyL7nz6c9kvDyradv 143MHni78c9wZ59rzqWt4bm49Ot7uZM5vhbD7EdXmjPmVRJJlGcvqNTx/5IgizdnyPHZ oNI2xvZlhReW3h4kzyOwrAnaJK7t6oMEpxsYTIyiD38j/UIEouKT0tvnVrLXag1TPBY/ jwmw== X-Gm-Message-State: AOJu0YzKD3Sw3f7sJkbT9i6/qGqDefGLWm4MUmphefpbTxF0dUSEGzH5 eb/jUO9BFSeoM8yO1zhWMfWlVlEX+AlExQjYR3ugXTydkZ/Bb48Ef86tjjtAMzqXq6qhOyyoQPy gm1u0aSwhyiNKMrr4ogVbrFUvwDQvR3fRi17EHVR6vHu5XiVXnrUPdjKHsKSfBYEFDucn0QLsA+ wlO8gPBBhxI2zfJgtkhJJYBy44CsJF3BOgsLBvuP6V X-Gm-Gg: ASbGncsPjBgdsq0kKyAJBN+JjdRuzyNCQyJfPaGKMmigYBCPsYypRslT8QQYnLQnBkx kAaX5HHIPvaNiTFEGkvg6uxLJq7WPfGpWIH1G6Qpcu9AFYcGwfBwWQEAwFbpHteZNrVhJmDkLMj W4ajfvVKJFvBlxVotldOuBJBLoj9g1eEoIaN/Yf9QyaLmAdSQ16e7Wy0DaAtowx4EFLM513nM9l 6oHX/wLDVGp1qrz2XG9WTC3/URfBgYSSFPpL5nUKjQVT1+uCURTPjWGHF1Ybn2RC8avDNvZ0Mn7 3doMbVJGlgmJcp62R9znnAQmUzS2GWb7k6K0oE4jJh4= X-Received: by 2002:a05:6000:2309:b0:3b5:dc05:79b with SMTP id ffacd0b85a97d-3b60e4d0099mr6503458f8f.14.1752765800791; Thu, 17 Jul 2025 08:23:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/U4DO+6D9826sjBAaP2oN9fAONxAYlfOKVSI3zpiTHiKBxJkhSr3Kzuulj2jB5/RdaIz39A== X-Received: by 2002:a05:6000:2309:b0:3b5:dc05:79b with SMTP id ffacd0b85a97d-3b60e4d0099mr6503397f8f.14.1752765799841; Thu, 17 Jul 2025 08:23:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Alexandre Chartre , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Xiaoyao Li Subject: [PULL 1/6] target/i386: do not expose ARCH_CAPABILITIES on AMD CPU Date: Thu, 17 Jul 2025 17:23:11 +0200 Message-ID: <20250717152316.353049-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776417385116600 KVM emulates the ARCH_CAPABILITIES on x86 for both Intel and AMD cpus, although the IA32_ARCH_CAPABILITIES MSR is an Intel-specific MSR and it makes no sense to emulate it on AMD. As a consequence, VMs created on AMD with qemu -cpu host and using KVM will advertise the ARCH_CAPABILITIES feature and provide the IA32_ARCH_CAPABILITIES MSR. This can cause issues (like Windows BSOD) as the guest OS might not expect this MSR to exist on such cpus (the AMD documentation specifies that ARCH_CAPABILITIES feature and MSR are not defined on the AMD architecture). A fix was proposed in KVM code, however KVM maintainers don't want to change this behavior that exists for 6+ years and suggest changes to be done in QEMU instead. Therefore, hide the bit from "-cpu host": migration of -cpu host guests is only possible between identical host kernel and QEMU versions, therefore this is not a problematic breakage. If a future AMD machine does include the MSR, that would re-expose the Windows guest bug; but it would not be KVM/QEMU's problem at that point, as we'd be following a genuine physical CPU impl. Reported-by: Alexandre Chartre Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Xiaoyao Li Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index e8c8be09bae..369626f8c8d 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -503,8 +503,12 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, * Linux v4.17-v4.20 incorrectly return ARCH_CAPABILITIES on SVM h= osts. * We can detect the bug by checking if MSR_IA32_ARCH_CAPABILITIES= is * returned by KVM_GET_MSR_INDEX_LIST. + * + * But also, because Windows does not like ARCH_CAPABILITIES on AMD + * mcahines at all, do not show the fake ARCH_CAPABILITIES MSR that + * KVM sets up. */ - if (!has_msr_arch_capabs) { + if (!has_msr_arch_capabs || !(edx & CPUID_7_0_EDX_ARCH_CAPABILITIE= S)) { ret &=3D ~CPUID_7_0_EDX_ARCH_CAPABILITIES; } } else if (function =3D=3D 7 && index =3D=3D 1 && reg =3D=3D R_EAX) { --=20 2.50.1 From nobody Sat Nov 15 09:31:56 2025 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=1752776416; cv=none; d=zohomail.com; s=zohoarc; b=GLpd4qWXSTa4eDImnCwCM2CyhU+KDXF36cdgN7BQnKbRbT81RovXbWvWNhir6ez4RN7lFM1wWcCBn37ED6FaR/mogp/280c3hRJof64RTYshitLT13sZ7PJE9deD59HGYYp7WbQpmWyEZJwKYFj/EM3G7ypgcDRQWA6CkWQ3peI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776416; h=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=7Xv86/Rz+8Kqo5xHCX7FN9w/MZvl13ciifCpIY3ePjE=; b=CbkV/98kksKQFcmf/HyZb7ydXvRKn5/1d+401zJqeQC/373JzSRhg+3pc8KEcGZf2gmSErylD5k9ANZxTZfD6wcQsj6w3/EHJV3ZrqEBAowFhci8jmqme8RBM3zO/NVnDhIiN47THhGgiDP23O4u/JYL5f6f1RR+oZ/KyqEzAuc= 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 1752776416598548.235725298065; Thu, 17 Jul 2025 11:20:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCn-0004eW-Ia; Thu, 17 Jul 2025 14:19:41 -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 1ucQSM-0004cI-Tw for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:39 -0400 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 1ucQSF-0004JO-HA for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:31 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-49-Dj8toFnjM8aeb2ghobf33g-1; Thu, 17 Jul 2025 11:23:24 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-451ecc3be97so5630435e9.0 for ; Thu, 17 Jul 2025 08:23:24 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45627962384sm46960205e9.2.2025.07.17.08.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Xv86/Rz+8Kqo5xHCX7FN9w/MZvl13ciifCpIY3ePjE=; b=M4PoIYi6jcoP5/kxMXGg8JiU8E/v395pFo2/+Rx+o6nuoBEbNj1Qy5PbH8j7zX+3hqPgc/ vGI5KZeYRKSamyqguIB90vY23rKOzt1Z9ZVB3ZaMI4rtip9X01rJjBx3ktB9pnMjL1aNn3 zkHAjF0yW+9agdrakmpO4V/0zpNP61U= X-MC-Unique: Dj8toFnjM8aeb2ghobf33g-1 X-Mimecast-MFC-AGG-ID: Dj8toFnjM8aeb2ghobf33g_1752765804 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765803; x=1753370603; 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=7Xv86/Rz+8Kqo5xHCX7FN9w/MZvl13ciifCpIY3ePjE=; b=NR5IiF3+y2t8ekzRI/zOOOzApwylu2ju5i/N6zd+lZrp73PxVD29kYphCit0fHnYJ6 YNHkxdv4JM27HO4hw5r2JOigxmRoSfd0bWP0a17RBVCTyXzGL91w31GFZDSKoEMcCzX5 iLJnmqQr5mbbk06GOK7kcV72e70K53RqbuijC38FmCALoD0Z5rvgk0Dobdp2/hEf5rml 5Lndk3MjmOk7I2RAH67owRP5+qKK5eUyDM52Hy0jtSyZQgf6SrfIte98+DbgO1mlzXib +7o6YWcZbsIRrI8cJ3LSgvsOK7AjEfw1qB3zG1WY5xjxWqT+cMjxdio4n6vpdeYkIgaa AfSA== X-Gm-Message-State: AOJu0YwQj/12zcd0eSSaLDBI2h8QfYodt22Z3HRvnGF8/Oqo2ZFBi7Ph GepUgDzYdg/K1YzNJIQkVnL957P2EeG0Li9ADSF1sDnaHoXwWBFd5elHx5DLa8PPHMJ8drVhObc TH17uF41MJ0sgHUo71ss8VFELnxWBRb+d6E7GGDTuyqxtKWFc7yhXiR9078Elgne6gF9KScMZdw ZcK1sL9tTz+c8EARHudTcHd5n4SBBJcgHS12L/YFRw X-Gm-Gg: ASbGncu8GCJ59gzIBFpVCqX3R58vGMUbbp+oaVUDw868jQ85TRte/8pDNvvjw2W7oS4 DJbl7tAoh4FF8NzU2i64IwWNbFTMLsgCEBofqUpe367fEyzk67ubEqtctpxaR7VaJegoe0YJbsg gebx2tN1P2bsZm2/vQSPThPmVPKyoRoH2WwdXj7mUBIUl/j+0w8hSBU3ISO3clQt+0aWuTvXQu5 wnVQCJCIXucDDciZ603YnTZ1eq73ab1z/93kzSiiDGxSEwgeH0bb0AfEQfiX1D+3nOd+nQzsguM p2hGRrFcj2lrPmfuCcC8rNtkR8pthUS9wW11WrznDDo= X-Received: by 2002:a05:600c:1c11:b0:43b:ca39:6c75 with SMTP id 5b1f17b1804b1-4562e274934mr82607785e9.16.1752765802785; Thu, 17 Jul 2025 08:23:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHg2fJ0nfaWBUJ7ETJWQ7F0WDZ0q+rmglZ+3V/8Vv7YyA9j32WSBiYDzx6mf2uUBCvA3Ljl0g== X-Received: by 2002:a05:600c:1c11:b0:43b:ca39:6c75 with SMTP id 5b1f17b1804b1-4562e274934mr82607415e9.16.1752765802262; Thu, 17 Jul 2025 08:23:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Zhao Liu , Paolo Abeni , Xiaoyao Li Subject: [PULL 2/6] i386/cpu: Move x86_ext_save_areas[] initialization to .instance_init Date: Thu, 17 Jul 2025 17:23:12 +0200 Message-ID: <20250717152316.353049-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776417469116600 Content-Type: text/plain; charset="utf-8" From: Zhao Liu In x86_cpu_post_initfn(), the initialization of x86_ext_save_areas[] marks the unsupported xsave areas based on Host support. This step must be done before accel_cpu_instance_init(), otherwise, KVM's assertion on host xsave support would fail: qemu-system-x86_64: ../target/i386/kvm/kvm-cpu.c:149: kvm_cpu_xsave_init: Assertion `esa->size =3D=3D eax' failed. (on AMD EPYC 7302 16-Core Processor) Move x86_ext_save_areas[] initialization to .instance_init and place it before accel_cpu_instance_init(). Fixes: commit 5f158abef44c ("target/i386: move accel_cpu_instance_init to .= instance_init") Reported-by: Paolo Abeni Tested-by: Paolo Abeni Signed-off-by: Zhao Liu Link: https://lore.kernel.org/r/20250717023933.2502109-1-zhao1.liu@intel.com Reviewed-by: Xiaoyao Li Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index da7d8dca633..251d5760a0b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -9619,6 +9619,16 @@ static void x86_cpu_register_feature_bit_props(X86CP= UClass *xcc, } =20 static void x86_cpu_post_initfn(Object *obj) +{ +#ifndef CONFIG_USER_ONLY + if (current_machine && current_machine->cgs) { + x86_confidential_guest_cpu_instance_init( + X86_CONFIDENTIAL_GUEST(current_machine->cgs), (CPU(obj))); + } +#endif +} + +static void x86_cpu_init_xsave(void) { static bool first =3D true; uint64_t supported_xcr0; @@ -9639,13 +9649,6 @@ static void x86_cpu_post_initfn(Object *obj) } } } - -#ifndef CONFIG_USER_ONLY - if (current_machine && current_machine->cgs) { - x86_confidential_guest_cpu_instance_init( - X86_CONFIDENTIAL_GUEST(current_machine->cgs), (CPU(obj))); - } -#endif } =20 static void x86_cpu_init_default_topo(X86CPU *cpu) @@ -9715,6 +9718,11 @@ static void x86_cpu_initfn(Object *obj) x86_cpu_load_model(cpu, xcc->model); } =20 + /* + * accel's cpu_instance_init may have the xsave check, + * so x86_ext_save_areas[] must be initialized before this. + */ + x86_cpu_init_xsave(); accel_cpu_instance_init(CPU(obj)); } =20 --=20 2.50.1 From nobody Sat Nov 15 09:31:56 2025 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=1752776470; cv=none; d=zohomail.com; s=zohoarc; b=MqUIEhP5CuR2mr3LAjOK6/hB8UTWYXTXFajhWhpHm0HMr/v/J/Aj3QV4oXfdssvu7uCbyRCYj0paWOMaQRaiCXiq5P+YxwMBcZfWjmQ8tbs4wATAr0F4LCes8kWW5+P9ri3o160YQCVEJdaccKj1W5co23scj3F+o8BNC6+9mqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776470; 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=SqG2DiLmplhxW74U3B4JYB/l83wKcoDTCpLDYKMWsIY=; b=K3n5BbnJw9hN0Gw8mRruhMgr4bTyX5XXW9j0GzrxDW6KI2BpNhP0T7XEpDkbKZCU4UH7FlzFDvWV9WVlvPuI4gW7opRqm6ZGmGj2J8sIXlse+tJfvS9hQmYI943VhkqriWEXtbTDvkr5x4aK6WUEigeEstKb8DPrKJXd+B9k2Oo= 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 1752776470309989.2191627897632; Thu, 17 Jul 2025 11:21:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCs-0004ib-AS; Thu, 17 Jul 2025 14:19:46 -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 1ucQSO-0004cj-9h for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:40 -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 1ucQSI-0004Jm-Gn for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:35 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-114-HZUGwbhiNSisxlYag485lg-1; Thu, 17 Jul 2025 11:23:27 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-451d7de4ae3so7434505e9.2 for ; Thu, 17 Jul 2025 08:23:27 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45634f6b1a0sm25064235e9.16.2025.07.17.08.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765809; 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=SqG2DiLmplhxW74U3B4JYB/l83wKcoDTCpLDYKMWsIY=; b=Q5LPT0PAy5ROfUOVav+h3KeQrNdR/DxpnGq4eXm3z0yjx+v19O1gwqKVkMeKnjtNS8OdO5 MMdm2YW+6HjSOjj8udkbzHkApTs7+JQ4Z4k7l4DgsmEyOgAtT9KswxraOMx2zliIj7Y7qp KWy1B5G50rTN7Lcg1cpvUvsDznHX2Hc= X-MC-Unique: HZUGwbhiNSisxlYag485lg-1 X-Mimecast-MFC-AGG-ID: HZUGwbhiNSisxlYag485lg_1752765806 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765806; x=1753370606; 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=SqG2DiLmplhxW74U3B4JYB/l83wKcoDTCpLDYKMWsIY=; b=lqdgFBbrFoDN5o6fR7MR/LkQXmX/tTxTzXVL23FWnrw7Xc61TDlkw/xrVk3jpcJIMc utDtQamYKtNyj7oO1G+VcQCswug4CFVEdi7ly5yA1aPurTyXpiPHQnm2wgRNBbKch89Z 6UKYiAvwU0UVyTsuWE9quNfBwDB8qzQi94PkdGk6vRzYDc2FafEeIVmAXaLpV/QLYAh0 piygrEQO7M9TfMQee35RPJZOFTwGNGJR4SK/VfO3DDO0Zg46LZFU4RjpEN6UkRft0tRx x3AKOsFrrR0e01jCX+n40dUdqgLnlTNeP/EAP1iea5/xryDwpAWpn/hOim9T9Z/1j0GI pLDQ== X-Gm-Message-State: AOJu0Yz1K0L2aiE2CIVyAiWGf/kjV4WcP0sDYv5wYRwBdUN1gJZxmYzr ijCcnvjqBbeguyzPL0rAf3XYxBbThucESUa3Bjzw2AhS2eOXknmm9fKmdimW4EH8dai1fW+qqm/ qHXx2VKPOYHkIIdEiBBFsGv81/pHVlgLZsyWVT90NWMHXyDndAd+lQ2xdjmHxdtrHjqerFiWv/U 4DCzQsBZFNaiKodbnzz3EiQOfk/8kRh6+RS3cfs7M8 X-Gm-Gg: ASbGnctwA21DaCMS81buyIPkj4In/QO8WEo08WvgD4PfadTpus6icY/TtTYW05NEFuf Zjes+h9DX4GJh/38bcM+hqNgobY+HJiTNyhbqJ9sp/EHCovprRRaUlOdVImX/1Noh4kxqnZSRyC vr6S3ZwGtv9odTtl5yIp/0O2EZv6e55dB7k7l714Agxv9subcM/NJSI8HZ1BsfXJ0TbV8JhQVeC YfqhIpkk9wK2YcJ1lJytF9zQssIcnYt5SHvXKFZj7uEB/1/pVjBiExMcanveZg2SlH9afaUjALE 2nKkfPfxbs6u5+TT9yCgDxHd5B+y8lrWWKvj7oYcD90= X-Received: by 2002:a05:600c:450f:b0:456:19b2:6aa8 with SMTP id 5b1f17b1804b1-4562e27497dmr82003955e9.19.1752765805963; Thu, 17 Jul 2025 08:23:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3T/LVF2KN+smCrvn0joUa8mhv8EM7POcMbCgIwKCjMzWv4zcCtN5TPP/D9zdUacM+VR/UKA== X-Received: by 2002:a05:600c:450f:b0:456:19b2:6aa8 with SMTP id 5b1f17b1804b1-4562e27497dmr82003595e9.19.1752765805445; Thu, 17 Jul 2025 08:23:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Stefano Garzarella , roy.hopkins@randomman.co.uk, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 3/6] meson: re-generate scripts/meson-buildoptions.sh to fix IGVM entry Date: Thu, 17 Jul 2025 17:23:13 +0200 Message-ID: <20250717152316.353049-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776472148116600 From: Stefano Garzarella Commit 84fe49d94a ("meson: Add optional dependency on IGVM library") was inconsistent with the contents of meson_options.txt and the one generated in scripts/meson-buildoptions.sh Let's regenerate the file in this way to keep them consistent and prevent future changes from including the spurious diff: touch meson_options.txt make update-buildoptions Fixes: 84fe49d94a ("meson: Add optional dependency on IGVM library") Cc: roy.hopkins@randomman.co.uk Reported-by: Daniel P. Berrang=C3=A9 Signed-off-by: Stefano Garzarella Link: https://lore.kernel.org/r/20250717131256.157383-1-sgarzare@redhat.com Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index e8504689e80..0ebe6bc52a6 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -130,7 +130,7 @@ meson_options_help() { printf "%s\n" ' hv-balloon hv-balloon driver (requires Glib 2.68+ = GTree API)' printf "%s\n" ' hvf HVF acceleration support' printf "%s\n" ' iconv Font glyph conversion support' - printf "%s\n" ' igvm IGVM file support' + printf "%s\n" ' igvm Independent Guest Virtual Machine (IGVM= ) file support' printf "%s\n" ' jack JACK sound support' printf "%s\n" ' keyring Linux keyring support' printf "%s\n" ' kvm KVM acceleration support' --=20 2.50.1 From nobody Sat Nov 15 09:31:56 2025 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=1752776453; cv=none; d=zohomail.com; s=zohoarc; b=F/dMRJTDED6KEXQGCqEYfcnjaN40DYlDT4WqHyC03rMBh1+yaQbIosUz4hcLr/TIWB2+rk/0acVee8lp3rLEde6LVbzsCj6p/kYllSfokA3zLvVLLsji5yGWaF0qJlX+r4nSmky/1y9hLTRnanXIMzq3qQC0TNEd+sDeiYB6iQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776453; h=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=XDBnlPqeGv4rwPb8eQVz5uOF6kllE9KhwMqiqUrgjcE=; b=VP/vJ1S9y9QyCErY4F/AnXw/VK0reo+KGJHLICVrg6lsTN+ic6QjaKeJ45JJ0icQz9UdprfO3ZOKLbLKUjHpkmX72+vDpiXpeisy9CWgfA5fTACHbyLsS3LKC83YOIoi/DtaOFgwiG5fgTbM+gO/uwtFPqd6z68ruCbLhjuO5z4= 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 1752776453531751.0878008309428; Thu, 17 Jul 2025 11:20:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCq-0004gr-4a; Thu, 17 Jul 2025 14:19:44 -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 1ucQSO-0004co-Rn for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:40 -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 1ucQSM-0004KR-7N for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:36 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-352-NlHHr0ayOBKuHmvPZcSNZg-1; Thu, 17 Jul 2025 11:23:31 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-456013b59c1so6261255e9.3 for ; Thu, 17 Jul 2025 08:23:29 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45634f9a53asm25053995e9.30.2025.07.17.08.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XDBnlPqeGv4rwPb8eQVz5uOF6kllE9KhwMqiqUrgjcE=; b=HkyNIwDdXGHcqFzE++IkQMdC285jVxkTBLIjzIH05eYCC7/1vddlXl64c/Zz4s2zexELCV 7D57RyWGKgKsGWtd6s0VY+u/DnMbiq1LepakiXcmmQkcfQn+WdPSExw+XYM+YqV6ptfEJQ hRjMdXoUwF2vUBcwMuHBhKj1Auc6n70= X-MC-Unique: NlHHr0ayOBKuHmvPZcSNZg-1 X-Mimecast-MFC-AGG-ID: NlHHr0ayOBKuHmvPZcSNZg_1752765809 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765808; x=1753370608; 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=XDBnlPqeGv4rwPb8eQVz5uOF6kllE9KhwMqiqUrgjcE=; b=Tjo/CpOqyQV/txyiqZc2JkGd/Aiksm5yAcLGOLId70/T6y4FUJj6hIniY3RoOl6v3D +FTXknzsUWYUwEL/4I4/+gatxwFlnRSowqNseAUBM1I1THrHun3fss/55oKdNRAyNGwx aYt31Z/jb6htvifX6dSCb3zccJEL2qXgyViw3zbRamim5U2wb10zqpGgUkVlBSKdzXIV VjjPjcggH+TxF8kqGk+U4b/8czoQHSTPQuwUVz0Hq6WbkjG+pbmi1/Qlgf1PEHDoMbFe SlQnet+gHwu7Sv5NRGIQr65BuWpoKw9wJWTm1fGQ91R/ygkx+uovR1cJHzBBMl8FWgcv 2z3A== X-Gm-Message-State: AOJu0YyC13E7P+87XIm7NDfqgXSjonrMVTvQTe2o3jnjQ5dDY1wY0/Q0 uvJqLVO5jfbJ60ExqOZ3kQTUYtrPyW6XttxcasQprFg4uXSRMJmLHIIYkaHaEF5koGHlpV1W5Bs YfjdQgin4rMgUnIvXFRXTDljkRPSqGgPQJB1GCGKTstxJl5R/3yq6N5MO/5Ke9FhI97ELTm4apS g4R2+vpcl3hFrJ4U6pAkjXPwIxqr3T6g8Naf6YaDIU X-Gm-Gg: ASbGnctwNBDRcJ/aweFULMDjfFx3j2naahoDpuqnW9AXhPfYOPsixRXepKotzAbGiPk vZrxd+RUWpFoxU6NLhPZliOF3XEXrxq0VEMMUx33GDtVtufW0JvueFGVtYQ4xg/ARmxviNEXi+l ZVexHWO4f4aAaoqiun+LNoR7KsYEhT8vAoY/p2A0Z1fdnwrRBwTYFSA+tyMRNYkD2z6w2HVexbh PgbCSQfyW+/S+Md73pw81iHoSASqKXxC2rrmW3DOWYpi3iG3YcO2lFRTfg/1H4WAjWqYx7hmyq4 C8AVHM/N0tNZD4aMRhcje9w0+kkKa7GWDro3Baydp7w= X-Received: by 2002:a05:600c:3b15:b0:43c:eeee:b713 with SMTP id 5b1f17b1804b1-4562e36c7b1mr64527205e9.20.1752765808328; Thu, 17 Jul 2025 08:23:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyN8eEMJD/Pih4TSdIuIrq9ldSM/t9VtjwaF21Y2H3uzUD9WAPATka0Ucye/+U88+to8Ecjw== X-Received: by 2002:a05:600c:3b15:b0:43c:eeee:b713 with SMTP id 5b1f17b1804b1-4562e36c7b1mr64526895e9.20.1752765807843; Thu, 17 Jul 2025 08:23:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell , Xiaoyao Li Subject: [PULL 4/6] target/i386: tdx: fix locking for interrupt injection Date: Thu, 17 Jul 2025 17:23:14 +0200 Message-ID: <20250717152316.353049-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776455627116600 Content-Type: text/plain; charset="utf-8" Take tdx_guest->lock when injecting the event notification interrupt into the guest. Fixes CID 1612364. Reported-by: Peter Maydell Cc: Xiaoyao Li Reviewed-by: Xiaoyao Li Signed-off-by: Paolo Bonzini --- target/i386/kvm/tdx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 7d69d6d7b06..1574e7d76fe 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -1126,10 +1126,15 @@ int tdx_parse_tdvf(void *flash_ptr, int size) return tdvf_parse_metadata(&tdx_guest->tdvf, flash_ptr, size); } =20 -static void tdx_inject_interrupt(uint32_t apicid, uint32_t vector) +static void tdx_inject_interrupt(TdxGuest *tdx) { int ret; + uint32_t apicid, vector; =20 + qemu_mutex_lock(&tdx->lock); + vector =3D tdx->event_notify_vector; + apicid =3D tdx->event_notify_apicid; + qemu_mutex_unlock(&tdx->lock); if (vector < 32 || vector > 255) { return; } @@ -1179,8 +1184,7 @@ static void tdx_get_quote_completion(TdxGenerateQuote= Task *task) error_report("TDX: get-quote: failed to update GetQuote header."); } =20 - tdx_inject_interrupt(tdx_guest->event_notify_apicid, - tdx_guest->event_notify_vector); + tdx_inject_interrupt(tdx); =20 g_free(task->send_data); g_free(task->receive_buf); --=20 2.50.1 From nobody Sat Nov 15 09:31:56 2025 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=1752776603; cv=none; d=zohomail.com; s=zohoarc; b=hdYhQJhSI/HLfnBdbjVdR6UbTST16VzsxXpOEmLmo4rn5jow5qzfkQWVjya9SeCHyMRqMANSV8Jmehvwkhb5T7rfY85eJ6083S0AuaRXztHAt7LauEFt2MZXbjU7tgzJaSQWPF9rFd7gOfg75wx3ViwD8p4pVmXvqeK3/3D8HP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776603; 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=2WlmBVN2Qucvf1vEE6nWUJB/kVdkIb8dEtL75AIz63Q=; b=Lygugh0XaCNY5dzZ9TRVQou6ubC1OWogzv2Zu/jLOabopB22qBhVulFuXGzeStPJKqom7KOUjVtY6WdK0R2M2YnDIDuLOrlbn6919FGfngdD21Tb7SJwTPjuYb1dJy8VkHGQTc2nPZwlCbf5HqayyI7hxfQcnHAdpHGaBVrGXco= 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 1752776603731756.4533178974366; Thu, 17 Jul 2025 11:23:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCv-0004lF-Ci; Thu, 17 Jul 2025 14:19:49 -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 1ucQSS-0004dq-7q for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:42 -0400 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 1ucQSP-0004LA-5P for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:38 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-299-HCWi4nO-N6qm72AlbbfqGg-1; Thu, 17 Jul 2025 11:23:32 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4560f28b2b1so3939395e9.2 for ; Thu, 17 Jul 2025 08:23:32 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8e0d872sm21195130f8f.60.2025.07.17.08.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765815; 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=2WlmBVN2Qucvf1vEE6nWUJB/kVdkIb8dEtL75AIz63Q=; b=GjKvVlIQmb7Gq7h9wZdysYQSvDug6GzFudjrs+nSmDSb89Z0bSMNfS5ipami1DstyUCtjx yqusZsAfiQolaLTDzMKRSWFNAGvSMyDvhzFBvDvCM2BrHSRRRBj7DDbjVuB+RPP6w5I2he 7pUXFUdzpld4SqxK6fQfDwbtDB6IVgg= X-MC-Unique: HCWi4nO-N6qm72AlbbfqGg-1 X-Mimecast-MFC-AGG-ID: HCWi4nO-N6qm72AlbbfqGg_1752765811 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765811; x=1753370611; 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=2WlmBVN2Qucvf1vEE6nWUJB/kVdkIb8dEtL75AIz63Q=; b=U/WrC2sOPINLBsJNs+7mVULyf8f8N+VlEOG929CWOJvX3s39sR38YWkGDzgmp7Q74Z MX9s9n4UPG0FCmnePwfO6mmYKkDBQ0Pl64IusiNcC2rz8cYPe6gaWuLhFkuOxDSzZiRB AoLDWrtYlVejxJ9EfWtA1bCqJwrfjAoFee544p/YXBpe3nAqvM6gFmbTY0k4Jm7kM0WU tks340DyRzphHw98+M1BtA6HSuYVmTHmYMU4TL72+DI7QzEQO8HLk+GA53ULxAMEyY9v qaXtFgFBGdyR5lNtDlsqGCM9hXgoOhmUSs9Taa2lnUxqIwjLM9F0IgRvCjInt1zd8Lcp pyog== X-Gm-Message-State: AOJu0YzeipijDy/Om8YYhuQwwfh6oG9ovEOPS5Mcq40J73oxboMMI2XX GyaASs5NR++SgphQshfrbpuRx/6AtOiVTM3Zjy7VOh97XJvQVrGGqMrase402B4ILyXDm6MSOiQ zYe0LuvfKeMspUcTWRv3Y/jHW2ZAL5zlQMy3pgkqDs42Rh/SETWadO4anBA3Yj+4yfVD5HfxZ83 fdFffFtE/WI1uoLpPH4xvbVPOZaE2H2qARLxSckB5z X-Gm-Gg: ASbGnctA23qZx7DVE9HOiAfQLu1LqyhH09TLjpessg5LJauWyOF5+vCTeqi5yHhgqJa 9wkgDwq6mIsspS/1ilD4NK/ZZz4IWS/mQYvZMMjVk6F1iw62hdoOYOs8sj6R3uNNlL5+dFDguT4 4TTLat+R0K0HK0HIjKH7c+jejJtnjtHyZKoNI7jjYoB/pgMVXTACrQLInOJ7tS2jLtyAjLgqLi1 fLAxEaB6ernHX3FutE+ffNn42sph8l4tZyyroLKkVXXkRsXgsL0Xu28aTDAweP0IyNAsWieXb27 mPe1MQVxjuxRh1o+h/5F8OdaPiFce0uBgTmBQEyiIvs= X-Received: by 2002:a05:600c:8b85:b0:456:2347:3f01 with SMTP id 5b1f17b1804b1-456355c60d3mr30190975e9.20.1752765810925; Thu, 17 Jul 2025 08:23:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF67RAZBw5pAQGPD0Rra2YQASNKHOLGkzgIaXyjKt0rQcg3SLQOiJfNtU+Yo6hAi05d7dFIMg== X-Received: by 2002:a05:600c:8b85:b0:456:2347:3f01 with SMTP id 5b1f17b1804b1-456355c60d3mr30190615e9.20.1752765810367; Thu, 17 Jul 2025 08:23:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PULL 5/6] i386/cpu: Cleanup host_cpu_max_instance_init() Date: Thu, 17 Jul 2025 17:23:15 +0200 Message-ID: <20250717152316.353049-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776605563116600 From: Xiaoyao Li The implementation of host_cpu_max_instance_init() was merged into host_cpu_instance_init() by commit 29f1ba338baf ("target/i386: merge host_cpu_instance_init() and host_cpu_max_instance_init()"), while the declaration of it remains in host-cpu.h. Clean it up. Signed-off-by: Xiaoyao Li Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250716063117.602050-1-xiaoyao.li@intel.com Signed-off-by: Paolo Bonzini --- target/i386/host-cpu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/i386/host-cpu.h b/target/i386/host-cpu.h index 10df4b3a3a7..ee653242254 100644 --- a/target/i386/host-cpu.h +++ b/target/i386/host-cpu.h @@ -12,7 +12,6 @@ =20 uint32_t host_cpu_phys_bits(void); void host_cpu_instance_init(X86CPU *cpu); -void host_cpu_max_instance_init(X86CPU *cpu); bool host_cpu_realizefn(CPUState *cs, Error **errp); =20 void host_cpu_vendor_fms(char *vendor, int *family, int *model, int *stepp= ing); --=20 2.50.1 From nobody Sat Nov 15 09:31:56 2025 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=1752776578; cv=none; d=zohomail.com; s=zohoarc; b=Z4FE6J+OsjY2EXithlhcFZGDMVskcQzMgRMewWJOj0QEl6G4gewi94TmewlxefZulFHxKrNRMx/I8NyfaOETpLPyIY5ilYq9fNZfcTOTA7CMOWsB5ld+YfAdqXdyez3kas8NWtRQhl8uGc4Xh3scjbF1gmk//vKAEJ8KUfmYQoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752776578; 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=6zxpl/PQRwn3jQnhX2F8Ka6KHfmWqxvN4L1LgBM5SOU=; b=PjZRjfk6e+px4/pPWZzPjS4IUeu/l+oyTeRzSpwQmrkdvUyQqy/445xamBwIHtpu8nIp412+EFemusjeieP79UvVai3B38ZWNFj0wvw1jlTA7eRzMjHicVudu6mw/cvpJGqR0+3QlUjF7jmP/hlIxy3Cc/88oiH7gKwvNmA2n0M= 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 1752776578446329.58250064958634; Thu, 17 Jul 2025 11:22:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucTCw-0004mb-VT; Thu, 17 Jul 2025 14:19:51 -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 1ucQSU-0004ek-SW for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:43 -0400 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 1ucQSQ-0004LW-VG for qemu-devel@nongnu.org; Thu, 17 Jul 2025 11:23:41 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-365-QNbbBIw5MTykNB_5BZx-Yg-1; Thu, 17 Jul 2025 11:23:36 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4561611dc2aso9693535e9.0 for ; Thu, 17 Jul 2025 08:23:36 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8bd1741sm21126390f8f.18.2025.07.17.08.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 08:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752765818; 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=6zxpl/PQRwn3jQnhX2F8Ka6KHfmWqxvN4L1LgBM5SOU=; b=hBec/636T7gzn81T5daCl/9suvb99jPWkYNBVjiUSIVnv9a09lSbsuHZjuGHFv1v0zWUZw ia6tU29I1GLsCPsLnOXwttBhADhVufqXA9vVPix1Oc7AnEHbon1Xp1enwCPlLBNvEww9cn e9i9/TC+PTWOwwfzrpHtw45jFocVg94= X-MC-Unique: QNbbBIw5MTykNB_5BZx-Yg-1 X-Mimecast-MFC-AGG-ID: QNbbBIw5MTykNB_5BZx-Yg_1752765815 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752765815; x=1753370615; 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=6zxpl/PQRwn3jQnhX2F8Ka6KHfmWqxvN4L1LgBM5SOU=; b=SB4LgfcOLd9wcIqU7hQQDq6jzfhWi2DRNC0G689sxXTAGYrDr9wtD5OrFPYdJ2z2gw jBrBF3zE+xKbIMXsBC+YZScYrm1uXXys15Ptw5/qjEQ+9OSVTyhUqDcLrxafIuoP8x/u 76BBXkzOlBQpEzP+WZLkljR01bp/1TtqRur1ktq3/NwdWhPVAJUK1+9htKbaLVdpfr+X SUddx8lctDlFq5t+oPcdzg0Q/HOmn4yQaXeqbdXRt/xMmCQ/gxsVWrBQQkTcE1Jv8YW4 DdHfy3cqVul4eh+I4TfmjgXpM6dlqvYp73CHfXbCVReXUP94duoZtZqRN3rFMtbEpg7y 6D6w== X-Gm-Message-State: AOJu0YykdSAmqkX6bfZUlsCp0VpW8kNoVUeu7/GpBIZQJ9Sg2ZstJvHX 5SjhPpuGxgyhvsEkSSHju5txNHSJD5YvbBq4UuGZJIDvvPf9NZpqD+Ba6sQLbyfBYNSJGlTe2wi FhzG67EoZzjbJ4ORsvJwYycINFqUP8EUSoj/zYO9iBYIf10UdvnbyiJaAlHrcfKNmSfoYRnpe9Z XkHqu384Rpj6rl/ctncRzcfKp2yM7sdAb6Sef+xsCj X-Gm-Gg: ASbGnctGMzGX69oPC4b499sIX8GEVjU0sx8CsRwEyx++4UOPUUvWpw+FN6i9EhXJMZy 9tIvcanEpOyyE+xGosi76y4vAOmwNEuw7f2yAu3AhS7EFrH6VokeDdJPm7I7jVcArBUbniC73CH 8kOn/c1TjL9I5oWsu+sJhLoumIBlB5OY0J1C1cF7q7ziu2hx5yoDJm756IVnFDJJqc9H6gZ6ZKG nzE8kUo8F6pD8Z+yCtsj8Zfzn6B/2E3T1HqgnjqDtIutgZQjLJ58eQx4cqOU7aUcqvqXoYEDe5r kkGpo7UJCKK3NmwcrYV9iqi2xQ1XKZ+09qIcCWtiy/I= X-Received: by 2002:a05:600c:c042:b0:453:2433:1c5b with SMTP id 5b1f17b1804b1-4562e3b9e78mr50262375e9.5.1752765814449; Thu, 17 Jul 2025 08:23:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKXgzwJvHJ9MG6cc7Gk9cPMScI+iS2eON6imOPm/hDjRNgNK8kU9bKgAzcAcmDi365cbWeEA== X-Received: by 2002:a05:600c:c042:b0:453:2433:1c5b with SMTP id 5b1f17b1804b1-4562e3b9e78mr50262075e9.5.1752765813908; Thu, 17 Jul 2025 08:23:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 6/6] i386/tdx: Remove the redundant qemu_mutex_init(&tdx->lock) Date: Thu, 17 Jul 2025 17:23:16 +0200 Message-ID: <20250717152316.353049-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717152316.353049-1-pbonzini@redhat.com> References: <20250717152316.353049-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752776579451116600 From: Xiaoyao Li Commit 40da501d8989 ("i386/tdx: handle TDG.VP.VMCALL") added redundant qemu_mutex_init(&tdx->lock) in tdx_guest_init by mistake. Fix it by removing the redundant one. Fixes: 40da501d8989 ("i386/tdx: handle TDG.VP.VMCALL") Reported-by: Peter Maydell Signed-off-by: Xiaoyao Li Reviewed-by: Daniel P. Berrang=C3=A9 Link: https://lore.kernel.org/r/20250717103707.688929-1-xiaoyao.li@intel.com Signed-off-by: Paolo Bonzini --- target/i386/kvm/tdx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 1574e7d76fe..dbf0fa2c918 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -1527,8 +1527,6 @@ static void tdx_guest_init(Object *obj) tdx_guest_set_qgs, NULL, NULL); =20 - qemu_mutex_init(&tdx->lock); - tdx->event_notify_vector =3D -1; tdx->event_notify_apicid =3D -1; } --=20 2.50.1