From patchwork Tue Feb 20 08:05:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Mr8Fk931; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBq71Z63z23cl for ; Tue, 20 Feb 2024 19:08:03 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL8u-0002fx-Ue; Tue, 20 Feb 2024 03:06:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL8t-0002fE-Cz for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL8s-0000OM-2s for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416377; 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=5M6GqtNLOa07YsEMestO7DblPI0uRRCNsI2L3ByJHtg=; b=Mr8Fk9313z9FRzUM038NDCgNlSOl3zzYEtnpIwbZFBOJeuC9oTdpGggA7ast+29CRh6kdY om7ARKPpDhInqGFZuFsgjsGYof8t0l0+chHcQCTsKLygac+72c6oYtnJt7kBtBmSFo65M8 QtTdMg9NY3n+QckxupeahY1TaZP5938= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-NgPVnVvPPK22GCD3EAF5fw-1; Tue, 20 Feb 2024 03:06:15 -0500 X-MC-Unique: NgPVnVvPPK22GCD3EAF5fw-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5642bbddd01so858926a12.0 for ; Tue, 20 Feb 2024 00:06:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416373; x=1709021173; 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=5M6GqtNLOa07YsEMestO7DblPI0uRRCNsI2L3ByJHtg=; b=YbVK/3ElkkJWclazpAy2GCQXonirLhR/LCbIDZIhcm2WQsOz34Ss31VYHyHTGYLi60 +bW+REeGUBH0I6XCrnq4TbyveLbj+9GZ9KzeMIxP6k3jWk8j0u25d/rbjLaLRQBHlqbO d47Z7GLUgutgySstXUH4mOq17aaPvGLF4Nuf/Rn4euINkafccnDVqkaMKtQYbKir75MJ cjWa6wlFLH7AqQf/dFLvktCfACmzWSSQt9oFjHMBBgFJIGsttQYXhnr68QJW68m0O64G ZJ2mpdDzHFW2ShQYJGEPAFr/c59D7obhcIQ7fXpmJAJYkPdNH16adGLz0aMTsCjl2jUl ZKMg== X-Gm-Message-State: AOJu0Yzxt86Wygm+AG97xlrR5s4WlMWTeEp04+gB5gu09liKvYksPeTq kdTY+d9SlC0AIFplAZtsTJfuKtujSBnGbFUhXx+VWd1BuxltnEnU1HPHW/a5RPUTMupsbBXxGsb rFHxaT+XmP4uMqm3FDRhvQIcvsDEgngnIgvTkGWYGZPnymNocS5tznvUD9FkWZuVwutK1huGrQr BmAlV6SsntsyYBC30rmV5FkmnkDiIs1Tm2vWP7 X-Received: by 2002:aa7:d4c7:0:b0:564:7bff:8472 with SMTP id t7-20020aa7d4c7000000b005647bff8472mr3222016edr.2.1708416373323; Tue, 20 Feb 2024 00:06:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFffOAWYSqMCLW8q9joK+KxqMMAKqRTVFKRB3xUieaAK2L47GofLMxDqzftjB9taZqLDewOEw== X-Received: by 2002:aa7:d4c7:0:b0:564:7bff:8472 with SMTP id t7-20020aa7d4c7000000b005647bff8472mr3221991edr.2.1708416372921; Tue, 20 Feb 2024 00:06:12 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id ek23-20020a056402371700b0055edfb81384sm3341873edb.60.2024.02.20.00.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Yang Weijiang , qemu-stable@nongnu.org Subject: [PULL 01/17] i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available Date: Tue, 20 Feb 2024 09:05:42 +0100 Message-ID: <20240220080558.365903-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li Leaf FEAT_XSAVE_XSS_LO and FEAT_XSAVE_XSS_HI also need to be cleared when CPUID_EXT_XSAVE is not set. Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features") Signed-off-by: Xiaoyao Li Reviewed-by: Yang Weijiang Message-ID: <20240115091325.1904229-2-xiaoyao.li@intel.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0cd32a6fce3..800caeb593b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6927,6 +6927,8 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { env->features[FEAT_XSAVE_XCR0_LO] = 0; env->features[FEAT_XSAVE_XCR0_HI] = 0; + env->features[FEAT_XSAVE_XSS_LO] = 0; + env->features[FEAT_XSAVE_XSS_HI] = 0; return; } From patchwork Tue Feb 20 08:05:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901247 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=P2We+nW8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBqK48yyz23cy for ; Tue, 20 Feb 2024 19:08:13 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL92-0002ge-71; Tue, 20 Feb 2024 03:06:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL90-0002gF-Tt for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:27 -0500 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 1rcL8y-0000Ot-K0 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416384; 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=OoZNemosrZlF0VbcrQ10QwNx5AdowgSfJjGMKLwo9d8=; b=P2We+nW8JWHRTMzhwks/0US7z39seeoaZHLem+VKMKee3kVXnZ/hLyFVMi7D1nR+UDZNEm KKQIkMcf1bLdduGH85SNhJFyerhKND2nDhfrR209y4bpvPEiE+e3reveiEMYAxONUVt+aC rtTpnrXAnADMqU855oPH6FPn8XZccFo= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-176-m59GQlM9NyCg9Y6-8hAJTw-1; Tue, 20 Feb 2024 03:06:22 -0500 X-MC-Unique: m59GQlM9NyCg9Y6-8hAJTw-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a3ede65e32bso39251066b.1 for ; Tue, 20 Feb 2024 00:06:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416380; x=1709021180; 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=OoZNemosrZlF0VbcrQ10QwNx5AdowgSfJjGMKLwo9d8=; b=u0DljWyCF5K/FE6BPccZLoGDVyJwhr6jykB1f3vGqxKcOHDG2Dsmts46tzoI20vyY2 pmIKalJ94DlfnZA9EXiG1XU3hHecYYU4kABJPfJOScwEf1MT23bUYkJUOCPxeRb6g2O/ 8S1UCLZK77AMm2lmVpybH2UEtfvRayVfj1ZnEz3JyP1bJuT12XgdFeQGGHwmEakdtbIS OdDBccQoQeeyf44NYLVZyBLjH302MC/iC3I5GeY35jKnVbnFovjfTz+cQjS7WioxRZ+1 0ypMIXqOr+zRXSRgpTWZm3LkQbBc1jzAq0HaEbrZq4xd49P0jsvJoeo/5q7gRqeNGLfe c/2g== X-Gm-Message-State: AOJu0YzMNlH9vuoHEwZV9WgaRZiX84cNRiTkW4bzLNp2XmdOZr4UbeHF Ftw7qcsmolD3XAmWneKk50uTRgi9R4FEXOuY0SAxitErPSEaNBSEP19SxWLqGo9HxsG4w50hkAW yTYU/m/oHyN3+DkkPoe5jhSmpg7Eo60WeHbik7cFWmeoRcstYa9FVZUhn5hG4Bp3eqpT1wKkgeO ndy3FI15B8/bdHC+pv82Q+bNg5xdO3s2jmOY3W X-Received: by 2002:a17:906:27d1:b0:a3e:5ae8:5777 with SMTP id k17-20020a17090627d100b00a3e5ae85777mr4299937ejc.44.1708416380572; Tue, 20 Feb 2024 00:06:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoB9jVXQStklP/BiPSiKiUY8e4W4dTDRom3ggsec4DHRFY3O6UhwT7eG2BBZWfRRRKNx94GQ== X-Received: by 2002:a17:906:27d1:b0:a3e:5ae8:5777 with SMTP id k17-20020a17090627d100b00a3e5ae85777mr4299914ejc.44.1708416380124; Tue, 20 Feb 2024 00:06:20 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id se7-20020a170906ce4700b00a3d26a25cbasm3688569ejb.37.2024.02.20.00.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Yang Weijiang , qemu-stable@nongnu.org Subject: [PULL 02/17] i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs Date: Tue, 20 Feb 2024 09:05:43 +0100 Message-ID: <20240220080558.365903-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li The value of FEAT_XSAVE_XCR0_HI leaf and FEAT_XSAVE_XSS_HI leaf also need to be masked by XCR0 and XSS mask respectively, to make it logically correct. Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features") Signed-off-by: Xiaoyao Li Reviewed-by: Yang Weijiang Message-ID: <20240115091325.1904229-3-xiaoyao.li@intel.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 800caeb593b..3ce138fecb7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6947,9 +6947,9 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) } env->features[FEAT_XSAVE_XCR0_LO] = mask & CPUID_XSTATE_XCR0_MASK; - env->features[FEAT_XSAVE_XCR0_HI] = mask >> 32; + env->features[FEAT_XSAVE_XCR0_HI] = (mask & CPUID_XSTATE_XCR0_MASK) >> 32; env->features[FEAT_XSAVE_XSS_LO] = mask & CPUID_XSTATE_XSS_MASK; - env->features[FEAT_XSAVE_XSS_HI] = mask >> 32; + env->features[FEAT_XSAVE_XSS_HI] = (mask & CPUID_XSTATE_XSS_MASK) >> 32; } /***** Steps involved on loading and filtering CPUID data From patchwork Tue Feb 20 08:05:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KuTK1Y6N; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBpd61cXz23cl for ; Tue, 20 Feb 2024 19:07:37 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL9E-0002iq-El; Tue, 20 Feb 2024 03:06:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9D-0002iQ-Fw for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:39 -0500 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 1rcL99-0000Pn-Rp for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416395; 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=YE/crpx08q0cvPrENC0BpfjOnpLuB9SgYwlLiwfyZzU=; b=KuTK1Y6Nq/h4H9nAb5LDteTgqLL1XOEpxBSte88Qr4ATdhjgLSiG4IACGJqmLUTSp+A0lN 0zyZYUtkxEbm4eIznFp4/BiCervEeLV9I5NawYimTXkgskXMdnrFuZ0PDIj3Jd0qxM9K0B ADNy2bHnkd0gz3EQch7MXueUymXQ+JY= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-eyLmxuqPOXCulOyJ6jFdXQ-1; Tue, 20 Feb 2024 03:06:33 -0500 X-MC-Unique: eyLmxuqPOXCulOyJ6jFdXQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a3ef988b742so19794566b.3 for ; Tue, 20 Feb 2024 00:06:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416391; x=1709021191; 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=YE/crpx08q0cvPrENC0BpfjOnpLuB9SgYwlLiwfyZzU=; b=bIlNOv2ssg40kEc436FdOvXo9zLcrezP7hEF6jAaoGT9DUmWyII6Z4RWkEoORYfKgT EMF62TUN5zkJYWdzOAmLBT5uU23XFC0H5GNgj50fOmh7Q2SMM3k9neg5/ZRx2tup+tK5 vI3Dzqsgx34oGC7LtcJ1KMLxJUfYAAIX9iEBcGF40ka2BuOXinEvJD8AD5A0xDJZJ7yA 2SYHlCRGhidgJ5oQUBNn8ta32n7W1jrbQDFx2h9Y/sQzwH6gLx5j3JDNPOQIBcLbGdyk QmIky1LFgi2ZNuwc/gbUsX1bns+DozEaFIOW+mcXuh5iIMDYmgOuBH4LnR6uz5zJijbk 1atA== X-Gm-Message-State: AOJu0YxW26qKVZ8jG9WqyCYkbbhLJXh5pxm8kvg4W73v6vzw3tCeM+Pb b1nsOqE3FF3R6Et5VA1002kTgbJJZONH1UsriMSYJFapo/L2ecmB1nmaNXr/4HUIwIpknY+Ihsv HFupjIMxSeXMXPRRiRmG8B9We+Ex+Napt1Wzex8Xb0erE0dx7SKwKXLjIG6VEY7dPF90m1eaaCz KLqGxjW2saei/3BUFNNPzCop4TmL7/hdG4LCod X-Received: by 2002:a17:906:3901:b0:a3f:f73:411f with SMTP id f1-20020a170906390100b00a3f0f73411fmr315011eje.45.1708416391709; Tue, 20 Feb 2024 00:06:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHeQtLMa5wLegIZJblxVsKBVCFEvFVNOwpzMow3lxE8tzuLe0cFYZpi98xlhG2awya04XvC+g== X-Received: by 2002:a17:906:3901:b0:a3f:f73:411f with SMTP id f1-20020a170906390100b00a3f0f73411fmr314992eje.45.1708416391408; Tue, 20 Feb 2024 00:06:31 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id r8-20020a170906364800b00a3e4e7ad9dbsm2779284ejb.68.2024.02.20.00.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li Subject: [PULL 03/17] target/i386: Add support of KVM_FEATURE_ASYNC_PF_VMEXIT for guest Date: Tue, 20 Feb 2024 09:05:44 +0100 Message-ID: <20240220080558.365903-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li KVM_FEATURE_ASYNC_PF_VMEXIT has been introduced for years, however QEMU doesn't support expose it to guest. Add support for it. Signed-off-by: Xiaoyao Li Message-ID: <20231024083354.1171308-1-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3ce138fecb7..bca776e1fe9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -857,7 +857,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { .feat_names = { "kvmclock", "kvm-nopiodelay", "kvm-mmu", "kvmclock", "kvm-asyncpf", "kvm-steal-time", "kvm-pv-eoi", "kvm-pv-unhalt", - NULL, "kvm-pv-tlb-flush", NULL, "kvm-pv-ipi", + NULL, "kvm-pv-tlb-flush", "kvm-asyncpf-vmexit", "kvm-pv-ipi", "kvm-poll-control", "kvm-pv-sched-yield", "kvm-asyncpf-int", "kvm-msi-ext-dest-id", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, From patchwork Tue Feb 20 08:05:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fk/62gKE; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBq05M8Sz23cl for ; Tue, 20 Feb 2024 19:07:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL9H-0002jW-3P; Tue, 20 Feb 2024 03:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9F-0002jC-9o for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:41 -0500 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 1rcL9D-0000Q4-Tu for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416399; 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=5yV+/CAeygfSb5g+w1cF0lo6AYhW6ddAlCFrpr+vO+w=; b=fk/62gKE0vz8dwGYpzIHbAbZKKAu7zNE1Mr9osuiAC8uzStzmqzId6BfjDs7iit+MA2edE 5JdWcfhDgU+UXJXJ4JRz0g0BPyss16q+eA10FG04k4YIeaPbQRumT7ED/22wp5qYWJN6nl mVGiScXRB56VQ7Cdq7uBv2DnCi5+MaU= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-AKC4IgiqOCyrXWKAz6z_kQ-1; Tue, 20 Feb 2024 03:06:36 -0500 X-MC-Unique: AKC4IgiqOCyrXWKAz6z_kQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a2f71c83b7eso433086966b.1 for ; Tue, 20 Feb 2024 00:06:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416394; x=1709021194; 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=5yV+/CAeygfSb5g+w1cF0lo6AYhW6ddAlCFrpr+vO+w=; b=mX+m9gEk/bHhcjrnMlt5KYOIqveFXMTFcKeL896OmsCG+lPbU8yLxniD4pE0BdRNEM rkopQL6tekIiMwIY5JI9TpKFdhDB8xUIJX3kzs3ivkUcoi7qWNs88R6T4QQDd5UZIexX +0f3ejLQ09OWOmNTsrtZtp71gA7TMI9VP7OWnvufprqYEqgJ2/bum8z459DUjtHXYE12 A1eI3+ZVw1+Nx4Ig7cxhnsD9STLUvnXpRXRP4Ji/zWQ2QTbtxOUiKNLQ4ZW1qctEu0xo CnGBqXvw/OhSmqnLfsLbybFF2+NqabNnRoHKSNamf4O7GSwCfwwjP76vtSmcc72xioK+ heRg== X-Gm-Message-State: AOJu0YyGHQ53dX/BKbebiP4NCPXzZG8gDgTJqzryJSGNjBuHFUHYT869 nT6GCIEjr3yyt5V0yrYGQvnfIPqYcUA9v/0NWgx1ZZtmJdWlCD2O0yGkkMYQEVTLh5B7HnxkmNd oGZdvnJjTnha2nDOJygk+W6MJwsRCWd5oDWR0Qg5boyLfI6Rh1oJhLpmW85ej0GzDrurFaddSsQ dW+XusAkYKqtjP+QkztUCp81YX86tyoQuv8eDl X-Received: by 2002:a17:906:7d46:b0:a3e:4553:ba31 with SMTP id l6-20020a1709067d4600b00a3e4553ba31mr4350025ejp.28.1708416394197; Tue, 20 Feb 2024 00:06:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkMgnCyBHS0Xbsw2Tvrh6l+vKfAu7QvipFOg+yblRkGgMmMg7Rg2O28fsTFxmIcllcXqs7CA== X-Received: by 2002:a17:906:7d46:b0:a3e:4553:ba31 with SMTP id l6-20020a1709067d4600b00a3e4553ba31mr4350010ejp.28.1708416393932; Tue, 20 Feb 2024 00:06:33 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id ll5-20020a170907190500b00a3f0386dc96sm236383ejc.89.2024.02.20.00.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Isaku Yamahata , David Hildenbrand , David Woodhouse , "Michael S . Tsirkin" Subject: [PULL 04/17] i386/pc: Drop pc_machine_kvm_type() Date: Tue, 20 Feb 2024 09:05:45 +0100 Message-ID: <20240220080558.365903-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li pc_machine_kvm_type() was introduced by commit e21be724eaf5 ("i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode") to do Xen specific initialization by utilizing kvm_type method. commit eeedfe6c6316 ("hw/xen: Simplify emulated Xen platform init") moves the Xen specific initialization to pc_basic_device_init(). There is no need to keep the PC specific kvm_type() implementation anymore. So we'll fallback to kvm_arch_get_default_type(), which simply returns 0. Signed-off-by: Xiaoyao Li Reviewed-by: Isaku Yamahata Reviewed-by: David Hildenbrand Acked-by: David Woodhouse Acked-by: Michael S. Tsirkin Message-ID: <20231007065819.27498-1-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ec0e5efcb28..02a0deedd3c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -310,15 +310,12 @@ extern const size_t pc_compat_1_5_len; extern GlobalProperty pc_compat_1_4[]; extern const size_t pc_compat_1_4_len; -int pc_machine_kvm_type(MachineState *machine, const char *vm_type); - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \ MachineClass *mc = MACHINE_CLASS(oc); \ optsfn(mc); \ mc->init = initfn; \ - mc->kvm_type = pc_machine_kvm_type; \ } \ static const TypeInfo pc_machine_type_##suffix = { \ .name = namestr TYPE_MACHINE_SUFFIX, \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 196827531a5..28194014f82 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1756,11 +1756,6 @@ static void pc_machine_initfn(Object *obj) cxl_machine_init(obj, &pcms->cxl_devices_state); } -int pc_machine_kvm_type(MachineState *machine, const char *kvm_type) -{ - return 0; -} - static void pc_machine_reset(MachineState *machine, ShutdownCause reason) { CPUState *cs; From patchwork Tue Feb 20 08:05:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AneRW4C9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBny0mBhz23cy for ; Tue, 20 Feb 2024 19:07:01 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL9J-0002k8-0l; Tue, 20 Feb 2024 03:06:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9G-0002jV-VV for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9F-0000QG-9U for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416400; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MCJF7iMGMoLJv/RXZyxeTLRASb/UgT/sAKL+7AcIFUs=; b=AneRW4C9zh5JGFXvE25AStcBA8sXb3KBgPWfToNZrVmWr6J4qqDzAg3GvN1mq1DTRWdBU7 CAcvl4bZmQEVfBis+00tt3I1/+wL30opEXMWwDlxITCqD4OWXERnqdfywTrtmp32gB4cTw Sxc1Cqv2ohSvPwdhWudrvs3Q/v6qwzM= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-7AZopYIcNmy_Vuj2lVseSw-1; Tue, 20 Feb 2024 03:06:39 -0500 X-MC-Unique: 7AZopYIcNmy_Vuj2lVseSw-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5640681bc11so1963949a12.2 for ; Tue, 20 Feb 2024 00:06:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416397; x=1709021197; 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=MCJF7iMGMoLJv/RXZyxeTLRASb/UgT/sAKL+7AcIFUs=; b=JVdZwmrLmKV4Gwslyc1/xhfILiBLL8K6AKy5kpPgdfTG7nCrTcfI6K85Vuvrp82nfj guhnFNr8LGSXu9jQoKWtPhFuY3QMWMv2dTEyYquGtvZzaCI6DD/tTaHiJZAGHX8/2sFk Zw1N+mLFCabKQuyPlnLmDZ1ct92Yxz+plw/7Kox3ZV+iAW/FinU/NI1P/STs5nzi26hj jKngRyNdUlR3kM/vyMO9puJo5BfqDqDykoYGKDqKLi/QKtEsPvY+tLcMbEidaSfFj3A2 NBKbdBQeHLI0np0CjqCR7yuXbX0iyfP5Ob8cwwByblgU2lK5aesj3ihAbFruBarWLY85 5A+g== X-Gm-Message-State: AOJu0YwairWROpzm0uM6MmrzsPSda3nZ0i1uD3kBCWVDKxeTn0HFKmPK i0zbDAQOPYT+eDGCqSizNUyYpJv5/9vn6nR9YS9hijh4lAIJ+uzi9Zu5c1YffNpSLQqXvVSCPGl iu1u2ui4pKFAghsZdW9PDTu+DoLt/h/tr8vlxJUcAA35AiTwiC7hPyKgTT7I3Acv8deEBHHFW+A pN13FpckjjZL2vMGgW7S+ICDtC2FuU+bggfIHE X-Received: by 2002:aa7:ca52:0:b0:563:ea79:fccd with SMTP id j18-20020aa7ca52000000b00563ea79fccdmr8044867edt.11.1708416397181; Tue, 20 Feb 2024 00:06:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaQTb6glt3K+r9vYFLfurLWMB1Aw7fpFhS4FXlRLIZAiBZMMtaQ9Gv2Tfv2xUss11SIJ9HfQ== X-Received: by 2002:aa7:ca52:0:b0:563:ea79:fccd with SMTP id j18-20020aa7ca52000000b00563ea79fccdmr8044853edt.11.1708416396844; Tue, 20 Feb 2024 00:06:36 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id p27-20020a056402501b00b00562d908daf4sm3501996eda.84.2024.02.20.00.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 05/17] physmem: replace function name with __func__ in ram_block_discard_range() Date: Tue, 20 Feb 2024 09:05:46 +0100 Message-ID: <20240220080558.365903-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li Use __func__ to avoid hard-coded function name. Signed-off-by: Xiaoyao Li Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240125023328.2520888-1-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- system/physmem.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 5e66d9ae361..5e054650b88 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3495,16 +3495,15 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) uint8_t *host_startaddr = rb->host + start; if (!QEMU_PTR_IS_ALIGNED(host_startaddr, rb->page_size)) { - error_report("ram_block_discard_range: Unaligned start address: %p", - host_startaddr); + error_report("%s: Unaligned start address: %p", + __func__, host_startaddr); goto err; } if ((start + length) <= rb->max_length) { bool need_madvise, need_fallocate; if (!QEMU_IS_ALIGNED(length, rb->page_size)) { - error_report("ram_block_discard_range: Unaligned length: %zx", - length); + error_report("%s: Unaligned length: %zx", __func__, length); goto err; } @@ -3528,8 +3527,8 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) * proper error message. */ if (rb->flags & RAM_READONLY_FD) { - error_report("ram_block_discard_range: Discarding RAM" - " with readonly files is not supported"); + error_report("%s: Discarding RAM with readonly files is not" + " supported", __func__); goto err; } @@ -3544,27 +3543,26 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) * file. */ if (!qemu_ram_is_shared(rb)) { - warn_report_once("ram_block_discard_range: Discarding RAM" + warn_report_once("%s: Discarding RAM" " in private file mappings is possibly" " dangerous, because it will modify the" " underlying file and will affect other" - " users of the file"); + " users of the file", __func__); } ret = fallocate(rb->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, start, length); if (ret) { ret = -errno; - error_report("ram_block_discard_range: Failed to fallocate " - "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx (%d)", + __func__, rb->idstr, start, length, ret); goto err; } #else ret = -ENOSYS; - error_report("ram_block_discard_range: fallocate not available/file" + error_report("%s: fallocate not available/file" "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + __func__, rb->idstr, start, length, ret); goto err; #endif } @@ -3582,25 +3580,23 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) } if (ret) { ret = -errno; - error_report("ram_block_discard_range: Failed to discard range " + error_report("%s: Failed to discard range " "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + __func__, rb->idstr, start, length, ret); goto err; } #else ret = -ENOSYS; - error_report("ram_block_discard_range: MADVISE not available" - "%s:%" PRIx64 " +%zx (%d)", - rb->idstr, start, length, ret); + error_report("%s: MADVISE not available %s:%" PRIx64 " +%zx (%d)", + __func__, rb->idstr, start, length, ret); goto err; #endif } trace_ram_block_discard_range(rb->idstr, host_startaddr, length, need_madvise, need_fallocate, ret); } else { - error_report("ram_block_discard_range: Overrun block '%s' (%" PRIu64 - "/%zx/" RAM_ADDR_FMT")", - rb->idstr, start, length, rb->max_length); + error_report("%s: Overrun block '%s' (%" PRIu64 "/%zx/" RAM_ADDR_FMT")", + __func__, rb->idstr, start, length, rb->max_length); } err: From patchwork Tue Feb 20 08:05:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fpEe/fZ0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBqM0ZBHz23cl for ; Tue, 20 Feb 2024 19:08:15 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL9K-0002kw-P1; Tue, 20 Feb 2024 03:06:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9J-0002kF-7K for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9H-0000QZ-Rp for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:06:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416403; 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=ilU+ngAoaU7FTHYc2Q8TyToaavovBkXrTxoRpdQ4t94=; b=fpEe/fZ0bobRfv01jMGB7+gh+leYCcwEjCrFSLHgv7K20+Mdgtd1ABnkAZmIOqtM+1Ssip Aihy72IYEtm78Yh6VDvjenQQzKdMuhTrzIblzPSyAfxI0geKySFW3YWhGtlVVMmAQzq3ku g/gZC5uQ7M/d/+hYOAqDuk3qIhjjV0k= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-D-jMGE9YPWmSvkHniJZobQ-1; Tue, 20 Feb 2024 03:06:41 -0500 X-MC-Unique: D-jMGE9YPWmSvkHniJZobQ-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a3ee69976dfso28242166b.3 for ; Tue, 20 Feb 2024 00:06:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416399; x=1709021199; 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=ilU+ngAoaU7FTHYc2Q8TyToaavovBkXrTxoRpdQ4t94=; b=rIw5I1vOaykECEv/MElpzY66A40zYRAvnx3zPPjmXhOBf5igYLVvD2StjrFSQ48TEY iY5pOCOzdhPeEvlsz4SO5ZwD8G6ZzljYpKBIcE7mOa384dMVeIYjBRvm9qtVglCbavdM twvfMq4T2bpeubWT0KlgsskAqL5fwdT29Lc0jDo9PzbXaSU2s9/w60y80wqm/vAltm52 IWZPctK+lBUVsB3YslZZXRf8P8wTc5OcKIkO9ffBPtt6cDoU22v/SUi4hyIFHYe6pEpX uJBZBfuOx5AIy65mPbNKRMGbzQ5nG3/Pea7YPiA5K89vGh4/rNKHuONJLrPhROLYurXj pM9Q== X-Gm-Message-State: AOJu0YzbnS8DsIBNgH618EOLGD0Z+6cdLbb7WHO27eGuUQ1NgI0d+D8O TeZLjXiIefRq/vl4TrrbOe3ifN6qEAMx8e1yP0bIUT3N6rxOiZcUWVpyU73bpYUBi9MtgRnrOG4 5jp+snaOqsS4ys/ZWOI2C+TW9PLiLV8gN+kwt088H5PifOOEDSvncIHeRvU5ggOjtImaKvVsso2 29C4pF4YUCrVqFRO1D9Sr2zFbDZkKvyNZonnx4 X-Received: by 2002:a17:906:b094:b0:a3d:1cbd:67f7 with SMTP id x20-20020a170906b09400b00a3d1cbd67f7mr9428994ejy.0.1708416399663; Tue, 20 Feb 2024 00:06:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFcFia9P/w6iK9JN1YCStU2Plsx3QV42DboLuQrksPUPBLbVheRS7EIp8hXx3Vwy90HFLKAOw== X-Received: by 2002:a17:906:b094:b0:a3d:1cbd:67f7 with SMTP id x20-20020a170906b09400b00a3d1cbd67f7mr9428972ejy.0.1708416399359; Tue, 20 Feb 2024 00:06:39 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id rf23-20020a1709076a1700b00a3da5bf6aa5sm3707176ejc.211.2024.02.20.00.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , qemu-stable@nongnu.org Subject: [PULL 06/17] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F Date: Tue, 20 Feb 2024 09:05:47 +0100 Message-ID: <20240220080558.365903-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li Existing code misses a decrement of cpuid_i when skip leaf 0x1F. There's a blank CPUID entry(with leaf, subleaf as 0, and all fields stuffed 0s) left in the CPUID array. It conflicts with correct CPUID leaf 0. Signed-off-by: Xiaoyao Li Reviewed-by:Yang Weijiang Message-ID: <20240125024016.2521244-2-xiaoyao.li@intel.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 76a66246eb7..dff9dedbd76 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1914,6 +1914,7 @@ int kvm_arch_init_vcpu(CPUState *cs) } case 0x1f: if (env->nr_dies < 2) { + cpuid_i--; break; } /* fallthrough */ From patchwork Tue Feb 20 08:05:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZoCnQBnp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBwV6Z9Sz1yP6 for ; Tue, 20 Feb 2024 19:12:41 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLEW-00062g-0S; Tue, 20 Feb 2024 03:12:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLEU-00062W-1A for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:12:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLEH-0001JI-Qf for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:12:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416712; 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=CMnsr6hcGke44dd+ja2+9AFJ8eqcK1lbFVapTuTjVcM=; b=ZoCnQBnpH4agaBWlU2aUQcDztRwTWu/K/xMRcLvf2+peUhc+2FM/H5iBACSE+V9i4Rsrem TvbEexldZrnV3qIcnUn93sTBKU2JcfSUlzQdbN7yDBvmKfNYj/+ctK1AyJ5fWWzo83znBj fWPhfJYGYLCP57Otwv/wNbPF6w5UCl0= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-WYgHcnDqOkuOjzSzG5pNqg-1; Tue, 20 Feb 2024 03:11:51 -0500 X-MC-Unique: WYgHcnDqOkuOjzSzG5pNqg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a3e6f366aceso68340366b.3 for ; Tue, 20 Feb 2024 00:11:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416407; x=1709021207; 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=CMnsr6hcGke44dd+ja2+9AFJ8eqcK1lbFVapTuTjVcM=; b=VVklq42phUY8ePKimh1aBEO9qNagGH/rhxg7on4kf/pB5oCnBz7VvKyRs+DVR6CLzB vgqhfWmszZTjUaPeE77MXfzZVRoc//PU/l/ToMMxKU3CflqPv4LyDjMskhGbmvUI5dJ6 u3Nz+U+VTDq2aHqmlky80AYaYKl1W9GEaBDj6WYk2eKXx7pGcETrT+A0ZVMrynzXcZwr 7vC8QgFz8AzaO467o0q5aQ4zlCNUua40z3SMHJIaRV8gUZmHSOF6FFTqeJaVydQEP84O hZvVmETP+ScrOmOSGK0Fwxba6NNilN1kU6DCW5HDV0aNw13l/OsEiz4S6pqMdMnxq7TF x6bg== X-Gm-Message-State: AOJu0YyzggL0ANsRXjjhOrJa67jJZ6R2qQmfrjP0/XN8TcrmZ9Lhbg20 rcaIz3vpjl5E2tKvioos4SAGS+9C1BEpGjWKcEYadAzxErs+ElQvi4L0QRvr7dgqT26tAdQ7CYR BIVUTJ+q58VC6UySILhkCPPBWoogSAyScgKxarUDTRcjMS+e+HqdFHZU6GzSp5rXc1J9mHwS66F 8JxCt8YSfSjSDuvYcM3ADkS6kyMwhgb4Uj2pHv X-Received: by 2002:a17:906:8d5:b0:a3d:993e:ad24 with SMTP id o21-20020a17090608d500b00a3d993ead24mr8750576eje.59.1708416407079; Tue, 20 Feb 2024 00:06:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuaeBfODDBMc9YFQ6ztRBfrlFrLuFoHQNPTJLUGIwLRcvEcc0dAwEJLZ1oPOYJpnr8f9xkkQ== X-Received: by 2002:a17:906:8d5:b0:a3d:993e:ad24 with SMTP id o21-20020a17090608d500b00a3d993ead24mr8750563eje.59.1708416406794; Tue, 20 Feb 2024 00:06:46 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id yj7-20020a170907708700b00a3e881b4b25sm2002779ejb.164.2024.02.20.00.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:06:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li Subject: [PULL 07/17] i386/cpuid: Remove subleaf constraint on CPUID leaf 1F Date: Tue, 20 Feb 2024 09:05:48 +0100 Message-ID: <20240220080558.365903-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li No such constraint that subleaf index needs to be less than 64. Signed-off-by: Xiaoyao Li Reviewed-by:Yang Weijiang Message-ID: <20240125024016.2521244-3-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index dff9dedbd76..9758c83693e 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1926,10 +1926,6 @@ int kvm_arch_init_vcpu(CPUState *cs) break; } - if (i == 0x1f && j == 64) { - break; - } - c->function = i; c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX; c->index = j; From patchwork Tue Feb 20 08:05:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VSTtuowJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBpv60Qkz23cl for ; Tue, 20 Feb 2024 19:07:51 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcL9o-0003G5-2S; Tue, 20 Feb 2024 03:07:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcL9l-0003Dq-Rz for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:13 -0500 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 1rcL9k-0000UV-GG for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416432; 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=cDTEy60SoXRleDwrAWU00Ca7c/Scw+qH/gbVv2mAVbk=; b=VSTtuowJ7SQEtTfkuSmnjkLfHKjowLicjWf9YWz/vFZ9s1Ha7v3Gh8a4t/0dtgffhxpG3H LnR+BY9lUramrqL+B2VX/HfqdzogZrzrr+fQis457Ics9OBmmgufUhihZ09iIxuIrJdT2x Jv7WZ1mblFlcFrlCG6sAcG6khce0HJs= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-m-GOe33WM4eh57CbgpRPJg-1; Tue, 20 Feb 2024 03:07:10 -0500 X-MC-Unique: m-GOe33WM4eh57CbgpRPJg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-559555e38b0so3977597a12.3 for ; Tue, 20 Feb 2024 00:07:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416429; x=1709021229; 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=cDTEy60SoXRleDwrAWU00Ca7c/Scw+qH/gbVv2mAVbk=; b=o99tnGC4REjXG+Nf2FvtArOYdYoDy3zPexWs1GH/gXijJfw5gw8MxBo8Ta1MWB1cSV gH62BJll7pFYMuJWsoaacHmdqQpRhd3tF7I/+Cu7iln4ZrLWCZN/YglArO3TNucHDyTW YubdgzO2qQKOslhCuxeSZDDhPeL+2DGrCdFJ+SQyh08BsrKfCT0z8Wno4ywANzMQdUXj Ob/fV15+cF4DaZUUOL7ty1vuGIX7ZQ/UmxHc1ggPZxurCIAl3YZ+CjzLVDR48DjMfF30 b3s0eJq+OjLifuy+x3u060UXRAbUhhm6bV10t4iTNhFElBXf8JPoZa8ujH4WlCxg4WVH wTog== X-Gm-Message-State: AOJu0YyjrrLVI8uWO13FcQgDlECvIDWksbNRExE2zsaQoBhaga1rzPX3 Svn8H/jCbEouHYlkvqBkjOgHWjCA/ZIbWy44o1Bjgsvx3D+JMdt2iytMwOFs3ri49jvDoNCB4A5 dR8I+iy43eDRolSBQzhlkkT7rn2rdgodEVqAEuAZ7xvcdEF6l4xjPZfwnUuvlz9vUSV5Vkb16mQ LtrQI1gHGELAX82kdHclv142whgQBakV79rNnE X-Received: by 2002:aa7:cd13:0:b0:564:d702:a17d with SMTP id b19-20020aa7cd13000000b00564d702a17dmr145590edw.30.1708416429190; Tue, 20 Feb 2024 00:07:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGP8rOQMfzXxVWWob46EKejnNlkcajUWma2Rf+DU9Kt6tE0PQDz/+XBgQfmZA8W3veSwgr3Eg== X-Received: by 2002:aa7:cd13:0:b0:564:d702:a17d with SMTP id b19-20020aa7cd13000000b00564d702a17dmr145573edw.30.1708416428905; Tue, 20 Feb 2024 00:07:08 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id el14-20020a056402360e00b0055fba4996d9sm3400912edb.71.2024.02.20.00.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:07:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , qemu-stable@nongnu.org Subject: [PULL 08/17] i386/cpuid: Move leaf 7 to correct group Date: Tue, 20 Feb 2024 09:05:49 +0100 Message-ID: <20240220080558.365903-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li CPUID leaf 7 was grouped together with SGX leaf 0x12 by commit b9edbadefb9e ("i386: Propagate SGX CPUID sub-leafs to KVM") by mistake. SGX leaf 0x12 has its specific logic to check if subleaf (starting from 2) is valid or not by checking the bit 0:3 of corresponding EAX is 1 or not. Leaf 7 follows the logic that EAX of subleaf 0 enumerates the maximum valid subleaf. Fixes: b9edbadefb9e ("i386: Propagate SGX CPUID sub-leafs to KVM") Signed-off-by: Xiaoyao Li Message-ID: <20240125024016.2521244-4-xiaoyao.li@intel.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 9758c83693e..42970ab046f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1951,7 +1951,6 @@ int kvm_arch_init_vcpu(CPUState *cs) c = &cpuid_data.entries[cpuid_i++]; } break; - case 0x7: case 0x12: for (j = 0; ; j++) { c->function = i; @@ -1971,6 +1970,7 @@ int kvm_arch_init_vcpu(CPUState *cs) c = &cpuid_data.entries[cpuid_i++]; } break; + case 0x7: case 0x14: case 0x1d: case 0x1e: { From patchwork Tue Feb 20 08:05:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VZLpyVAJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBqW1jJmz23cl for ; Tue, 20 Feb 2024 19:08:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLAA-0004tm-Uf; Tue, 20 Feb 2024 03:07:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLA5-0004k5-6W for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLA2-0000Vi-MT for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416450; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lH54QBenIkKz2SFD32IDe+ZcrIDsRVoxMKqUbplF1dY=; b=VZLpyVAJf7Rz3EUTqOGBdrZETtb//LD/S2RD/QKLZ3jwmSr6vbin17J6OS+aqA9FMOwiAK V+x96Wiq3pCcafbEsg1hBWyHcpJkL9g11mOvZZyoCTH+hm5IVuo2pfVi7+j7ggDD/wFLoT dD1CKMhsJqiJdBG4HNq7qR0+K7amTVc= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-93-1A9-aKY4OgW0MHofkDgoHg-1; Tue, 20 Feb 2024 03:07:28 -0500 X-MC-Unique: 1A9-aKY4OgW0MHofkDgoHg-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a2f71c83b7eso433140966b.1 for ; Tue, 20 Feb 2024 00:07:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416446; x=1709021246; 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=lH54QBenIkKz2SFD32IDe+ZcrIDsRVoxMKqUbplF1dY=; b=aafNGaVHAPLXPq3NTxqpNh35FF637jDWwY6m2emSky+Cqn83B15GHnVFJiykP3xZMH FL7c7dQoxsVl2OjIM4KGE1G+BL0QlXGESFbz/8j9c36E+PIEIKNiPJ0bxQAUR/zILmXt Un2zRn7nN3M9UYYmer5z3WoxK8IAKmJYdwF9ipJW3kGFrfOanq5VrtYHaed16lMm1yBD e3w3BHipuYPApiAsMV4rLnjrYcuyrxbfunHn5HHmljOakLkXD9h0qxZbunJZrF0tiBfl Odh+c5KGGNZekiepimRgg/Kazv+0BZ+2KIP1+G2HCt+HXjFGwt2SZGmyXLNttc0GYlnI 0PJg== X-Gm-Message-State: AOJu0YxtmBeI2cuO+noIoSy9NnbIMHkCx9YThj9Wivfulb0LqQfbpno1 wRAXKsGU7i7hnVGnqwUdDN/ahmPRSwalGNH3/ScS3ym/ZYWt/XV6oNmfjKwR4rX36U14dh91kRe oJQshFNsAqeY6ZpvXN3h/G4GPndryuu3ruXqtvz2A4F1ajCYEPVi/O8txj3dBUrVOJjuAjtSM4m 9b+ZD+ZTalrVhy8UqpTI4YI5VH7QtJhU5MUV64 X-Received: by 2002:a17:906:2a90:b0:a3e:1ab9:b6a1 with SMTP id l16-20020a1709062a9000b00a3e1ab9b6a1mr4653227eje.21.1708416446473; Tue, 20 Feb 2024 00:07:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbPw3FRx0k4nx/xLvqu9ORI17smIoYM0SdzGQgHXGAg2LiAxFbDjOh10jwv530fAQCYLD2FQ== X-Received: by 2002:a17:906:2a90:b0:a3e:1ab9:b6a1 with SMTP id l16-20020a1709062a9000b00a3e1ab9b6a1mr4653212eje.21.1708416446137; Tue, 20 Feb 2024 00:07:26 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id fj21-20020a1709069c9500b00a3e5adf11c7sm2596010ejc.157.2024.02.20.00.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:07:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 09/17] mips: remove unnecessary "select PTIMER" Date: Tue, 20 Feb 2024 09:05:50 +0100 Message-ID: <20240220080558.365903-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There is no use of ptimer functions in mips_cps.c or any other related code. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- hw/mips/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 505381a0bba..ab61af209a0 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -50,7 +50,6 @@ config LOONGSON3V config MIPS_CPS bool - select PTIMER select MIPS_ITU config MIPS_BOSTON From patchwork Tue Feb 20 08:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=B6P2Yfh2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBqK03wNz23cl for ; Tue, 20 Feb 2024 19:08:13 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLAH-00051S-EA; Tue, 20 Feb 2024 03:07:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAD-0004zh-MB for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAB-0000WL-O8 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416459; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0gMIIZtbr1VC+ByGiOX54Iv2fvudEImt7S0oZ9/WbL4=; b=B6P2Yfh28LK8vEmLnqfBNyGee4N5x7fSGPNDz71LOF9eQLXjvLT5tsMorXwtAlXzFjF+it /pEgOEQnP6g1ucCtnrlFHAUhv83jKJ+sIegTDgCpfyiajSh8N9Dq804zLx4/LWEUWVRlPk ArSBmYEiR1895k0OHNgXXTDNR0grjN4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-8xLyHdwpMfiWH9f28zsStQ-1; Tue, 20 Feb 2024 03:07:37 -0500 X-MC-Unique: 8xLyHdwpMfiWH9f28zsStQ-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-563e6dd8d64so2093926a12.2 for ; Tue, 20 Feb 2024 00:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416455; x=1709021255; 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=0gMIIZtbr1VC+ByGiOX54Iv2fvudEImt7S0oZ9/WbL4=; b=P4xry9HgW/L2/aPuOnwr7RIW06amLfOHhhIMeI78zfKxGf/hKyXxHwy1XIn2OnUXwK FCd8Y6HVap7+4+eyG1ImAfi3LHl+o+dsvR/1d5mXcfVA2TBE2SkE4AH/YK0bvQhFACeQ lMlNJTAwIba0CFyzzt8rGJK/bwuZbMHbANZo+COKe7jfSYW5isqHk3LDMb6V0aWOof/V 8N36XNOeNM5IXZNZLnpxZhTIgAvtY5LWaK98ZH8l5ozzF9dDJSsXBQVIoswr6bIZlQdr ec3upZIkB1SVLA9r0Rc/d+sg3S54FePr23+0WBlig1AuRGoHqgmmx0v1ezwc/ErexLSj 32vA== X-Gm-Message-State: AOJu0YycEhACbnn9sYdXQFjx0j3p/LWAIJncWvuiLn9ZG1qg9QFrIBQY 2ZarX4Q5pQ3Px/zSZ3XwVViXqiWYa5W6bI/xSWq8hiqyYy7y8LBUXLseVexoghevDAAJtRNajwB WNz5fMk+HeCB3yLtSyvuwr1DdkSKa+utjs99C6gP3Xdw/7H79zOdh7GhtsPJBMlNIbRs6Wqqeh4 6NrsijxOvxypamudAz6NWVdOJkB+NR5lVshSHm X-Received: by 2002:aa7:c646:0:b0:563:f889:24bd with SMTP id z6-20020aa7c646000000b00563f88924bdmr6426380edr.8.1708416455504; Tue, 20 Feb 2024 00:07:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIQ39Hd1LapZCqpukh9LegPgsMbU8l9vBFK84/XMbGLkIiD1/eCWLEmpMmPqq3z5XbYKn/nQ== X-Received: by 2002:aa7:c646:0:b0:563:f889:24bd with SMTP id z6-20020aa7c646000000b00563f88924bdmr6426369edr.8.1708416455168; Tue, 20 Feb 2024 00:07:35 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id u20-20020aa7d894000000b00564648bb01csm2056702edq.22.2024.02.20.00.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:07:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 10/17] isa-superio: validate floppy.count value Date: Tue, 20 Feb 2024 09:05:51 +0100 Message-ID: <20240220080558.365903-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Ensure that the value is valid; it can only be zero or one. And never create a floppy disk controller if it is zero. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- hw/isa/isa-superio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 7dbfc374da3..e06a548c682 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -116,7 +116,9 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) } /* Floppy disc */ - if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) { + assert(k->floppy.count <= 1); + if (k->floppy.count && + (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0))) { isa = isa_new(TYPE_ISA_FDC); d = DEVICE(isa); if (k->floppy.get_iobase) { From patchwork Tue Feb 20 08:05:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=f/ViD/yr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBqQ6JHcz23cl for ; Tue, 20 Feb 2024 19:08:18 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLAQ-00060f-R1; Tue, 20 Feb 2024 03:07:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAP-0005m7-33 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAN-0000ac-Fy for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:07:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416470; 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=g73OzMwU0CCIScO+4S6Qdh+LHTOWNxgg7pWe0LAuiOs=; b=f/ViD/yrYNJ60S0c0UH5NbtJX6HHtaU6xuzpccNhfTMlwPzpDenMwUD5EZ0kJu7Cd9CRCB YFOI4QJlkP+aucqhsPnmm7kt7mWsGJiMH06edQExhYW5paMaeulS/hO0n+IZbtUDfq0jFa P5WEoAbKSlF+iGO58KxBZa5oZYoHjWQ= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-xtKDLGmeM7OqnAzmlVx2sA-1; Tue, 20 Feb 2024 03:07:49 -0500 X-MC-Unique: xtKDLGmeM7OqnAzmlVx2sA-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-564cb5b2bc5so183383a12.0 for ; Tue, 20 Feb 2024 00:07:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416467; x=1709021267; 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=g73OzMwU0CCIScO+4S6Qdh+LHTOWNxgg7pWe0LAuiOs=; b=uuX2Z1Ofc0XEz89Li/Zt9eA+DYdpR+dhOsRX/0AV1BRo4K5ubYqUSIS5OnRkwjP6av h+dSeiPlKXzNMSV12nSYrUxbrbOF0idaj/OoMawqSbESqaLRNLsD2NKc014a6w2nf0be GfDm97J6QfRo2ZlobNpG5pZJb7PJxfEvxGWLhWMFX7cO3keLQa7mDeFzdtDtCQGsBSg2 q1Qb/PMVbc2peqHD1GfFZnT2fBS3BoKtnhRktDHD/IRMeNUmAc+d2rhcIhHSzpFnZkCQ 1ddzEoio7t70Gvz3jXbQVCb4VeYTNcIaz4L83yoxK360LKHjgwyJBmwzgfYrffvn4wcl yWJA== X-Gm-Message-State: AOJu0Yw9B5JhZ7w8wxGVITNuUUxQ4w0kk5eWhLHtADNfgq5dNr0WhXlJ 4Tyf0NqrchmeCjh6mdA1uP2hRfdLlHxgTOUbnZzinbOMh86XtuAeSSp1AIlq5wPRziMqQlx8zxK hRkZ7HYikJPHnZm5MCeDLF9+oaE9Dl24KlUohlFeKl6gsu4x5gZGqbSa3ipzw8yMWu1Xo68ujq8 3CoFdeNfmRiTAq94ippue50k76R0yiPpOVudse X-Received: by 2002:a17:906:bc45:b0:a3e:71eb:c54c with SMTP id s5-20020a170906bc4500b00a3e71ebc54cmr4775007ejv.49.1708416467227; Tue, 20 Feb 2024 00:07:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEn6xRmQYWH+PkgaWzzGQit0KqY8UyddgUIje8BKpTV5RxmVZKm4yUzdKs8gb6M95XuvsgolA== X-Received: by 2002:a17:906:bc45:b0:a3e:71eb:c54c with SMTP id s5-20020a170906bc4500b00a3e71ebc54cmr4774976ejv.49.1708416466759; Tue, 20 Feb 2024 00:07:46 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id vg8-20020a170907d30800b00a3d2fe84ff9sm3707394ejc.36.2024.02.20.00.07.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:07:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Bernhard Beschow Subject: [PULL 11/17] smc37c669: remove useless is_enabled functions Date: Tue, 20 Feb 2024 09:05:52 +0100 Message-ID: <20240220080558.365903-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Calls to is_enabled are bounded to indices that actually exist in the SuperIO device. Therefore, the is_enabled functions in smc37c669 are not doing anything and they can be removed. Reviewed-by: Bernhard Beschow Signed-off-by: Paolo Bonzini --- hw/isa/smc37c669-superio.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c index 18287741cb4..388e2ed9371 100644 --- a/hw/isa/smc37c669-superio.c +++ b/hw/isa/smc37c669-superio.c @@ -14,11 +14,6 @@ /* UARTs (compatible with NS16450 or PC16550) */ -static bool is_serial_enabled(ISASuperIODevice *sio, uint8_t index) -{ - return index < 2; -} - static uint16_t get_serial_iobase(ISASuperIODevice *sio, uint8_t index) { return index ? 0x2f8 : 0x3f8; @@ -31,11 +26,6 @@ static unsigned int get_serial_irq(ISASuperIODevice *sio, uint8_t index) /* Parallel port */ -static bool is_parallel_enabled(ISASuperIODevice *sio, uint8_t index) -{ - return index < 1; -} - static uint16_t get_parallel_iobase(ISASuperIODevice *sio, uint8_t index) { return 0x378; @@ -53,11 +43,6 @@ static unsigned int get_parallel_dma(ISASuperIODevice *sio, uint8_t index) /* Diskette controller (Software compatible with the Intel PC8477) */ -static bool is_fdc_enabled(ISASuperIODevice *sio, uint8_t index) -{ - return index < 1; -} - static uint16_t get_fdc_iobase(ISASuperIODevice *sio, uint8_t index) { return 0x3f0; @@ -79,20 +64,17 @@ static void smc37c669_class_init(ObjectClass *klass, void *data) sc->parallel = (ISASuperIOFuncs){ .count = 1, - .is_enabled = is_parallel_enabled, .get_iobase = get_parallel_iobase, .get_irq = get_parallel_irq, .get_dma = get_parallel_dma, }; sc->serial = (ISASuperIOFuncs){ .count = 2, - .is_enabled = is_serial_enabled, .get_iobase = get_serial_iobase, .get_irq = get_serial_irq, }; sc->floppy = (ISASuperIOFuncs){ .count = 1, - .is_enabled = is_fdc_enabled, .get_iobase = get_fdc_iobase, .get_irq = get_fdc_irq, .get_dma = get_fdc_dma, From patchwork Tue Feb 20 08:05:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AIx7nmXE; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBr65PGBz23cl for ; Tue, 20 Feb 2024 19:08:54 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLAe-0007Kv-2n; Tue, 20 Feb 2024 03:08:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAc-0007K7-5h for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAa-0000b8-Mx for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416484; 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=sc8/RsKreZdGHNeQ107eSW7WAXNnjbp5XEYSDLR89jo=; b=AIx7nmXE1aKBtzz1bDjkoC87ON+5RQexUiOCBy9O82oRCKvVkiMSaEyHXn1jSD6O6t+5g1 FwyLyBYBqUkjHo6TYp7LWIxKQaSEkiCUlAosdYdPT1N1muaiLHZr6pcaj5x7yX4lSIQK35 FOQhXtIuPyEFPF4vvr9whluMjSTuwbE= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-375-6BpsVvJuMb-OfrGLwU9nqA-1; Tue, 20 Feb 2024 03:08:02 -0500 X-MC-Unique: 6BpsVvJuMb-OfrGLwU9nqA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a3ee69976dfso28297566b.3 for ; Tue, 20 Feb 2024 00:08:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416480; x=1709021280; 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=sc8/RsKreZdGHNeQ107eSW7WAXNnjbp5XEYSDLR89jo=; b=r1bPFq/KfCpjCVMOKZRYv+ydPdtlqLIy0B+H9eFEDP0VgOX8mx7Nt3PTJInDJmjHTd cqsX1fmKt3+e9fk3x6QEV49BokJpYk34BX9GtY2hbkgjlXTssRDhKXM+NRomu+vH2etd Q3mXcnwWA3KzefEc5uzdYhn5k1puQQOgdxCnULRm2Nrd/jdSLU7T60SBI5CtJTaejpiJ OfhdOcvaPtn6ROc4RXTVIfF3Zw2kI6o6y9UJsg5zNpISwQEDY9Ix9RnbqbRE+5ZPpVkl 4/G3VtvK9ley3GQH89XWnyVddhM0/iniWQuEi9JWO0e6HTX9/FAprX8d8n11kGysTxgE XgsA== X-Gm-Message-State: AOJu0YyaJ9qZhgyyAXsoTWrrfmBG2N0MZ45Mk4zECY0tSj/Q8hQ96Trv ntNtKO4lVwnFCGMU9vUZtsmeMp9e6isOPIxlGoyuc2kzAqEdTgJohkRMxJwnS8ERWqXrXbXix1B j+0en2Xp0TihXN+UZCUzQMt8t2uYKH94P6IlbXn1pXUnTCxrX8az6lyC/Cqo3K2rUCiuqpsRGuo 4sUIZFObY6dP/uiEYtJLVMQnT6E1cRjXy7iw/X X-Received: by 2002:a17:906:f9d7:b0:a3e:f967:b54 with SMTP id lj23-20020a170906f9d700b00a3ef9670b54mr601381ejb.12.1708416480621; Tue, 20 Feb 2024 00:08:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IHo0ocjr73jyNyvVnNLqaXwgUerx3uZfm/h/QdcjsFrQ5Kw0rTHk00ichTXPl5NYexWkOm5Wg== X-Received: by 2002:a17:906:f9d7:b0:a3e:f967:b54 with SMTP id lj23-20020a170906f9d700b00a3ef9670b54mr601368ejb.12.1708416480275; Tue, 20 Feb 2024 00:08:00 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id tz5-20020a170907c78500b00a3ce31d3ffdsm3730347ejc.93.2024.02.20.00.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:07:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 12/17] configure: do not create legacy symlinks Date: Tue, 20 Feb 2024 09:05:53 +0100 Message-ID: <20240220080558.365903-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org With more than three years since Meson was introduced in the build system, people have had quite some time to move away from the foo-softmmu/qemu-system-* and foo-linux-user/qemu-* symbolic links. Remove them, and with them another instance of the "softmmu" name for system emulators. Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure b/configure index ff058d6c486..9cdb5a6818b 100755 --- a/configure +++ b/configure @@ -1605,21 +1605,11 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak - # use included Linux headers for KVM architectures if test "$host_os" = "linux" && test -n "$linux_arch"; then symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm fi -for target in $target_list; do - target_dir="$target" - target_name=$(echo $target | cut -d '-' -f 1)$EXESUF - case $target in - *-user) symlink "../qemu-$target_name" "$target_dir/qemu-$target_name" ;; - *) symlink "../qemu-system-$target_name" "$target_dir/qemu-system-$target_name" ;; - esac -done - if test "$default_targets" = "yes"; then echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak fi From patchwork Tue Feb 20 08:05:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=W0TtFNVD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBr72VBNz23cy for ; Tue, 20 Feb 2024 19:08:55 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLBL-0000jK-Uv; Tue, 20 Feb 2024 03:08:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLB0-0008VN-Aw for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:36 -0500 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 1rcLAk-0000d7-R9 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416494; 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=aIuuW+wdt/l3qwd+9X1fX+swjCEROfFuJY+nqWv9slw=; b=W0TtFNVDp2RbGdHlN7WPSMFqrsQKXvKpzS2YE9oBP9jTTkxyNeAWq7uHT2jmI/aRioq+Kd 7blUiKAQbQVL5Cs18U8xhg8WFXwPeKItMF0/Fmdf3aH3ZbZ989bH9iVpvAJy2tMKx0EsTX LURyDMvAR5eqFnw1iVWGAuT1o1jc/BE= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-WT4OC1-HMxWFaUd1NH2beA-1; Tue, 20 Feb 2024 03:08:11 -0500 X-MC-Unique: WT4OC1-HMxWFaUd1NH2beA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a3bdd99a243so488653366b.0 for ; Tue, 20 Feb 2024 00:08:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416490; x=1709021290; 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=aIuuW+wdt/l3qwd+9X1fX+swjCEROfFuJY+nqWv9slw=; b=kqJsoVhNTbgUjmGTjvfnn3Cgyp/sXrHReinm+ux8tiCCbL4TD7QAkOxebcYLjOvZAN B8s0MBPaH9kXC6K/7NayqwebMHDkSFL1dyLLHBQizgzIW3wtVn2tdJeJhj7IcVfr89OQ 91++mjoeW4K/AOi6Z4tlTMTtSSxX2HlDWhyTiBDYRBazoeUTDE+5Z3gh86IPXfvC+SN+ XqWzVkGPClYHdWLaL4m8yzXfImLlxFVywl/Xb4lVK6QB8Tzi0gYmXp5gp7Ltf8BFn2ac csKnGS7ybMx1NgGRjxHR+iO0+p7I8dLGwbNeFI3di9N69ahfiv/lkz2malGGRsrm2EvB WMtQ== X-Gm-Message-State: AOJu0YyiaLZG5Nyv5gwt+oOlooh9sFz87ZeX5xD1RoeEXgj61QDkRpuP hGoW8HtGy418THMt/SmKi9+RY4+zFIbDydOhecjAxVFni8PeSAEEtntUPL23Bcn09Wro/rx2Sxz V+bTx+Y9e+JQE0OqmxK7d3suFNxrI7kLaEnh7oKKWnd79i9ScDAiFyp26iT64WlFKrfPMoGsLKj mXKm5K5SlfWQQdcbH4pKCGcaJU3VM7H5vQR+cd X-Received: by 2002:a17:906:d215:b0:a3e:7a1c:47ac with SMTP id w21-20020a170906d21500b00a3e7a1c47acmr5344463ejz.8.1708416490269; Tue, 20 Feb 2024 00:08:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFW55noVnmT7sSYq9mthQ0weTf4shB48BW5A8fnMFjtDN6Ngf9hB2Wx9YioODLbBMGxi8OlPQ== X-Received: by 2002:a17:906:d215:b0:a3e:7a1c:47ac with SMTP id w21-20020a170906d21500b00a3e7a1c47acmr5344444ejz.8.1708416489998; Tue, 20 Feb 2024 00:08:09 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id tl7-20020a170907c30700b00a3e5bcfe5b7sm2589628ejc.134.2024.02.20.00.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:08:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 13/17] configure: put all symlink creation together Date: Tue, 20 Feb 2024 09:05:54 +0100 Message-ID: <20240220080558.365903-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Cc: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 9cdb5a6818b..3cd736b139f 100755 --- a/configure +++ b/configure @@ -1538,6 +1538,11 @@ for f in $LINKS ; do fi done +# use included Linux headers for KVM architectures +if test "$host_os" = "linux" && test -n "$linux_arch"; then + symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm +fi + echo "# Automatically generated by configure - do not modify" > Makefile.prereqs # Mac OS X ships with a broken assembler @@ -1605,11 +1610,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak -# use included Linux headers for KVM architectures -if test "$host_os" = "linux" && test -n "$linux_arch"; then - symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm -fi - if test "$default_targets" = "yes"; then echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak fi From patchwork Tue Feb 20 08:05:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901251 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MtilRi0j; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBr54pLyz23cl for ; Tue, 20 Feb 2024 19:08:53 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLBH-0000Dg-MT; Tue, 20 Feb 2024 03:08:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLAy-0008SJ-EQ for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:34 -0500 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 1rcLAt-0000dq-GF for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=orF/B8kCpZl/r7yBFvkYvnBiF94OA2GnBZJaqOTj6E8=; b=MtilRi0jhyNpR8RCL9sH1iNIYG5Dxr1uWJFL994fTfdrvVVQTwWnA7TXAZmFhVyF+7VwYk 2Av70N884m3+bi8Qjdt2MEOtHGHUltdZPTaDClqr7CjfbzDADLzHFyAFlhIrnnRtqEm0gx pMN2HjUDo3b4bbKU6qA8Ivi9ouLyl9k= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-496-PIaZKEX-N3aDC_p1rSFY6w-1; Tue, 20 Feb 2024 03:08:20 -0500 X-MC-Unique: PIaZKEX-N3aDC_p1rSFY6w-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-563a2279f1bso5845316a12.0 for ; Tue, 20 Feb 2024 00:08:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416499; x=1709021299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=orF/B8kCpZl/r7yBFvkYvnBiF94OA2GnBZJaqOTj6E8=; b=udCwquqI4roGirriaq6wyszdpfmDWYZagYi553GLgl8fBzz5XYBzKKweXA719Xa3sQ l5l4Dqqu6nwSRTRWtNiFTyerm/uxi4N6aELFWmsD8jyCX4SP96zxHh4ZnktvWx3wQFdU 1wu3J+8fFK99CZdeObYLg3v6DU3xIvGSSpwp7gBYDqX3cEL/JtAY6qLyRlFfj7IjM9oE tNttpe97IeVGYC7y6jjHHrWcl7CxRqHU2k5/+0u5sH0A9X7osQOSk3XEGNk4vLqiBiVN MoOyJUxcRHH3ZL0KF64gY2d6vN7tE6qy9R6nEZ0LcaynzmzOg8+s9r/kOO4jTJ3zAFic drvw== X-Gm-Message-State: AOJu0YwDcUq38vYTFuzXuJK0UDLSVpP2orlMDRFG+NlwtzXGRcIhE1Dk Ka3bPv0Hocs7FJ3oCX8DTp6ByEIkd/zZv+H7bBOFdIQt4WrMR5JyqQPCy+uXGfgm4rpkA+S10Td kQy7wZlF5FK4PlYFydCgaflfTsC7zTcLUsuJA6uwps8ufNg23f02ZSCyjJU//ym4sUAVJttori2 ShJzK6ucUa1a22U5GC1DQKSx7/LPqEEjrZXuD4 X-Received: by 2002:a05:6402:5414:b0:564:2d0c:b46c with SMTP id ev20-20020a056402541400b005642d0cb46cmr7584181edb.0.1708416498939; Tue, 20 Feb 2024 00:08:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJmcmfSx1hUKvd7D1zpV7UOvDIWN94jriFmHkaviM438Sa+yFWU2UmdlLX6s+tMWpr7660xg== X-Received: by 2002:a05:6402:5414:b0:564:2d0c:b46c with SMTP id ev20-20020a056402541400b005642d0cb46cmr7584166edb.0.1708416498589; Tue, 20 Feb 2024 00:08:18 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id fk2-20020a056402398200b0056418c5b6b2sm3263041edb.89.2024.02.20.00.08.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:08:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/17] i386: xen: fix compilation --without-default-devices Date: Tue, 20 Feb 2024 09:05:55 +0100 Message-ID: <20240220080558.365903-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The xenpv machine type requires XEN_BUS, so select it. Signed-off-by: Paolo Bonzini --- accel/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/Kconfig b/accel/Kconfig index a30cf2eb483..794e0d18d21 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -16,3 +16,4 @@ config KVM config XEN bool select FSDEV_9P if VIRTFS + select XEN_BUS From patchwork Tue Feb 20 08:05:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XXKjH/uP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBrP1SGJz23cl for ; Tue, 20 Feb 2024 19:09:09 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLBN-0000uk-1I; Tue, 20 Feb 2024 03:08:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLB7-000071-Ps for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:39 -0500 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 1rcLB4-0000eF-Tl for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416513; 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=/khjPBHA3zyoAdbFKlzOsBWuijGKQwfv8ZgRU5hbra8=; b=XXKjH/uPS2sUAJrFZSpD8Ai8TE/f8XU/foTZocacmcGoRYHcCfbqSaxNX4rcjxJgX98mAT 8SMRjrSTLCAmorQUckrl4x0wWOSXmwH/7cH8UK9AHW9WoHOzjIfs5TkGk6EWdIPGJ+7D9e Tgxn8tfv1F2tDrMrI0DbfPLK5BUIAk0= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-224-Fipv6RhHPY2yZiuNRe1yKw-1; Tue, 20 Feb 2024 03:08:31 -0500 X-MC-Unique: Fipv6RhHPY2yZiuNRe1yKw-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a3bdd99a243so488681666b.0 for ; Tue, 20 Feb 2024 00:08:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416510; x=1709021310; 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=/khjPBHA3zyoAdbFKlzOsBWuijGKQwfv8ZgRU5hbra8=; b=s8IoPJE2jFvYnGKGF45nARHG05YtIPqL81dgpr/yPAWPmT3gTKWkvHf58xFm8ggwj4 jNJDryRq8z7VCeooOz94S5IPyO3u4msqUAL2o8CSbck4p093GgdlcxiA0TZ/VLdMTPH2 uyzb2ElwfUCGLQeLUN2GQOLivqrsGAjiUwXefgcc+yLmpUkUeDjVmpRc3/mFPTqppMf6 m+aztLI7A7aJpIm0g6J+zM+BL3G0dsrmLNlZf0ht6IJrP7ZzyxckvSHfIDqBs+bdvDui hUTuz3ScbfyENr9xTYCCVnKRL4DDVjc7RFoqM5fRsNP99zb/zQYlUos5d5M2NAfP3EVI Xckw== X-Gm-Message-State: AOJu0YzPpt5oYwINVC8Usm1o+v2ZDdy1x/eWMnKd1fXiK1Gh/Rixfghp /uoFHPaKBSt34ihiaARAVUXrsv2WxANFff+2p4dRlwdDgSdRzSKUrq1nfMhlrnoOnlmFJ5ff0OD PIfLjqMHrct2ttr1hWg/lFJRhKCFPVVfWj8Xfl2rkcmTAYNdkaNlMO55TNT3iYRGw2acq7PN7EK omEY2kzr9zIHxWFUWFbg8EF15sDYChd5jVszP9 X-Received: by 2002:a17:906:280c:b0:a3c:2f68:54a9 with SMTP id r12-20020a170906280c00b00a3c2f6854a9mr13940809ejc.3.1708416510016; Tue, 20 Feb 2024 00:08:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgOb7dhhDIi7sIWw1avptir0OdlD8gvNp+AQfxDn+jdB3tvD+oeL0cEhv3CDO0GiBWkzXJRA== X-Received: by 2002:a17:906:280c:b0:a3c:2f68:54a9 with SMTP id r12-20020a170906280c00b00a3c2f6854a9mr13940789ejc.3.1708416509649; Tue, 20 Feb 2024 00:08:29 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id q12-20020a170906770c00b00a3df13a4fe0sm3772781ejm.15.2024.02.20.00.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:08:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Ziqiao Kong , qemu-stable@nongnu.org Subject: [PULL 15/17] target/i386: Generate an illegal opcode exception on cmp instructions with lock prefix Date: Tue, 20 Feb 2024 09:05:56 +0100 Message-ID: <20240220080558.365903-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Ziqiao Kong target/i386: As specified by Intel Manual Vol2 3-180, cmp instructions are not allowed to have lock prefix and a `UD` should be raised. Without this patch, s1->T0 will be uninitialized and used in the case OP_CMPL. Signed-off-by: Ziqiao Kong Message-ID: <20240215095015.570748-2-ziqiaokong@gmail.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/tcg/translate.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 10cba162566..07f642dc9e9 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -1507,12 +1507,13 @@ static bool check_iopl(DisasContext *s) /* if d == OR_TMP0, it means memory operand (address in A0) */ static void gen_op(DisasContext *s1, int op, MemOp ot, int d) { + /* Invalid lock prefix when destination is not memory or OP_CMPL. */ + if ((d != OR_TMP0 || op == OP_CMPL) && s1->prefix & PREFIX_LOCK) { + gen_illegal_opcode(s1); + return; + } + if (d != OR_TMP0) { - if (s1->prefix & PREFIX_LOCK) { - /* Lock prefix when destination is not memory. */ - gen_illegal_opcode(s1); - return; - } gen_op_mov_v_reg(s1, ot, s1->T0, d); } else if (!(s1->prefix & PREFIX_LOCK)) { gen_op_ld_v(s1, ot, s1->T0, s1->A0); From patchwork Tue Feb 20 08:05:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ui7fKpin; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBrL14X3z23cl for ; Tue, 20 Feb 2024 19:09:06 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLBL-0000fa-JO; Tue, 20 Feb 2024 03:08:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLBB-0000AQ-UH for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:44 -0500 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 1rcLBA-0000fx-B0 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416519; 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=0Egdkh5QoX3O/dzVIy8K+U7p2KokwdNAc13mHN8rwZY=; b=Ui7fKpinFA1nnD9pjqKkNE6e0SWCiKo+J+21PhAbcZN5b2Pv6K8K8djpnx08oKGm+m9qOC 1eRsZJK2rlbCUjKVPp6Hx02O2gZv9D3xkJsoZsmJy1S2N8rVK3nPU4sE+yJOtOAZV9qlOp 8qZSh5ZHqlZ6jcuyot17gE6SL4WnDcY= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-94-qXZp9xpcPNGT4petVV1I_A-1; Tue, 20 Feb 2024 03:08:38 -0500 X-MC-Unique: qXZp9xpcPNGT4petVV1I_A-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a2bffe437b5so424042366b.1 for ; Tue, 20 Feb 2024 00:08:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416516; x=1709021316; 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=0Egdkh5QoX3O/dzVIy8K+U7p2KokwdNAc13mHN8rwZY=; b=lbtTsIE2zoq9juWy7StzJYr1fLqE3xjH3CDDXgh4/6ShIAfPj9yShNiVyqDhns9jfR f7tgMwtshaxtIKXRe637q0IUBynzWC/QbZCk4QTZFzk5SNWEHOzBYR+jJB0xyRLk6KhW fmiBobrGNMwPzAQMyK5cvS0l4kaze6fc5RcBgBBMkqxJQJiOST6Id8t7ANBexnrrU1ZM 00gSlTKz4z8s3CX7k4gJ9feKNApT2ijvcGzKdfN0J7T/5vAWTS5vp+bzktNwzbtLgMhZ fs6W7qv6/5rfdl0NevFKHHtxDA1WNsZKYrtg9MT7HgQMu2s6wEircCY+fjcqw7pWsxfb TK7g== X-Gm-Message-State: AOJu0YxlbjqQTcZ4W+TG/wValLT31GcsGHPOovUWfT0ncDWpkPpZToys WozGxOXKWWIJwpu93Rggr78/eraIc9i5khSu/M6ZcaBqxLGmAGlTmAIVe3nlz9R3RDeE/EKTpMf 2CNHuJQN+T2ItsgyKZqZu8XmtLVCNdW4n6ZcWtrvM3qYtXGrd5+zac9Sb6XZBWvOT1ElsQ7rre/ aOeR/bMAImEZk+5Qb7PGhF0EZjRe16Q4x0mV/F X-Received: by 2002:a17:906:2491:b0:a3e:48f2:19c2 with SMTP id e17-20020a170906249100b00a3e48f219c2mr4533926ejb.76.1708416515814; Tue, 20 Feb 2024 00:08:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IHocq4fFF+9LWI+m8y74WnxLbta8MbPcEfG0bfcX2AHxTzQ3nL/uqPgjrH6YkEtbgE4Tfbv3Q== X-Received: by 2002:a17:906:2491:b0:a3e:48f2:19c2 with SMTP id e17-20020a170906249100b00a3e48f219c2mr4533914ejb.76.1708416515414; Tue, 20 Feb 2024 00:08:35 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id r18-20020a1709060d5200b00a3d12d84cffsm3686645ejh.167.2024.02.20.00.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:08:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 16/17] usb: inline device creation functions Date: Tue, 20 Feb 2024 09:05:57 +0100 Message-ID: <20240220080558.365903-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow boards to use the device creation functions even if USB itself is not available; of course the functions will fail inexorably, but this can be okay if the calls are conditional on the existence of some USB host controller device. This is for example the case for hw/mips/loongson3_virt.c. Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- include/hw/usb.h | 27 ++++++++++++++++++++++++--- hw/usb/bus.c | 23 ----------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/include/hw/usb.h b/include/hw/usb.h index 32c23a5ca2a..cfeead28403 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -30,6 +30,7 @@ #include "qemu/iov.h" #include "qemu/queue.h" #include "qom/object.h" +#include "qapi/error.h" /* Constants related to the USB / PCI interaction */ #define USB_SBRN 0x60 /* Serial Bus Release Number Register */ @@ -500,9 +501,6 @@ void usb_bus_release(USBBus *bus); USBBus *usb_bus_find(int busnr); void usb_legacy_register(const char *typename, const char *usbdevice_name, USBDevice *(*usbdevice_init)(void)); -USBDevice *usb_new(const char *name); -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp); -USBDevice *usb_create_simple(USBBus *bus, const char *name); USBDevice *usbdevice_create(const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask); @@ -582,4 +580,27 @@ void usb_pcap_init(FILE *fp); void usb_pcap_ctrl(USBPacket *p, bool setup); void usb_pcap_data(USBPacket *p, bool setup); +static inline USBDevice *usb_new(const char *name) +{ + return USB_DEVICE(qdev_new(name)); +} + +static inline USBDevice *usb_try_new(const char *name) +{ + return USB_DEVICE(qdev_try_new(name)); +} + +static inline bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) +{ + return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); +} + +static inline USBDevice *usb_create_simple(USBBus *bus, const char *name) +{ + USBDevice *dev = usb_new(name); + + usb_realize_and_unref(dev, bus, &error_abort); + return dev; +} + #endif diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 59c39945ddd..76fda41b7ec 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -329,29 +329,6 @@ void usb_legacy_register(const char *typename, const char *usbdevice_name, } } -USBDevice *usb_new(const char *name) -{ - return USB_DEVICE(qdev_new(name)); -} - -static USBDevice *usb_try_new(const char *name) -{ - return USB_DEVICE(qdev_try_new(name)); -} - -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) -{ - return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); -} - -USBDevice *usb_create_simple(USBBus *bus, const char *name) -{ - USBDevice *dev = usb_new(name); - - usb_realize_and_unref(dev, bus, &error_abort); - return dev; -} - static void usb_fill_port(USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask) { From patchwork Tue Feb 20 08:05:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1901256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Dae2Gte1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TfBrT5zBHz23cl for ; Tue, 20 Feb 2024 19:09:13 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcLBM-0000lr-4h; Tue, 20 Feb 2024 03:08:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcLBE-0000CN-P1 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:45 -0500 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 1rcLBD-0000gB-7X for qemu-devel@nongnu.org; Tue, 20 Feb 2024 03:08:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708416522; 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=imZ3RUOwHgnSlC/oclQrKn0u6lgwbsaQMoHzpRTzBAo=; b=Dae2Gte1TcJuJIVbT7H2gJgEyHdGVJqN0ZwdHEvHvUdt71iQWTVDf4X4rEFGqpaYowWZES RNTGGdn+ymChw2m6IB7Xm0drtWgvZ0DmnRswp3qGNVJI3kfYnO83mmhcipUC9yUGvBprG4 Xwv+6qIt031Oh/THxoU+4YKjvpwkxFs= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-3eNryg0qPrWdyi6cxakWBg-1; Tue, 20 Feb 2024 03:08:40 -0500 X-MC-Unique: 3eNryg0qPrWdyi6cxakWBg-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-564347c68b9so1318916a12.0 for ; Tue, 20 Feb 2024 00:08:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708416518; x=1709021318; 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=imZ3RUOwHgnSlC/oclQrKn0u6lgwbsaQMoHzpRTzBAo=; b=BN7bN125f5hxTJ2KMR7G3FgdK5nw3n8T5lEv3zr2sUAr0WtW5BX3NE+tbfEFn1+n2Q rUagyMoXfuYtvBehM5RZzck6Da90diclADMrj1LfY0G7F6ap94GWjyl7CvQfjIdpan9M aW4K7iLfsuQJJF9mKfMi1n85QHwZBFDtooKTabVEib8qCtZQFTmjP6zOoc07RSjcumjf 2uwSiKgbiKdSA3dZyiyP2p++CstFMA/Lzrvc0u6RhKJCpmD6i67EkkNpUMMtWZxfu0ws 0G2uJ1fagXMVnqAk1Uk/ViEQ3y6m3i5jxSYBdyUCaInZNSl+QkjExc5ftCCPEL9S+8X/ +ajQ== X-Gm-Message-State: AOJu0YypyXDWK14AQsJIeAZ9jIvTlptU63htWpgwqIebG2q8gZZCkiFI G7ChLd3AWsikQqhaQmaBk1RolwFS8DEiw1lZGf/J5SqwZL3TB6kx2AVjAIGDlj6Z0pxKFwDlR8x 9QVwKwjP1CxMJUfch/mCY2yhKrQNJQmzGwOz1dIkxR4Z9he0Eupl75CeZSNN9XyyDSGZWrrCNdm 1RixPrdTGFM78UITNlotPZ1dnS7UgcLXdaUtkM X-Received: by 2002:a05:6402:3513:b0:564:151c:747a with SMTP id b19-20020a056402351300b00564151c747amr6526054edd.27.1708416518580; Tue, 20 Feb 2024 00:08:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IG30koI5qZs4a5xKdpAuq9qT1dU4Bb/cdXI7UwOssBki42XKDwDU1eT6JVzLkNdC9SFc7fsdg== X-Received: by 2002:a05:6402:3513:b0:564:151c:747a with SMTP id b19-20020a056402351300b00564151c747amr6526041edd.27.1708416518359; Tue, 20 Feb 2024 00:08:38 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id i26-20020a50fc1a000000b005603dea632esm3436754edr.88.2024.02.20.00.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:08:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Fabiano Rosas Subject: [PULL 17/17] ci: Fix again build-previous-qemu Date: Tue, 20 Feb 2024 09:05:58 +0100 Message-ID: <20240220080558.365903-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com> References: <20240220080558.365903-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The build-previous-qemu job is now trying to fetch from the upstream repository, but the tag is only fetched into FETCH_HEAD: $ git remote add upstream https://gitlab.com/qemu-project/qemu 00:00 $ git fetch upstream $QEMU_PREV_VERSION 00:02 warning: redirecting to https://gitlab.com/qemu-project/qemu.git/ From https://gitlab.com/qemu-project/qemu * tag v8.2.0 -> FETCH_HEAD $ git checkout $QEMU_PREV_VERSION 00:02 error: pathspec v8.2.0 did not match any file(s) known to git Fix by fetching the tag into the checkout itself. Reviewed-by: Fabiano Rosas Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f56df59c949..a1c030337b1 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -190,7 +190,7 @@ build-previous-qemu: before_script: - export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)" - git remote add upstream https://gitlab.com/qemu-project/qemu - - git fetch upstream $QEMU_PREV_VERSION + - git fetch upstream refs/tags/$QEMU_PREV_VERSION:refs/tags/$QEMU_PREV_VERSION - git checkout $QEMU_PREV_VERSION after_script: - mv build build-previous