From nobody Sun Mar 22 14:11:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773922956; cv=none; d=zohomail.com; s=zohoarc; b=jkatDlSASPWTitfxLtb1XP67JmH9Psx+D3aM0Z1lTvpGwf59ofgXD+hQqpa3kifC8DTE9GXAUraWwIoeW4i4zZbmBjmSpcB63Yfpcw8cgXTgAt+/3f+n9UpStdhGmNHk/+OXVJ8NI5TQreYMvDrfkhOY+GBg312aQwP0C1RJFdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773922956; 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=2qC4re8eGWqqdLBNRpKozayHnHTeGvGDgVhXYTFSM3k=; b=GvKVy8d3B3gOVLHRxaBFENqkSJb2ajoH6iWszdFIlQ/yO9o7czzE64TB1WFwE2v33rvv4Ak7UBAbd1hshe2sgZ37hyLFiltkV/E4ANUDE2w0vzw8zBQKjO66lipWuRvN1NPYw0CKuJEn8jt8ChE47LzV5XE7I9sgHRFGMLL6gbc= 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 1773922956721561.6666121543433; Thu, 19 Mar 2026 05:22:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3COQ-0005JF-Ic; Thu, 19 Mar 2026 08:22: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 1w3COI-0005Es-5I for qemu-devel@nongnu.org; Thu, 19 Mar 2026 08:22:19 -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 1w3COG-0007g7-6J for qemu-devel@nongnu.org; Thu, 19 Mar 2026 08:22:17 -0400 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-LfOGq7BRMCCkeZK0NB021w-1; Thu, 19 Mar 2026 08:22:13 -0400 Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b62da7602a0so858108a12.2 for ; Thu, 19 Mar 2026 05:22:13 -0700 (PDT) Received: from rhel9-box.lan ([122.163.114.34]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-82a6bbe1ffbsm7876649b3a.43.2026.03.19.05.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 05:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773922935; 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=2qC4re8eGWqqdLBNRpKozayHnHTeGvGDgVhXYTFSM3k=; b=ZMYyvJETrU3azzFe2BMKKnn+nSixcwinAoDToGry0P1R4ntrp44QsgnWnBQDs/GgSF76Jz lhO2R6OOZDqzJXqfw+FrJX5JTVQTnE4+DjVQyP8OF/Tlhq3ZhtoesN/I+fza80SNn+ly7w j8YCclMj0SQ7+iLCBUiioaHc0QVVGlA= X-MC-Unique: LfOGq7BRMCCkeZK0NB021w-1 X-Mimecast-MFC-AGG-ID: LfOGq7BRMCCkeZK0NB021w_1773922933 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773922933; x=1774527733; 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=2qC4re8eGWqqdLBNRpKozayHnHTeGvGDgVhXYTFSM3k=; b=UL2TAPPc8xLnL0iReE9zFAQaqn0Aly7ededbtxYY43tuKoSUOTjPOGaC7luVWHNy+e nxFLzRhnH+DNu/YNAdSfIitH3cwOzjdyiHjam8uxvp0gSNZ3VscYLvXqSjdww2R7vQEG urf9J3+eXf1aVhsMsAMypEB0lXNNH9d1fd1x353rg1J1HrZ7gdBtnYY/KzDkFGan2SQP EuTDxlNGBim/uTO+U4WtofyDU4npq0Q+emZRnNau5a5wZ2T7jL+W0glvlwHgLEnXyWpd qAlKUexMSK/C4mVlpE6nAnN1+ySZ738lSnqCQA5SI+FYd1xUkGrXFcvbgwVG267n2UBv 33dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773922933; x=1774527733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2qC4re8eGWqqdLBNRpKozayHnHTeGvGDgVhXYTFSM3k=; b=Ogs9gv1cvV2s10UwQXTS/wTmX/IgJJoREnIh4+iWOWjBlYbzCXNEGwHKlljpBs/+jB 7BGTgw5nhLfI1V2qjHuI7qsJVbdJvl2UadvYP6q9a8quvj4m2NgiSW+JPUr5n8azfzVF GkECe9+LQyj0FBLuAZGQwoHwuYE3lEpMoiP8QdQ+lQ4ezDXvy++1HUTu5wAM3w6k68SU 0DQhfyutcSrOPXvgsuPXVIIsP70bvtjnDCkabUghnzgfsjZYlayLNLOAG61QIyGHnm2A D/lHh/RAvlMwD+5xKSD47w+8WYJQpMRImwLOfRREps288Gz8i1d6LEdqJL+6vEp+/FkT 6p5w== X-Forwarded-Encrypted: i=1; AJvYcCX7k4Aj2Fz8K9e0h4VQujLnsVbTyG+JHXPwcDHENup21hkF/uqN4JOiAjZkiiW0OUz3lW70+s9vtBht@nongnu.org X-Gm-Message-State: AOJu0YwHsjHCRCVfSI9OK/4OEo+QIsu6Sz92c0mnSReY2YHXj24HmA7n /kQ93AtRQYlEb8XuoUIAj6S5BMKpW/xIhp5H29HadhLoDfCP7J2FhjmuVj1jcprAd3nNJ/9qDpw ErW4//nAOd+9U0b3GKgBDJrDSkCDs3qIs/ZEHg0ZM4eMxnHX1o96aZSHq X-Gm-Gg: ATEYQzyBiFyxhECp3PYT2Gm72j2utneUnKCj/Qt08167zmf/+RXYQStCbt1HKm0JyeP mSiMNWCmE5t69QXx8jmCzUhNRHBR4rLDV3vWQ6QodhTtfOHYDm+1Rw8vguYN8d4K0piA2K/+89Q InruYVyv0vaFmjrumAxdeMj0tvYtDqEPKjHeIGSHPV7CBclE/NTuSNLnaPN7RT2Oc10YWgacsY4 xJSsKLx6sK+dWB1fTgBdw5Lk2feN2zQrPzmI6G0Xc8+BenVWz6+IyBxxYwDoZINB7dZgz/pFvOg 6Mhm2v1n6Q6xR7vIPcRVhhDyeSq3QC23lZ4itGj6Yyy+59o6T2iLg5bFyI9lp3/giuE+xkefy8j WqC+VA4/sh/I/YJT0DEkd80bt8kClYfq1zme3P1nk9D+CNMyXcvkhlkA= X-Received: by 2002:a05:6a00:6caa:b0:824:195e:c382 with SMTP id d2e1a72fcca58-82a6af0be59mr6597512b3a.58.1773922932785; Thu, 19 Mar 2026 05:22:12 -0700 (PDT) X-Received: by 2002:a05:6a00:6caa:b0:824:195e:c382 with SMTP id d2e1a72fcca58-82a6af0be59mr6597483b3a.58.1773922932208; Thu, 19 Mar 2026 05:22:12 -0700 (PDT) From: Ani Sinha To: "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Cc: Ani Sinha , Michael Tokarev , qemu-devel@nongnu.org Subject: [PATCH for-11.0 v2 1/2] i386/pc_sysfw: stub out x86_firmware_configure Date: Thu, 19 Mar 2026 17:51:35 +0530 Message-ID: <20260319122137.142178-2-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20260319122137.142178-1-anisinha@redhat.com> References: <20260319122137.142178-1-anisinha@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=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773922958064154100 Content-Type: text/plain; charset="utf-8" x86_firmware_configure requires ovmf support. Add a stub for this function = call for cases where OVMF is not supported. Reported-by: Michael Tokarev Signed-off-by: Ani Sinha Reviewed-by: Michael Tokarev Tested-by: Michael Tokarev --- hw/i386/pc_sysfw.c | 31 ------------------------------- hw/i386/pc_sysfw_ovmf-stubs.c | 5 +++++ hw/i386/pc_sysfw_ovmf.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index d8a86756ca..0a073c4285 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -283,34 +283,3 @@ void pc_system_firmware_init(PCMachineState *pcms, } } } - -void x86_firmware_configure(hwaddr gpa, void *ptr, int size) -{ - int ret; - - /* - * OVMF places a GUIDed structures in the flash, so - * search for them - */ - pc_system_parse_ovmf_flash(ptr, size); - - if (sev_enabled()) { - - /* Copy the SEV metadata table (if it exists) */ - pc_system_parse_sev_metadata(ptr, size); - - ret =3D sev_es_save_reset_vector(ptr, size); - if (ret) { - error_report("failed to locate and/or save reset vector"); - exit(1); - } - - sev_encrypt_flash(gpa, ptr, size, &error_fatal); - } else if (is_tdx_vm()) { - ret =3D tdx_parse_tdvf(ptr, size); - if (ret) { - error_report("failed to parse TDVF for TDX VM"); - exit(1); - } - } -} diff --git a/hw/i386/pc_sysfw_ovmf-stubs.c b/hw/i386/pc_sysfw_ovmf-stubs.c index aabe78b271..b53906a052 100644 --- a/hw/i386/pc_sysfw_ovmf-stubs.c +++ b/hw/i386/pc_sysfw_ovmf-stubs.c @@ -24,3 +24,8 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_= t flash_size) { g_assert_not_reached(); } + +void x86_firmware_configure(hwaddr gpa, void *ptr, int size) +{ + g_assert_not_reached(); +} diff --git a/hw/i386/pc_sysfw_ovmf.c b/hw/i386/pc_sysfw_ovmf.c index da947c3ca4..2f7d15c9f3 100644 --- a/hw/i386/pc_sysfw_ovmf.c +++ b/hw/i386/pc_sysfw_ovmf.c @@ -28,6 +28,8 @@ #include "hw/i386/pc.h" #include "exec/target_page.h" #include "cpu.h" +#include "target/i386/sev.h" +#include "kvm/tdx.h" =20 #define OVMF_TABLE_FOOTER_GUID "96b582de-1fb2-45f7-baea-a366c55a082d" =20 @@ -160,3 +162,34 @@ bool pc_system_ovmf_table_find(const char *entry, uint= 8_t **data, } return false; } + +void x86_firmware_configure(hwaddr gpa, void *ptr, int size) +{ + int ret; + + /* + * OVMF places a GUIDed structures in the flash, so + * search for them + */ + pc_system_parse_ovmf_flash(ptr, size); + + if (sev_enabled()) { + + /* Copy the SEV metadata table (if it exists) */ + pc_system_parse_sev_metadata(ptr, size); + + ret =3D sev_es_save_reset_vector(ptr, size); + if (ret) { + error_report("failed to locate and/or save reset vector"); + exit(1); + } + + sev_encrypt_flash(gpa, ptr, size, &error_fatal); + } else if (is_tdx_vm()) { + ret =3D tdx_parse_tdvf(ptr, size); + if (ret) { + error_report("failed to parse TDVF for TDX VM"); + exit(1); + } + } +} --=20 2.42.0 From nobody Sun Mar 22 14:11:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773922978; cv=none; d=zohomail.com; s=zohoarc; b=HKE03G1QBrYPJX64JWtOKBkFYgZnKYh/Cx/srdO0sB6Wt+ugJd+ETNIZq1k3QNaYHiuFEZXA5pXpUPKy8xXB1ycryfWuDj9tpra1DyVISQwVj8o8mWBWo4n61/I4qunJd4o8Z2I6vHGGpyJyfmx8BfoGDqmYE3feQENjrg17Xik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773922978; 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=8k2dL6NiY1MZVbnAT4dWt1HFJQUIJsjtqhbLDfxcAs8=; b=OsBoAUTxVNcYJ9oDkPYoEiv65imvIKRU9jBnbEu20dxlwfyjeOhferO1+SIwzI0lQks13plv6Ls4Y4mEVBzUN/gDeL2MP8Prw8XImAtXhtND2tTgwYkbANG/dlF7slr/zp+RwDoj/QyM67eJchzbNQphpKgQRrVYcjLluWlmDl8= 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 1773922978531483.14593860577884; Thu, 19 Mar 2026 05: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 1w3COR-0005Lr-BR; Thu, 19 Mar 2026 08:22:27 -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 1w3COL-0005Ge-V0 for qemu-devel@nongnu.org; Thu, 19 Mar 2026 08:22:25 -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 1w3COJ-0007gQ-QX for qemu-devel@nongnu.org; Thu, 19 Mar 2026 08:22:21 -0400 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-chrtJA_LMhi6iQsEWl-xBA-1; Thu, 19 Mar 2026 08:22:18 -0400 Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c70ea91bfe1so865228a12.1 for ; Thu, 19 Mar 2026 05:22:17 -0700 (PDT) Received: from rhel9-box.lan ([122.163.114.34]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-82a6bbe1ffbsm7876649b3a.43.2026.03.19.05.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 05:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773922939; 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=8k2dL6NiY1MZVbnAT4dWt1HFJQUIJsjtqhbLDfxcAs8=; b=RbaFO+7xAfBVLd1Jgdn15zgnqI4bIC8FhlXeuPv256HAYQrfoVzAuVGSavYceB6F1o2zxA +8yFE41mnBZuyIIc2KzSlblJocZYiUjAeV2YPLDbyVN6FQ2jdJtvn0+mzrHkEnMWOnqtm5 xxoCzaKTXNOkx6JomeIohlt1OiExR+Q= X-MC-Unique: chrtJA_LMhi6iQsEWl-xBA-1 X-Mimecast-MFC-AGG-ID: chrtJA_LMhi6iQsEWl-xBA_1773922937 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773922937; x=1774527737; 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=8k2dL6NiY1MZVbnAT4dWt1HFJQUIJsjtqhbLDfxcAs8=; b=JrX0EYK7NOrOV5YuRC7B8Xv5TV9AUgVtfwx7W7/YfhjaWKR+DCVvEJ5NkTrV/IEZj3 8VMvrYC1lFco49diOlRyrllxiFqPr7lhvyIw97Be9PRuez1HGAbhBiul5mC6mO+os+KB IVKRef0kugXKZUL3hmiMUHaL+Qj/cV6qJAiSc4bJXWUnNcd8LnPCHrUz3zkSkPKJ15+m ibWTyeDBmXE52/0STDLy14z5qh6M8ADnjO+b+Ql/3oDzDSHVHjFCdroCdpA/GYaZXD89 4mhnRJU9wXeByYeGGw3IjXQMcOxSO8ytMjN8bdqxsAvRGbqE+lm6qjE7vuTSe8S1by7W GitQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773922937; x=1774527737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8k2dL6NiY1MZVbnAT4dWt1HFJQUIJsjtqhbLDfxcAs8=; b=ai7DyIimdNyFHS6F1dey9YjZwZOgk3cKBCPXOOseH2XN0hH5vqbQLfWCTdb2+h3hNr YhOxa6Dwa/X/utGDJovx7NVLclbWqilNRVL0kPjMJwqN5LHHtDTMcXG68NBHqlFnAVqX zs2+3VUu5aVpfbpv7YHIJj1+9HOMt13Ji6K0XD4xpypai5B8KXXlNSLlpgr0o+eLlOw3 hbQY+L1Zbt2z117aLeLDYpJrG+9uN+AK+CDM4HNBkPsFQ74khRJU6CcJKm6I2JDYv9y3 Tr36BI2ogjbWrzQd9OqPDUNnljbC7wKe5bMvJdslvdlbjCnYhTDvZq7rp3QUHhT2rXkK pYow== X-Forwarded-Encrypted: i=1; AJvYcCXI6xk6qG7dXC6xv+EAfrzxUch6k9t9hpaj9oVaM5OGZ1pgHa+6AOpTwjhOAdXuUp1sgxpYySbJUTx5@nongnu.org X-Gm-Message-State: AOJu0YxSj5WwS8T2DJRp6lkZ5cu8ltfEZhMlcOVBg1gGlYGH66yR0dk7 2fxVfqV/eMYDTDaa7W5irgJjzmcyfuQigJejaKIt3R2Ih3r0LFXOdGLHcbTkkcyLOelXxQ+Ks/v gvq3s4Vbmt9jiYt3gsYMZVLmnAPs+qWHZN5uEF2Kbnz0Sepkdbr517VEf X-Gm-Gg: ATEYQzwGOUabuUhipW67QO1maUeVHlRWyIRHzuS7FrfCM5tOIdgavqFL+TP+BUcZnXr RcTaCsfVp0O8cRqVLfBpV9udle5wP3sMTE6Sk8kTkPBETG3zLPzBd8IEFBw029IQlLlZBIdTaaT urMG2+tBKb6pm8T5QwkJA6E+CQTD3fE2K0a3JXG648oFQuVdYlQSaUoE25ZNwng2YZZIiPL0vCM 7qn8sLKOxcx/wvvP6QUyX5uwGel8v5nLVwEtE24HftwRa95XsUC/V/zzVpt2pHeYFCCgIoUhkdT ylCE8FwDeu7Kc+jl63pfd5JQc8MHMsonpJ4q+Ikve38Ta5uP625C2ExmVjHqxJvZVdWBY5eR1od oZ/19x2iaLGibY7hdcs6PUPfnEIAo4HxK4/+mJc/SgHWuPf2kWG1LZng= X-Received: by 2002:a05:6a21:4781:b0:39b:7f5f:d58e with SMTP id adf61e73a8af0-39b99fd74d8mr6939175637.47.1773922936871; Thu, 19 Mar 2026 05:22:16 -0700 (PDT) X-Received: by 2002:a05:6a21:4781:b0:39b:7f5f:d58e with SMTP id adf61e73a8af0-39b99fd74d8mr6939157637.47.1773922936357; Thu, 19 Mar 2026 05:22:16 -0700 (PDT) From: Ani Sinha To: Paolo Bonzini , Marcelo Tosatti Cc: Ani Sinha , philmd@linaro.org, Michale Tokarev , kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH for-11.0 v2 2/2] i386/hyperv: add stubs for synic enablement Date: Thu, 19 Mar 2026 17:51:36 +0530 Message-ID: <20260319122137.142178-3-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20260319122137.142178-1-anisinha@redhat.com> References: <20260319122137.142178-1-anisinha@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=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773922980529154100 Content-Type: text/plain; charset="utf-8" Add a new call hyperv_enable_synic() that can be called whether or not CONFIG_HYPERV is enabled. This way genetic code in i396/kvm.c can call this function to enable synic for hyperv. For non-hyperv cases, the stub will be a noop. Reported-by: Michale Tokarev Signed-off-by: Ani Sinha Reviewed-by: Michael Tokarev Tested-by: Michael Tokarev --- target/i386/kvm/hyperv-stub.c | 5 +++++ target/i386/kvm/hyperv.c | 9 +++++++++ target/i386/kvm/hyperv.h | 1 + target/i386/kvm/kvm.c | 12 +++++------- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/target/i386/kvm/hyperv-stub.c b/target/i386/kvm/hyperv-stub.c index 5836f53c23..767a4c7e1a 100644 --- a/target/i386/kvm/hyperv-stub.c +++ b/target/i386/kvm/hyperv-stub.c @@ -61,3 +61,8 @@ uint64_t hyperv_syndbg_query_options(void) { return 0; } + +int hyperv_enable_synic(X86CPU *cpu) +{ + return 0; +} diff --git a/target/i386/kvm/hyperv.c b/target/i386/kvm/hyperv.c index f7a81bd270..bd3c26d02b 100644 --- a/target/i386/kvm/hyperv.c +++ b/target/i386/kvm/hyperv.c @@ -24,6 +24,15 @@ int hyperv_x86_synic_add(X86CPU *cpu) return 0; } =20 +int hyperv_enable_synic(X86CPU *cpu) +{ + int ret =3D 0; + if (!hyperv_is_synic_enabled()) { + ret =3D hyperv_x86_synic_add(cpu); + } + return ret; +} + /* * All devices possibly using SynIC have to be reset before calling this t= o let * them remove their SINT routes first. diff --git a/target/i386/kvm/hyperv.h b/target/i386/kvm/hyperv.h index e45a4512fe..a393a5d428 100644 --- a/target/i386/kvm/hyperv.h +++ b/target/i386/kvm/hyperv.h @@ -23,6 +23,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exi= t *exit); #endif =20 int hyperv_x86_synic_add(X86CPU *cpu); +int hyperv_enable_synic(X86CPU *cpu); void hyperv_x86_synic_reset(X86CPU *cpu); void hyperv_x86_synic_update(X86CPU *cpu); =20 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a29f757c16..9e352882c8 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1754,13 +1754,11 @@ static int hyperv_init_vcpu(X86CPU *cpu) return ret; } =20 - if (!hyperv_is_synic_enabled()) { - ret =3D hyperv_x86_synic_add(cpu); - if (ret < 0) { - error_report("failed to create HyperV SynIC: %s", - strerror(-ret)); - return ret; - } + ret =3D hyperv_enable_synic(cpu); + if (ret < 0) { + error_report("failed to create HyperV SynIC: %s", + strerror(-ret)); + return ret; } } =20 --=20 2.42.0