From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591053; cv=none; d=zohomail.com; s=zohoarc; b=T9I5XlVq/qsB8qTTj+8K79kQSrfk9VxLB57gk23M53sW4oepwcEGW2izo/dOmI6U5jcS9gMe5kFOJ63iB/Zorte59yloP3N5W9OuSVrrPNCA8+etGKJ86V3sPa6rfXBvgJx5GQa0c9Asli3rqkSYAALMTivf4DZJuDNbM8Lm1h0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591053; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3ih1ItFgUjyLDwAKRKghxifXgQduOcEOb4rpNW8gc4o=; b=JjQyNyYzJpcif7PK/+RM9R+d6m6awFupUdkumLZ4FdwYQqIv9y8cNAK2njlvWG50XnhJRlzWSkvGPwqWoc9yMK0X+Ru+mTF5YaXzcjTyDwdCqbIrT2HireNoWyAZ1hf44LoCXq2g8F8RFz5QAsPPQT797yIsON0Eq41bqTz2qTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591053891393.28435000038223; Fri, 6 Oct 2023 04:17:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoimq-00080z-DD; Fri, 06 Oct 2023 07:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimo-00080F-QP for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimh-0000Dx-1M for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:26 -0400 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-634-tDXiFfykN86r_aCk5vHqzA-1; Fri, 06 Oct 2023 07:14:17 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ba0616b761so7893566b.2 for ; Fri, 06 Oct 2023 04:14:17 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id u16-20020a1709064ad000b009ae54585aebsm2650629ejt.89.2023.10.06.04.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590858; 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=3ih1ItFgUjyLDwAKRKghxifXgQduOcEOb4rpNW8gc4o=; b=HoWAs8l/qyqC7Kt9Epk9fY2s4Bc9//xBS9eYLi+6uoqvVLo/V3tNOT9nS46Gvy1nbPHtVP 2O6uVckoHKNn3DilMOB7LblUSWd4d7nuxzN83iXAJfXcpIspt31Gqv5v1kr34uF7/aftgX ehbPARLd1F8QS8s7912e1B0re98Y6fw= X-MC-Unique: tDXiFfykN86r_aCk5vHqzA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590856; x=1697195656; 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=3ih1ItFgUjyLDwAKRKghxifXgQduOcEOb4rpNW8gc4o=; b=ZtmgYo+eGWhRe88qL2DisZZshluYEjxu60gexJ1f/vS1PKd3xUNWKx3E9pqIyk/L3H Mu7xwVcpUnDMDHg6lT8No9sBL4ppIxy9sF5ciAqSPRKa/y3vTESAN94JHk+NK74zSfCP Lrr9VCqjOh50VVmD9ql7EgcsThGHYXl6XfnK2+tNFu8FwC/QenPVMHQJDpg6v+6GdZHF Rg99o2fh9u0M9tUZBkcAKoBRF6792zbO20b/a3fA/9pIL3eviAjrj70utLgprraGFaxA F5blGVXssqADzI5tTDLZIv+li0P8U+NtLC2k9kiNqNqAEDa0peFqFMiqIl0NU/bJlqRz OpkQ== X-Gm-Message-State: AOJu0YwRNNp8qySpWjedqIOUs+xH3zFvKAP/Ej5yUAY9E6QZuv2fYyxg YN9rjB2Q4E/Hd6ELzyv68TajyrPXhd9M4mrSSOV1CI8ScrT2D8Xj1GIbZH+ND2CU6wODyV7wWnX RJZbKHp4Ztqj9GY0Mexqpm1d7S3EAloYOKQppiQfPpZp2uFZTN+2g7mx9PgQqsRDvkVtsIUqR7r 0= X-Received: by 2002:a17:907:b1a:b0:9b6:5a86:2926 with SMTP id h26-20020a1709070b1a00b009b65a862926mr6518760ejl.62.1696590855903; Fri, 06 Oct 2023 04:14:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEC6GEUNCreEx+Csfk/k5apbPZMomqsz1gYn0/i9yucho/AXu3XITfqYWHY+jOGSTr/F+aNPg== X-Received: by 2002:a17:907:b1a:b0:9b6:5a86:2926 with SMTP id h26-20020a1709070b1a00b009b65a862926mr6518737ejl.62.1696590855461; Fri, 06 Oct 2023 04:14:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov Subject: [PULL 01/26] target/i386/hvf: Remove unused includes in 'hvf-i386.h' Date: Fri, 6 Oct 2023 13:13:47 +0200 Message-ID: <20231006111412.13130-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591054799100001 From: Philippe Mathieu-Daud=C3=A9 The only non standard type -- CPUArchState -- is forward declared in "qemu/typedefs.h", so no particular header is required here. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov Message-ID: <20231004092510.39498-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- target/i386/hvf/hvf-i386.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index 95b47c1c2e7..243bc111ccc 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -16,12 +16,6 @@ #ifndef HVF_I386_H #define HVF_I386_H =20 -#include "qemu/accel.h" -#include "sysemu/hvf.h" -#include "sysemu/hvf_int.h" -#include "cpu.h" -#include "x86.h" - void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int); =20 /* Host specific functions */ --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590979; cv=none; d=zohomail.com; s=zohoarc; b=ky/g27awfkr6CzMr7nwyitlmwv1B9DGFp0o/IpER6G15s/AGREFiYtd2ekwseulKiL+XQ786CG3zctiNsixBzIUsSiJhs73Y4Ff74n1I24mf26q4aj11obFNyCi7Tp3tdS+ZZ+GA1GC1/Iv0jc8+XQn+YZxNJ12gBHlBcWYWnMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590979; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zsB4uEpw6TQ/yGY1vvqEV3rLzLTAOPIU4fgZDEtmCyc=; b=dAeNpnATM/QzrO0i/0uj2SbWvCUgQqSdSj8D7xmYOvJfd/xmgE27kvs0ult21HbN+NaQiDNDmstYuSS7lR8z32WTvsmRxPIT7AspbWy+GQV6HbMlVA8YbITrpto7hSLTOqvcB8B141FJMTrgfgQB/Cg8hTn4hCjFhVPnp73RUFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590979474703.6528216303109; Fri, 6 Oct 2023 04:16:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoin2-00084y-51; Fri, 06 Oct 2023 07:14:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin0-00084V-FC for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimy-0000Ig-Qt for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:38 -0400 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-117-m1oqScArMbCmr5I0OXYnXg-1; Fri, 06 Oct 2023 07:14:19 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae7663e604so168533666b.3 for ; Fri, 06 Oct 2023 04:14:19 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id p6-20020a1709061b4600b009ad81554c1bsm2702126ejg.55.2023.10.06.04.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590876; 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=zsB4uEpw6TQ/yGY1vvqEV3rLzLTAOPIU4fgZDEtmCyc=; b=AOfAOVSENiWBUp3uvMOXP3crJV0/oEvps9r9LZNOg8RUHwXPHbdaJ20nm10QCIpAOQhB2O c518UijIOCIM9amVesAKN9Jfa5thYrOPWtUpjuM54NTSTrJk+1J3vOZoVpiwMNe/5wkWlm f7I+oKWf1DO0557+REemjb3X5CS6P24= X-MC-Unique: m1oqScArMbCmr5I0OXYnXg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590858; x=1697195658; 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=zsB4uEpw6TQ/yGY1vvqEV3rLzLTAOPIU4fgZDEtmCyc=; b=ZSOshhLzM7wAhEF+0kSyp9lGlna3VcsWCG9Tt1KBaenpX4TgW+zmpEPnF7vY/0hoxB hpVxx6LBkyEDFlxIGRlZWbk9lK7fOyOBs3pVRCJqAccO49PUE77OJs0S/amqxLvKAcYe ktpJLosNeCpDFJZoP9Z89bfYZSq4GBU3+uwjPeF9yd+Q5KIL76gMAxVSVI3oxS8oOpGK Tk/d7suxF+sSxEx/sNM2ZT0TnsD4sHSY9ws4ncrOA7eFENcljsq7vHpRXMov7VuwlnOn zwhdNiADxKV4WDfK3gx1PmQTVD53BCtm0Ou8UEtTF6WS9NTjB200fEsQDTV4IEXL/kbN VvEQ== X-Gm-Message-State: AOJu0Yx/wWGwVl/OjAQM6abXO1rGOcuEpV1EJrC2+7W1Ri1Tj6y49gi/ 4xRH/w0dkmC+FYt0TQLEdXsxzZAYUbm63Yw5bGp6XRumlxA9gj5VFmCCAGV3eFucgzf4Sr0ERb4 fl1BDbsXlwvxbLK+E26pFP433JpxLr5lvDeAehoIbodVmn/EO56+dJAJ31NFVYF0cQQgoiW2Ock 8= X-Received: by 2002:a17:906:20d8:b0:9a1:bebc:8282 with SMTP id c24-20020a17090620d800b009a1bebc8282mr6758231ejc.32.1696590857952; Fri, 06 Oct 2023 04:14:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSVGlhu6KwlMKPyY/emAI90D/7YGwYOhIy9VQdDOBhknp84SAXS8rkVnxQGxXMTTtSqEq6zQ== X-Received: by 2002:a17:906:20d8:b0:9a1:bebc:8282 with SMTP id c24-20020a17090620d800b009a1bebc8282mr6758218ejc.32.1696590857535; Fri, 06 Oct 2023 04:14:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/26] sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets Date: Fri, 6 Oct 2023 13:13:48 +0200 Message-ID: <20231006111412.13130-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590984387100011 From: Philippe Mathieu-Daud=C3=A9 hvf_get_supported_cpuid() is only defined for x86 targets (in target/i386/hvf/x86_cpuid.c). Its declaration is pointless on all other targets. All the calls to it in target/i386/cpu.c are guarded by a call on hvf_enabled(), so are elided when HVF is not built in. Therefore we can remove the unnecessary function stub. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004092510.39498-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- include/sysemu/hvf.h | 3 --- target/i386/cpu.c | 1 + target/i386/hvf/hvf-cpu.c | 1 + target/i386/hvf/hvf-i386.h | 2 ++ target/i386/hvf/x86_cpuid.c | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index 4037cd6a738..4a7c6af3a5f 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -20,13 +20,10 @@ #include "cpu.h" =20 #ifdef CONFIG_HVF -uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, - int reg); extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) #else /* !CONFIG_HVF */ #define hvf_enabled() 0 -#define hvf_get_supported_cpuid(func, idx, reg) 0 #endif /* !CONFIG_HVF */ =20 #endif /* NEED_CPU_H */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ed72883bf33..5b620500abf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -26,6 +26,7 @@ #include "tcg/helper-tcg.h" #include "sysemu/reset.h" #include "sysemu/hvf.h" +#include "hvf/hvf-i386.h" #include "kvm/kvm_i386.h" #include "sev.h" #include "qapi/error.h" diff --git a/target/i386/hvf/hvf-cpu.c b/target/i386/hvf/hvf-cpu.c index 333db59898a..21c519be741 100644 --- a/target/i386/hvf/hvf-cpu.c +++ b/target/i386/hvf/hvf-cpu.c @@ -15,6 +15,7 @@ #include "hw/boards.h" #include "sysemu/hvf.h" #include "hw/core/accel-cpu.h" +#include "hvf-i386.h" =20 static void hvf_cpu_max_instance_init(X86CPU *cpu) { diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index 243bc111ccc..e99c02cd4bf 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -16,6 +16,8 @@ #ifndef HVF_I386_H #define HVF_I386_H =20 +uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); + void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int); =20 /* Host specific functions */ diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index 7323a7a94b1..9380b90496e 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -25,6 +25,7 @@ #include "x86.h" #include "vmx.h" #include "sysemu/hvf.h" +#include "hvf-i386.h" =20 static bool xgetbv(uint32_t cpuid_ecx, uint32_t idx, uint64_t *xcr) { --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591055; cv=none; d=zohomail.com; s=zohoarc; b=UAYnjfkDdVI2ft7bufNGFXhdYfGXJnAHOd3gfnL+zUla0fGpAbt8zbAFopizksu1hBlq2x/h+dzvsxZvorcZFSjnM77wFfvapEFATWWd5AQ4tY6UQvp2hD5FK3ACn6Gr+6c7PuXsWs3AV9wMmwHPNrHkuJTe5iHWLzZykWuFQn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591055; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NAACJAej5aSBwACda6Ra2S0VR9ySPOa1Dz12qYGkco0=; b=VdMxIM6nXK4ud+1c+VQlPxrinhEp4n5VXuYYp+Z6zugo67IV5nKi7YkIYDYINi90yApu2QZYDeeU6vGAIMAujL3nA4lxVStH3WQ+g6L8IeRjccihrjZqtqDVmHw+x7ofLVfrk5ERa/XpXU2AjZ9bH6yCn8+8MXefhCkSqg3XEIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591055015591.6623931797329; Fri, 6 Oct 2023 04:17:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoimy-00084D-IT; Fri, 06 Oct 2023 07:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimw-00081y-L7 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimv-0000Hj-1t for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:34 -0400 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-48-9StRu68kNfO6XnPGIap9yQ-1; Fri, 06 Oct 2023 07:14:21 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9a62adedadbso174428866b.1 for ; Fri, 06 Oct 2023 04:14:21 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id p22-20020a05640210d600b00530a9488623sm2414770edu.46.2023.10.06.04.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590872; 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=NAACJAej5aSBwACda6Ra2S0VR9ySPOa1Dz12qYGkco0=; b=bIrULPC2AHzbxs3Rv4UA5lXnFWwdcgauWd8GTRUYqjqd5FcRvIPOVcDEWbK45BNh0iB9I+ qh9J1jOpqtdd0u++1UnEQwmRiokYD+qcFVFjkUU92ICFIZpCwxtlK2fOzeTJBPN1bMF3Rp jlTuFUT1HJOaq/cxek+UjQRHGCd1T9k= X-MC-Unique: 9StRu68kNfO6XnPGIap9yQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590860; x=1697195660; 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=NAACJAej5aSBwACda6Ra2S0VR9ySPOa1Dz12qYGkco0=; b=SXqbSEn4z5ljdzSmaKZaiC0H/Dm3TnNMR5xAZ1bsA0+0PRH9nrYIm6If62cH8OmRK/ SqR+9/5aSuZBQt/Eb1Fdj8sqWf0NTXeBNr/65gl1xD65AIqsYf/iaSApggWuJxX1V8g7 MHKE27xX3yRsBiqkolJ0lfBz/ivKpfuCo/OVnsdhTDn0GeXvvprFWZSuDQsxWmp1AzJV XZUPGsPOE/2GZWHzFpvxhpN/ryki0sa6dbtliWlIJQPVozpd1CS4tLsLycQ59qTQNDAm jHMTK0g8NywqLIuil3Vw4vjB9gooKmUK2b0dKjbinMTJem6m6tgm0uZmlN4I0Oy3pDvF x75g== X-Gm-Message-State: AOJu0YxM6ylqUuLc0uieeivtekFAB2/4oVWPvp79/dwCNCR+/z2hygag bKk0ioepsWRehSz2RVa5qHiAWvzd79xFrJW9YMus4ss6CakrCfo7M5T1L8oR3uWPjvJbYdOKO/p 0I1zXSa4UTd/YsuW8fYxdvdmeYhsWubf8Wm1q5eR17MuswmQ6isYq3+yXrI43RqkeDB1WgGRDdo g= X-Received: by 2002:a17:906:20d8:b0:9b9:f990:c701 with SMTP id c24-20020a17090620d800b009b9f990c701mr1638537ejc.52.1696590859907; Fri, 06 Oct 2023 04:14:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkviGhsvdKX/bDur8391ZftJMTFPFu3D0FXyj02RlF9DsD11585cAmOXrAIKNUi3yUfWl9Cg== X-Received: by 2002:a17:906:20d8:b0:9b9:f990:c701 with SMTP id c24-20020a17090620d800b009b9f990c701mr1638514ejc.52.1696590859421; Fri, 06 Oct 2023 04:14:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Fiona Ebner Subject: [PULL 03/26] util/log: re-allow switching away from stderr log file Date: Fri, 6 Oct 2023 13:13:49 +0200 Message-ID: <20231006111412.13130-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591056789100011 Content-Type: text/plain; charset="utf-8" From: Fiona Ebner Commit 59bde21374 ("util/log: do not close and reopen log files when flags are turned off") prevented switching away from stderr on a subsequent invocation of qemu_set_log_internal(). This prevented switching away from stderr with the 'logfile' monitor command as well as an invocation like > ./qemu-system-x86_64 -trace 'qemu_mutex_lock,file=3Dlog' from opening the specified log file. Fixes: 59bde21374 ("util/log: do not close and reopen log files when flags = are turned off") Signed-off-by: Fiona Ebner Message-ID: <20231004124446.491481-1-f.ebner@proxmox.com> Signed-off-by: Paolo Bonzini --- util/log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/log.c b/util/log.c index def88a9402b..d36c98da0b4 100644 --- a/util/log.c +++ b/util/log.c @@ -298,6 +298,8 @@ static bool qemu_set_log_internal(const char *filename,= bool changed_name, r->fd =3D logfile; qatomic_rcu_set(&global_file, NULL); call_rcu(r, rcu_close_file, rcu); + } + if (changed_name) { logfile =3D NULL; } } --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590888; cv=none; d=zohomail.com; s=zohoarc; b=csQo70mtaFG9wRSnZZ/W3Oi09uOEwix8zFrTpjdTRDmDznxlzkeySOZvaeSepAanrOYOUIhB2IVAE1BuKWU+1AMnNqY96nO2HtWUbCgkJI3rtsFsnmwKdI2x5prxFodOHql1f6KiNElysQJgs5cSWXrZIKfvJeaP5m0OkH30gp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590888; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VQp06QznhTp32bkj6DiTtyEnXwB982LrJKbC153Y+wQ=; b=NBQeqr5lKec8oStAxWunHcnb67yeXEes2lZrQxZIv7eo9b9fBLnklWKJ+9ZEupUNab87JqwHpeiirxjz+Le5zwC4a2lplrJ7j9Xiowoxk1/K04rnBZPomFV9fyGlymuZRDqCkQv2EoZFiuFT6KJoxDhtleqm6+xKdQXvsfGA8m8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590888255245.69049423221793; Fri, 6 Oct 2023 04:14:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoimr-000815-BX; Fri, 06 Oct 2023 07:14:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimp-00080N-MI for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimo-0000GN-5U for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:27 -0400 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-189-UYdrf6uUOE2GyqdLrFDD1w-1; Fri, 06 Oct 2023 07:14:23 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso174290766b.0 for ; Fri, 06 Oct 2023 04:14:22 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id u13-20020a1709060b0d00b009ad87d1be17sm2723239ejg.22.2023.10.06.04.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590864; 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=VQp06QznhTp32bkj6DiTtyEnXwB982LrJKbC153Y+wQ=; b=EoxGSrat7xtx++hfBMJHwOB8WqdWCQ4pA92eGgryYxKwrRZhIeSiUvBdcy1Y2sYwNr/HtV 4Hlsl/MoFrO/FqW/g0HkINnOPJ0TS3kdfPjDufphnsX/lML6ziWAIoZna25bw7QZzKUjKf MtEGWMKDzcy2oA7pKjKjqi8zaQAbnf4= X-MC-Unique: UYdrf6uUOE2GyqdLrFDD1w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590861; x=1697195661; 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=VQp06QznhTp32bkj6DiTtyEnXwB982LrJKbC153Y+wQ=; b=McqSxFHw3/QQYdTKofWAk5ydxjJKpJIgpJuUQXBvSCpmRfqyUx6rY3P13MdGzwPP9P EaKVfrrM/Yn1qWOuVofQ35G7M/7cE3zkDfCuGIPAvTyR+x96qjBIIrz7CxOMimbyBQaV G90jVZEpEK85pIHuS1MmEJDi4Df2ZuSkLosTdxb+wokVPSk+ViXwX13l8O7rHjWHmMeI YLrYwCmeqbkr8FnvEtPx/abccbdLZzZ3fvkEdMElUFylnwjU9/gahsUR79kSjoYTapPe IgEjjMCl5fmwjzgFHkHWt4UBQZesXz56n5NKpsdhYodCtNAEHYtGqChr08oqIaCY7xY4 CvqA== X-Gm-Message-State: AOJu0YwcCucIR5VuRdRtqBV5T2WCkyZLQ4ot7PNXBTw+HPqhIU84BtOY dcSyzFdN3ZEcwcMdkM/T68Tfe3nVJn5gI/625T2raL4NhwjMTKrmTS1NB0f/wyF+EstL/aC3Pqr lJ4UNcf2FAh1qghiPJSYs+uJOV2CG41BlfP3v3rcpAT9o6KVgS5A/patFJUtw1/VNTvS+zPomlX k= X-Received: by 2002:a17:906:4e:b0:9a2:16e2:353 with SMTP id 14-20020a170906004e00b009a216e20353mr7406321ejg.6.1696590861448; Fri, 06 Oct 2023 04:14:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDiYfX1DPAcIXt6/fGq8hksnDEk+6li+3QjAlGkKm0X6xDKo12dOmEy2e6KlIMfIWi0f2+8g== X-Received: by 2002:a17:906:4e:b0:9a2:16e2:353 with SMTP id 14-20020a170906004e00b009a216e20353mr7406304ejg.6.1696590861134; Fri, 06 Oct 2023 04:14:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one Date: Fri, 6 Oct 2023 13:13:50 +0200 Message-ID: <20231006111412.13130-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590889133100001 From: Philippe Mathieu-Daud=C3=A9 Since we *might* have user emulation with softmmu, replace the system emulation check by !user emulation one. (target/ was cleaned from invalid CONFIG_SOFTMMU uses at commit cab35c73be, but these files were merged few days after, thus missed the cleanup.) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004082239.27251-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/tcg/misc_helper.c | 2 +- target/i386/tcg/translate.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5b620500abf..3bcf7a3f904 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -719,7 +719,7 @@ void x86_cpu_vendor_words2str(char *dst, uint32_t vendo= r1, CPUID_7_0_EBX_HLE CPUID_7_0_EBX_INVPCID, CPUID_7_0_EBX_RTM */ =20 -#if defined CONFIG_SOFTMMU || defined CONFIG_LINUX +#if !defined CONFIG_USER_ONLY || defined CONFIG_LINUX #define TCG_7_0_ECX_RDPID CPUID_7_0_ECX_RDPID #else #define TCG_7_0_ECX_RDPID 0 diff --git a/target/i386/tcg/misc_helper.c b/target/i386/tcg/misc_helper.c index 868f36ab7f5..babff061864 100644 --- a/target/i386/tcg/misc_helper.c +++ b/target/i386/tcg/misc_helper.c @@ -134,7 +134,7 @@ void helper_wrpkru(CPUX86State *env, uint32_t ecx, uint= 64_t val) =20 target_ulong HELPER(rdpid)(CPUX86State *env) { -#if defined CONFIG_SOFTMMU +#if !defined CONFIG_USER_ONLY return env->tsc_aux; #elif defined CONFIG_LINUX && defined CONFIG_GETCPU unsigned cpu, node; diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 72635b87d3c..aa4cdf45b4b 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -178,10 +178,10 @@ typedef struct DisasContext { #else #define CODE64(S) (((S)->flags & HF_CS64_MASK) !=3D 0) #endif -#if defined(CONFIG_SOFTMMU) && !defined(TARGET_X86_64) -#define LMA(S) false -#else +#if defined(CONFIG_USER_ONLY) || defined(TARGET_X86_64) #define LMA(S) (((S)->flags & HF_LMA_MASK) !=3D 0) +#else +#define LMA(S) false #endif =20 #ifdef TARGET_X86_64 --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590903; cv=none; d=zohomail.com; s=zohoarc; b=fR/dZc4Yt069NMDVIKJpnRsxvg00bEUpXyUzMPfSSkXrFBLWI6N7nc+Y4KnCXCLohy/foJ3X+2yPqxfXC/a82PuPDmpLvmUzhXdigxeA6awsvZsTlulr7gAK0CJ2/TWkI+FYmt0+exfpyAoWbwf8nHudzxDCjBi/x74NHq2OHR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590903; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iSaoZDLtMbdcEKV3jUJN3mk/qKz/NtrRlOhHUjSJjMw=; b=ZrbhqM+XI4BFDopbdhHgy6wwPG0Kb9DggtcJLhkdRXyEQgV0ID7fHPcvI/TYxHT2ZzAGZG6wyNr7DbT4pnRHBMcF2W/SO7mN08DiK4PPDnGq5rJqsERUcLgdUlAxO50HoA1yPMsjA9Gh5cWcAr+xpMfUBnQnKWU6rTQyn4XDzkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169659090370637.44749055221632; Fri, 6 Oct 2023 04:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoimw-00081o-15; Fri, 06 Oct 2023 07:14:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimu-00081O-UL for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimt-0000HT-Gg for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:32 -0400 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-543-CXA96p1iOwuvW8DF3CmAQg-1; Fri, 06 Oct 2023 07:14:24 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9adc78b386cso172066866b.0 for ; Fri, 06 Oct 2023 04:14:24 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id qx18-20020a170906fcd200b0099bc8bd9066sm2718825ejb.150.2023.10.06.04.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590870; 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=iSaoZDLtMbdcEKV3jUJN3mk/qKz/NtrRlOhHUjSJjMw=; b=JHtf/In1j3eie4F6QdYzI96TGALMdrE+ZRC+wXcemdArmcxu23c4rGbxc9nGVrDDGpunTX vn/yYgYQlL1PLlTlFEHdzyp4gzaVs7PYQ0rvksOJVpsKJtMq38v/EeuBCeIWHrdo2o4JYD sqenTTmA+ng3k8sEurA4yop5dWqWEuQ= X-MC-Unique: CXA96p1iOwuvW8DF3CmAQg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590863; x=1697195663; 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=iSaoZDLtMbdcEKV3jUJN3mk/qKz/NtrRlOhHUjSJjMw=; b=H/AqfUkgOg3VkQRViMugAcfBy+DSoKx7YhsQW+wsaa3fe0nt4Ih131b6QGVi3hL7z4 usUlf32MvKY73Bqoma0OSwXyz+9fLUARqR1WCelFsWmqug0k3R9yxNEPnvcokEsW2aaC khvrBJiIxTIpU0wew99Z2jooPlCQ5P1K6dZUhpGgSepnDVeTkTZSmv+5lckmQzVJW8D8 zF01CUSNOxBYPsso8JpLB6gki/yhP72T9Fm56oFV73o7KE7QV7sKBic5JosnqiZzAifY JFj6vp1WUK4GJ/UMV0yq9QMHuzdXInt+k3RtblSP4hyaE8JxSolisVK8We+OqMlkdT+o Wlkg== X-Gm-Message-State: AOJu0YxSGrELzfE6isZwkOohU7S53HKbmPE8ENmLztEu2PCv8crBcWpZ GXPtlb7LFKzlOXrZqL3UX9GOTiRGnyEOiM7llDhXxx8sy43jIK6F1x3GEOZwjte2fZzL+FEubG2 dxQqkZImX9Y5rr2XuSbzPQlKv2Udn2/2Td/F+j87SPYktUDxrnWQywBb4epk5dIwecLc0S1C3jz Y= X-Received: by 2002:a17:906:535e:b0:9ae:42da:803c with SMTP id j30-20020a170906535e00b009ae42da803cmr6347058ejo.48.1696590862948; Fri, 06 Oct 2023 04:14:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8Pieni9yRnUOHlCOcoxL/vGmLh3FxzMJRoClt1hJG1LuLdPQebLuKAaTfQk5wLX183ePFvQ== X-Received: by 2002:a17:906:535e:b0:9ae:42da:803c with SMTP id j30-20020a170906535e00b009ae42da803cmr6347042ejo.48.1696590862655; Fri, 06 Oct 2023 04:14:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 05/26] softmmu/trace-events: Fix a typo Date: Fri, 6 Oct 2023 13:13:51 +0200 Message-ID: <20231006111412.13130-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590905241100003 From: Philippe Mathieu-Daud=C3=A9 Commit 8af3f5c6d6 ("softmmu: add trace point when bdrv_flush_all fails") added calls to trace_vm_stop_flush_all() in 'cpus.c'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- softmmu/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/trace-events b/softmmu/trace-events index 22606dc27b3..69c9044151b 100644 --- a/softmmu/trace-events +++ b/softmmu/trace-events @@ -21,7 +21,7 @@ flatview_destroy(void *view, void *root) "%p (root %p)" flatview_destroy_rcu(void *view, void *root) "%p (root %p)" global_dirty_changed(unsigned int bitmask) "bitmask 0x%"PRIx32 =20 -# softmmu.c +# cpus.c vm_stop_flush_all(int ret) "ret %d" =20 # vl.c --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590973; cv=none; d=zohomail.com; s=zohoarc; b=ahn1VLO9sQyCVI23vv5OTDSxXFP2Pfw0WR5ON8xQSXSiuNesqn8FfPRiFyEH1txmfOOMIHfRXuN1XysDhOwZBvXPH//JhJtVqkxgCjpjiPgfftWCz+tibOtxAZ3qfBTApkPWTxtJW/5QYNSVyg9B2QntOnCUqOegr+Coyq0iZPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590973; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Luqbg0iv9QomaP+bzgEzMOtbMBnMckqWwEvz6p/CP1I=; b=TalwCHTO3rlKpp9t2tZp2qvLvXNGiD17PHc8XM6JqoX7ZoVjMu8yBUUQH2aD4aNz8vLt+0YRHYofBs9ZX8z/rMFal/y04QQjfWbAlGv+iTCc/lxSwXvNPPxW75sVjybSXtr0nOOWEXsMnv6dRA2JV8Bl/b5MocRK1u/fcr5yM8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590973649287.56954479360024; Fri, 6 Oct 2023 04:16:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinN-0008NV-7G; Fri, 06 Oct 2023 07:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008Fd-IO for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin5-0000Jv-RR for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 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-553-u4IS52XhNbyBKvpAH8Gnrg-1; Fri, 06 Oct 2023 07:14:26 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5344aaf2703so1722151a12.0 for ; Fri, 06 Oct 2023 04:14:26 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id op26-20020a170906bcfa00b009b65a834dd6sm2681300ejb.215.2023.10.06.04.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590883; 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=Luqbg0iv9QomaP+bzgEzMOtbMBnMckqWwEvz6p/CP1I=; b=PJAgPUUym1Npc5uxESfcG/cAqvQit8TGcU1vFfLfT4/MeNtAdQnA/ju99THFbFuccyMOqG 6YcKdyhiCJXa5N82vhEplY9qFb/vqS1lKTSIlwhRZENsDE5GJE48KVOS32nwFbwo2kVpaZ doBdybrQYR8mE+z6R8F0LrjOze5j0ws= X-MC-Unique: u4IS52XhNbyBKvpAH8Gnrg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590865; x=1697195665; 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=Luqbg0iv9QomaP+bzgEzMOtbMBnMckqWwEvz6p/CP1I=; b=ZjfZhDcPF2dbDlOOxMOJ7mQ/AsKSneN8YMNzC8fc/O6UamhLvkziqrS3QfdT+neTqS Vqh4vL7VveweqPErZyeO0hyHXtPhyjBY47qmc2BWIU2CeFCQXS38lBeEQGFD204EV0qU D+kRnkuVAk7oMufzXdDVa0V5BvqGOIqCWx/rIseNN5DC7/737lbCZ9qG7evU0zEMkHGZ IDjrsGbr9PxRx2JP0PS/w+tHxRHpjLLSX74NAqnqnA1Mgv1PNjHRxmXnXcAeAFrjCCoD 2yKXpSHe5TnjWD2dZqWcFsbfZBwNaIlEUec7Xfh91u3k+MmO/JxloW8Ky8HvMopA7BK6 JarQ== X-Gm-Message-State: AOJu0YwcKlc7R3gn5jZEKv7+nNYXayzfNPe6WyFQ1cig+vH7vZvc+F8c q+avc69OW+yom8EZ2TuA5f4mf3yHx9iyPkN3RiZt0hGHde93NCOjqMwnTJ4TAK34tVcDxmRvEeZ IWgMStyZNaCcaYSOGmgofPt/z09LrEmBxtapvUSQsSB5l0VjAscEooSB0Q8MIuY3mG7JRdN4VkW w= X-Received: by 2002:a17:906:3156:b0:9b2:b71f:83be with SMTP id e22-20020a170906315600b009b2b71f83bemr6795490eje.1.1696590864900; Fri, 06 Oct 2023 04:14:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENoIDExoCWsLsDfPO+yb7q21Hl2/Eum692Y+6IGh+11tg+qpxwOdsZVN6GFqRLpZky63Z0IQ== X-Received: by 2002:a17:906:3156:b0:9b2:b71f:83be with SMTP id e22-20020a170906315600b009b2b71f83bemr6795477eje.1.1696590864542; Fri, 06 Oct 2023 04:14:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system' Date: Fri, 6 Oct 2023 13:13:52 +0200 Message-ID: <20231006111412.13130-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590983707100009 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b958eca5de1..76859d48da5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ env: - BASE_CONFIG=3D"--disable-docs --disable-tools" - TEST_BUILD_CMD=3D"" - TEST_CMD=3D"make check V=3D1" - # This is broadly a list of "mainline" softmmu targets which have supp= ort across the major distros + # This is broadly a list of "mainline" system targets which have suppo= rt across the major distros - MAIN_SOFTMMU_TARGETS=3D"aarch64-softmmu,mips64-softmmu,ppc64-softmmu= ,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS=3D"include_file_ctime,include_file_mtime" - CCACHE_MAXSIZE=3D1G @@ -197,7 +197,7 @@ jobs: $(exit $BUILD_RC); fi =20 - - name: "[s390x] GCC (other-softmmu)" + - name: "[s390x] GCC (other-system)" arch: s390x dist: focal addons: --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590972; cv=none; d=zohomail.com; s=zohoarc; b=BhLffyIIe0JAo+dPNTs5Z58zJ3YMtNmRtevlDWqmRMBly+FWyItv8faaHmlv+Amk/QmHLOSlkEJtu4/i82OkEaODvE8uDR2zUukidcmEgDmfb7/MpFXxF6T6X4mvq7+4i58U1ATjhhOlOCtNwMEEZn6vnrXCPGYlykc1OAHWnec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590972; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B6fm9E/O2tM3qMMoTzowAunSSCopmIRl6nWdSkz7Ns4=; b=KHz7jKlalwuRsKpTZTAc6DVR2V639tt3DzPON90oqxRfaovKsWw0OMgAYtD0TBYIqAW+oyzgqmc34T+mlDNA7eU9bDObgLfaDE+4ZlBA7vwZz9Htf/zu6VI1YnYPHvBHjuRzFrQJdmUmqbPV/HCLkNqnKA2S3Crn7A8HVDOL0gM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590972024552.1181379258311; Fri, 6 Oct 2023 04:16:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinJ-0008HF-96; Fri, 06 Oct 2023 07:14:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008FI-Fp for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin3-0000JJ-Sr for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:52 -0400 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-422-5gIW62gFMf-fC0OEtED2Rg-1; Fri, 06 Oct 2023 07:14:28 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso174293866b.0 for ; Fri, 06 Oct 2023 04:14:28 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id k26-20020a17090627da00b0099b7276235esm2734168ejc.93.2023.10.06.04.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590879; 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=B6fm9E/O2tM3qMMoTzowAunSSCopmIRl6nWdSkz7Ns4=; b=ARtTpIe1Zr/eVfWNdBwm2M481Y1jGvNLrcmxErKdwR5gqkEvZ5JlzrZHfrTOBXkX41p4Uz BQ6UJ4RwXLgJR1q4E5+pCZ/OGgabVkXDBhZQfncp8mmTCgWshKdjw/AFtMjhf1H1wz8vDX Q+VVSDU/3VrQKYDrjKSxIATUeWE/CMk= X-MC-Unique: 5gIW62gFMf-fC0OEtED2Rg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590867; x=1697195667; 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=B6fm9E/O2tM3qMMoTzowAunSSCopmIRl6nWdSkz7Ns4=; b=GgL+QYIm3kz0Q7bQBci3Jfm/Fxd+VdU75TVzikY+rqd3Qahtk7HaayratUtZ8Ne9di GqXiflwFNJxCRNSCkcgMvhlxEEsHsX1pmdM9MdB7Ym5LVr2T4tThq4olPvs7Xv1qLYHc fHRGyRsEpM35R+f0PkAuV3pPVFkBEPkdPhpvY2Yc6j9zRLL7TkcGwYOZKH0XDehIZQon 14LXYUQs2ILPitPJVl/TFVCYoolgEopNZUXAtOpnZQ8QePiVUCYsjRE5EBHm9lmfpFX4 GW1rDSHIYw8wggXMYaDmH7nL9cLvrEcZuX4TLZC1ojmN4fBRQ0aLsTNztPzfggd0fs+M hpKQ== X-Gm-Message-State: AOJu0YyfKolb3JUJ6YwUJ8ffRmE9/KFQexR5Ar8fwm5+8pwvXtaZkjOm 700tcpgPcVcG23xKWpEHuLUPJCPZQZ1cx5Eocp0CG/7sZAhRyOazNQQbeYNzWQQIXAbXMuYAEPM IAiwhg+k5acdyPSoDK2GUUfGWZs2ebPrrBEBr/X6csuvdPK0cNCi5VqVXho9drDdC13RCAIVo03 I= X-Received: by 2002:a17:906:1daa:b0:9ae:5f51:2e4a with SMTP id u10-20020a1709061daa00b009ae5f512e4amr5975092ejh.36.1696590866858; Fri, 06 Oct 2023 04:14:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcoWMMhaeDU98dGPIy0WtFkURPfaCAob1IE9hXxMZP55vn7HrcuoKOfW4GkJuZ+vL9Gn4egQ== X-Received: by 2002:a17:906:1daa:b0:9ae:5f51:2e4a with SMTP id u10-20020a1709061daa00b009ae5f512e4amr5975077ejh.36.1696590866515; Fri, 06 Oct 2023 04:14:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 07/26] cpu: Correct invalid mentions of 'softmmu' by 'system-mode' Date: Fri, 6 Oct 2023 13:13:53 +0200 Message-ID: <20231006111412.13130-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590981548100003 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-4-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- cpu.c | 2 +- hw/core/cpu-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu.c b/cpu.c index 0769b0b1539..8cb67901423 100644 --- a/cpu.c +++ b/cpu.c @@ -209,7 +209,7 @@ static Property cpu_common_props[] =3D { prctl_unalign_sigbus, false), #else /* - * Create a memory property for softmmu CPU object, so users can + * Create a memory property for system CPU object, so users can * wire up its memory. The default if no link is set up is to use * the system address space. */ diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index ced66c2b342..f04d59c8d5b 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -228,8 +228,8 @@ static void cpu_common_initfn(Object *obj) cpu->cpu_index =3D UNASSIGNED_CPU_INDEX; cpu->cluster_index =3D UNASSIGNED_CLUSTER_INDEX; cpu->gdb_num_regs =3D cpu->gdb_num_g_regs =3D cc->gdb_num_core_regs; - /* *-user doesn't have configurable SMP topology */ - /* the default value is changed by qemu_init_vcpu() for softmmu */ + /* user-mode doesn't have configurable SMP topology */ + /* the default value is changed by qemu_init_vcpu() for system-mode */ cpu->nr_cores =3D 1; cpu->nr_threads =3D 1; cpu->cflags_next_tb =3D -1; --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590992; cv=none; d=zohomail.com; s=zohoarc; b=f+Ed9i5o6JzeZLrwDGxiIzpHEnvZ0wZM91ah5CIj0VNp4eB49GJu+4mkCtNTS0EGVFkyuaetwJBEobqDMPzx3NMl39CLq0YtKklqmTBosB7GCY25U7eWkwu5ayjKxgDHEKPBEayoUQIVCOBWex4bEhq4NJ5sJqgXyy4+OWNCv9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590992; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mrLgVIQkAHjAMRqFWa/jP4n4ukjcbGYSSbVn59AYU2E=; b=bnb731TYQbiZ82J9QKzVpoWDvpNVl/BA+vZT1nAISK+c1EVHFrtkaiTUHvIx4pFlZ07rbAHAZg6lwifUx4VqlAzhXV7FTE/YXpqFYv8okCG+QFHS5eGWms2Ee+6DsWl5SVlgPPzp8puYBlmyQdDHKPNvhniY6oEw4XETWrkeF2s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590992080927.9580468395919; Fri, 6 Oct 2023 04:16:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoimx-00082M-D2; Fri, 06 Oct 2023 07:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimv-00081X-Hj for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimu-0000HX-3I for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:33 -0400 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-138-ywIFhpXPP0Gri7xJ6nAT6w-1; Fri, 06 Oct 2023 07:14:30 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9ba0616b761so7908566b.2 for ; Fri, 06 Oct 2023 04:14:29 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id z11-20020a170906074b00b00988f168811bsm2742861ejb.135.2023.10.06.04.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590871; 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=mrLgVIQkAHjAMRqFWa/jP4n4ukjcbGYSSbVn59AYU2E=; b=N3JzYM7nwPktA30C04ZEWuV34xlE4mkKjZnwSepsiulZ6a2Y+cf3p3F6jgW+ovZOu6zixe 3FCvfG6tRbUpNaypvCU0O7xf/GgkNeqNUDwlRQ/F1xRsjikgo2nd9z8SIkoBG1pvyjrt0v U/YEA06RqXSeVQQY+b5Cp12yeVXampw= X-MC-Unique: ywIFhpXPP0Gri7xJ6nAT6w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590868; x=1697195668; 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=mrLgVIQkAHjAMRqFWa/jP4n4ukjcbGYSSbVn59AYU2E=; b=v2LX1YsF7Hs5YKrqix+makXKolkiQKBF1wg5t6dL5qW9Q1Dz0LGZ19RLdOpRHUOzl5 iCFtpfC/p7LeWerNGLW6XMhv0DqCkrRYf878WM84OooPAebZPgpfKaFSjjgYXPO+n4vc gUmLaqRrLdreETL2HA13tXzv91OMVSSTZJYekrwwqw7Q97t9zUdY0CmYJnhEg9+jLOpp y5ymUre+eo2v5Og/SvWVngMR9LeKgavSocVQONcvor54wjSMq/zRbcQ/X4a4e98tv1PD iniaDNOzU9t4Ih4Rik9WjsQ+By1dseoP5gH8qTKLTK7lNiItcGBzpvNtISfWykBwA5MW K90Q== X-Gm-Message-State: AOJu0Yy36+NIG+STs/P0Y+jRl8icpCjzm8W7C+SKsoF3bit5qtkGd5V7 E4amNAukzHj+eElhvFV7RKMnnbnUlVUXWb6hnxB5xdYqK7RFWcXriwAsaic7XlXmpm4Zz38bFRl 84l8dH974ztU/BIkAvhWsTUjIiFbEw9hTUq7F5+te+H3FlX0UmgionDQ877179nKhw8nZdErDls 8= X-Received: by 2002:a17:907:7804:b0:9b0:552c:b36c with SMTP id la4-20020a170907780400b009b0552cb36cmr7255388ejc.21.1696590868509; Fri, 06 Oct 2023 04:14:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMfktU/1G4q5CMzKiK1jlGF1aaOzeT9IiVi3frrnGrGeC9Ut2S32aSh26sLYEzWL0SGrGqFg== X-Received: by 2002:a17:907:7804:b0:9b0:552c:b36c with SMTP id la4-20020a170907780400b009b0552cb36cmr7255371ejc.21.1696590868171; Fri, 06 Oct 2023 04:14:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PULL 08/26] fuzz: Correct invalid mentions of 'softmmu' by 'system' Date: Fri, 6 Oct 2023 13:13:54 +0200 Message-ID: <20231006111412.13130-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590993420100006 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alexander Bulekov Message-ID: <20231004090629.37473-5-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- softmmu/memory.c | 2 +- tests/qtest/fuzz/fuzz.c | 2 +- tests/qtest/fuzz/fuzz.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index 234bd7b1161..fa1c99f9bad 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -3638,7 +3638,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, } =20 /* - * Support softmmu builds with CONFIG_FUZZ using a weak symbol and a stub = for + * Support system builds with CONFIG_FUZZ using a weak symbol and a stub f= or * the fuzz_dma_read_cb callback */ #ifdef CONFIG_FUZZ diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 3bedb81b32b..9b9c9f9c36e 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -207,7 +207,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char = ***envp) fuzz_target->pre_vm_init(); } =20 - /* Run QEMU's softmmu main with the fuzz-target dependent arguments */ + /* Run QEMU's system main with the fuzz-target dependent arguments */ cmd_line =3D fuzz_target->get_init_cmdline(fuzz_target); g_string_append_printf(cmd_line, " %s -qtest /dev/null ", getenv("QTEST_LOG") ? "" : "-qtest-log none"); diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h index 21d1362d655..7da0bc3d7eb 100644 --- a/tests/qtest/fuzz/fuzz.h +++ b/tests/qtest/fuzz/fuzz.h @@ -49,13 +49,13 @@ typedef struct FuzzTarget { =20 =20 /* - * Returns the arguments that are passed to qemu/softmmu init(). Freed= by + * Returns the arguments that are passed to qemu/system init(). Freed = by * the caller. */ GString *(*get_init_cmdline)(struct FuzzTarget *); =20 /* - * will run once, prior to running qemu/softmmu init. + * will run once, prior to running qemu/system init. * eg: set up shared-memory for communication with the child-process * Can be NULL */ --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591072; cv=none; d=zohomail.com; s=zohoarc; b=AD/CSYfsxjnxyOnGPAjjSdp5nnqcQYTE9fB6URxm+z/hDwaMCAbrTISSQOOKcS3td0o7MTNW0DNEOZKmfydd5IcaEvXepOQppPhJCZlO1rMywPAEW5kbET3VQZe6l84bh2SqoIJbKACVdYMBYvC5xqKaeFJHmimRProYla1uPdc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591072; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Gc5d66zj1z2mWfgNRF83cak7oV9eJ59PKQmCJrWqMiY=; b=nEv4r1cBmd6lmCYzd35BRvDptlTKSJcNQwweBb1UPctYpJsQIJMTOTnd8FFAQoBL/w+xUJ2oYejQl3yrKsCBP1+F83T+XmwWuPmJTTOKCDIxVjVpEdixqY5Gv0sZPwanpa7QvJxOJ3VqNg7Wuj0gg0huq8AdYp6V0Dq6k0dZ8fM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591072463242.62044082045122; Fri, 6 Oct 2023 04:17:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoin4-000871-6E; Fri, 06 Oct 2023 07:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin1-00084e-JF for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimx-0000IL-Px for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:39 -0400 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-394-L8L747C5NoyAbRVPpqu3kQ-1; Fri, 06 Oct 2023 07:14:33 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ae686dafedso181629666b.3 for ; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id f18-20020a056402069200b005389ebf00a2sm2418116edy.76.2023.10.06.04.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590875; 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=Gc5d66zj1z2mWfgNRF83cak7oV9eJ59PKQmCJrWqMiY=; b=E8TuXKXAoVEPBs/CFUuS9ZyDHoPBU9hnmVKokShrYBC1Y7xUOBMjiT+REWyg5WwGxouAFE soIX5Y8mNUSXPD5u5zJRxIRa3V9ss3qIaHyp5OC5QTrdU8TtYbGGVunUF8pPbehGD49qT+ xFUi/vWFpjZ6qd1rizaErl/HBa8tZMM= X-MC-Unique: L8L747C5NoyAbRVPpqu3kQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590871; x=1697195671; 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=Gc5d66zj1z2mWfgNRF83cak7oV9eJ59PKQmCJrWqMiY=; b=DaKSvre7rJ1ZBobj/+ppn9QIvSefbbU0435UxLcQLfVnR4hJrwQOTdbmEUQFPYCPug 5rDJpzR4X+FOgCNjqfBXO4UaG0fnUuRB/Tpkx1Ej91dua0tDIrKpxDPnFg2V3+Ejf0PK D8PFG9NpQDrSZvIXBAvNgJWiFOqCqiGKg8huuGbgFrQmlDTgwyOtGrdNw6T/wM0X1Wij 9wtvhkJNT3TiCxUc6vlVhD6atGHq6YuMiqHEpS6uzNi9X22nx9g/S7Ib2jBL7LyrYqy/ AxyHnZ3gv4utf7ciQYIGxkukjIGU0GzNWeMvctrdZmVyqhrvejpmHypr9klfF8jQc7ml S8Pg== X-Gm-Message-State: AOJu0Yyo5Ib2ysUoZPJoCO/WgZv6f28sF46U7nH6Z9FevlApzDUaxy55 S69Lm4/F6YD8mvrcd23xXUvm2t1oCAwattwgAyNDZ5kOIE8/wB0qu7098nq0u/e27qs1L1VBhBr T236HJRnN2uRvtcSJuaxRGKOiHk5EJux+z4loGr0BujPMBATZ4krgcYBSZOW34tem38/1hFOf1W s= X-Received: by 2002:aa7:c493:0:b0:532:c690:92c8 with SMTP id m19-20020aa7c493000000b00532c69092c8mr6639641edq.31.1696590870861; Fri, 06 Oct 2023 04:14:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFN3qqN5KfVWMY9V/woNKMevNQawswShVD/mHxAHqmS3NsOnHCU/zCuAf01oJTZfT9aoKwJ9w== X-Received: by 2002:aa7:c493:0:b0:532:c690:92c8 with SMTP id m19-20020aa7c493000000b00532c69092c8mr6639618edq.31.1696590870301; Fri, 06 Oct 2023 04:14:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 09/26] tcg: Correct invalid mentions of 'softmmu' by 'system-mode' Date: Fri, 6 Oct 2023 13:13:55 +0200 Message-ID: <20231006111412.13130-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591073148100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-6-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- accel/tcg/user-exec.c | 2 +- docs/devel/testing.rst | 2 +- include/qemu/atomic128.h | 4 ++-- include/tcg/tcg-op-common.h | 2 +- target/riscv/vector_helper.c | 2 +- tcg/aarch64/tcg-target.c.inc | 4 ++-- tcg/arm/tcg-target.c.inc | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/loongarch64/tcg-target.c.inc | 4 ++-- tcg/meson.build | 6 +++--- tcg/mips/tcg-target.c.inc | 4 ++-- tcg/ppc/tcg-target.c.inc | 4 ++-- tcg/region.c | 4 ++-- tcg/riscv/tcg-target.c.inc | 4 ++-- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/sparc64/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 11 ++++++----- tests/tcg/Makefile.target | 2 +- tests/tcg/multiarch/gdbstub/interrupt.py | 2 +- tests/tcg/multiarch/gdbstub/memory.py | 2 +- tests/tcg/multiarch/system/memory.c | 4 ++-- tests/tcg/s390x/pgm-specification-softmmu.S | 2 +- tests/tcg/s390x/pgm-specification.mak | 2 +- tests/tcg/s390x/softmmu.ld | 2 +- tests/tcg/xtensa/Makefile.softmmu-target | 2 +- tests/tcg/xtensaeb/Makefile.softmmu-target | 2 +- 26 files changed, 43 insertions(+), 42 deletions(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index ab48cb41e4c..6c1e8ec5a5d 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -939,7 +939,7 @@ void *page_get_target_data(target_ulong address) void page_reset_target_data(target_ulong start, target_ulong last) { } #endif /* TARGET_PAGE_DATA_SIZE */ =20 -/* The softmmu versions of these helpers are in cputlb.c. */ +/* The system-mode versions of these helpers are in cputlb.c. */ =20 static void *cpu_mmu_lookup(CPUArchState *env, vaddr addr, MemOp mop, uintptr_t ra, MMUAccessType type) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 5d1fc0aa95f..f3e24721890 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1458,7 +1458,7 @@ TCG test dependencies ~~~~~~~~~~~~~~~~~~~~~ =20 The TCG tests are deliberately very light on dependencies and are -either totally bare with minimal gcc lib support (for softmmu tests) +either totally bare with minimal gcc lib support (for system-mode tests) or just glibc (for linux-user tests). This is because getting a cross compiler to work with additional libraries can be challenging. =20 diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h index 34554bf0acc..88af6d4ea3f 100644 --- a/include/qemu/atomic128.h +++ b/include/qemu/atomic128.h @@ -43,8 +43,8 @@ * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D80878 * * This interpretation is not especially helpful for QEMU. - * For softmmu, all RAM is always read/write from the hypervisor. - * For user-only, if the guest doesn't implement such an __atomic_read + * For system-mode, all RAM is always read/write from the hypervisor. + * For user-mode, if the guest doesn't implement such an __atomic_read * then the host need not worry about it either. * * Moreover, using libatomic is not an option, because its interface is diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index a53b15933bb..2048f92b5e1 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -265,7 +265,7 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsign= ed idx); * * See tcg/README for more info about this TCG operation. * - * NOTE: In softmmu emulation, direct jumps with goto_tb are only safe wit= hin + * NOTE: In system emulation, direct jumps with goto_tb are only safe with= in * the pages this TB resides in because we don't take care of direct jumps= when * address mapping changes, e.g. in tlb_flush(). In user mode, there's onl= y a * static address translation, so the destination address is always valid,= TBs diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index cba02c13203..c9b39fb67f4 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -100,7 +100,7 @@ static inline target_ulong adjust_addr(CPURISCVState *e= nv, target_ulong addr) /* * This function checks watchpoint before real load operation. * - * In softmmu mode, the TLB API probe_access is enough for watchpoint chec= k. + * In system mode, the TLB API probe_access is enough for watchpoint check. * In user mode, there is no watchpoint support now. * * It will trigger an exception if there is no mapping in TLB diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 06ea3c76526..88a243a3105 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1643,8 +1643,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) #define MIN_TLB_MASK_TABLE_OFS -512 =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index b1d56362a74..ec3f9250c29 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -353,7 +353,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int ty= pe, #define ALL_VECTOR_REGS 0xffff0000u =20 /* - * r0-r3 will be overwritten when reading the tlb entry (softmmu only); + * r0-r3 will be overwritten when reading the tlb entry (system-mode only); * r14 will be overwritten by the BLNE branching to the slow path. */ #ifdef CONFIG_SOFTMMU diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 4e47151241c..788d6081504 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -2276,7 +2276,7 @@ static void tcg_out_qemu_st_direct(TCGContext *s, TCG= Reg datalo, TCGReg datahi, int movop =3D OPC_MOVL_EvGv; =20 /* - * Do big-endian stores with movbe or softmmu. + * Do big-endian stores with movbe or system-mode. * User-only without movbe will have its swapping done generically. */ if (memop & MO_BSWAP) { diff --git a/tcg/loongarch64/tcg-target.c.inc b/tcg/loongarch64/tcg-target.= c.inc index b701df50db8..879a05ace4e 100644 --- a/tcg/loongarch64/tcg-target.c.inc +++ b/tcg/loongarch64/tcg-target.c.inc @@ -891,8 +891,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -(1 << 11) =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/meson.build b/tcg/meson.build index 4be4a616caa..895a11d3fa2 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -34,12 +34,12 @@ tcg_user =3D declare_dependency(link_with: libtcg_user, dependencies: tcg_ss.dependencies()) user_ss.add(tcg_user) =20 -libtcg_softmmu =3D static_library('tcg_softmmu', +libtcg_system =3D static_library('tcg_system', tcg_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_SOFTMMU', build_by_default: false) =20 -tcg_softmmu =3D declare_dependency(link_with: libtcg_softmmu, +tcg_system =3D declare_dependency(link_with: libtcg_system, dependencies: tcg_ss.dependencies()) -system_ss.add(tcg_softmmu) +system_ss.add(tcg_system) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index f52bda48285..e2892edc6ad 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -1258,8 +1258,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -32768 =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 90d76c2c2c7..5c873b21614 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -2091,8 +2091,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -32768 =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/region.c b/tcg/region.c index a0788990964..86692455c00 100644 --- a/tcg/region.c +++ b/tcg/region.c @@ -733,7 +733,7 @@ static int alloc_code_gen_buffer(size_t size, int split= wx, Error **errp) * and then assigning regions to TCG threads so that the threads can trans= late * code in parallel without synchronization. * - * In softmmu the number of TCG threads is bounded by max_cpus, so we use = at + * In system-mode the number of TCG threads is bounded by max_cpus, so we = use at * least max_cpus regions in MTTCG. In !MTTCG we use a single region. * Note that the TCG options from the command-line (i.e. -accel accel=3Dtc= g,[...]) * must have been parsed before calling this function, since it calls @@ -749,7 +749,7 @@ static int alloc_code_gen_buffer(size_t size, int split= wx, Error **errp) * * However, this user-mode limitation is unlikely to be a significant prob= lem * in practice. Multi-threaded guests share most if not all of their trans= lated - * code, which makes parallel code generation less appealing than in softm= mu. + * code, which makes parallel code generation less appealing than in syste= m-mode */ void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus) { diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index c2bcdea33f9..d6dbcaf3cbb 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -1227,8 +1227,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *l) #define MIN_TLB_MASK_TABLE_OFS -(1 << 11) =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 7552f63a057..4ef9ac3d5bd 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -1750,8 +1750,8 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, = TCGLabelQemuLdst *lb) #define MIN_TLB_MASK_TABLE_OFS -(1 << 19) =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index 01ac26c1920..19d9df4a09a 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -1033,8 +1033,8 @@ bool tcg_target_has_memory_bswap(MemOp memop) #define MIN_TLB_MASK_TABLE_OFS -(1 << 12) =20 /* - * For softmmu, perform the TLB load and compare. - * For useronly, perform any required alignment tests. + * For system-mode, perform the TLB load and compare. + * For user-mode, perform any required alignment tests. * In both cases, return a TCGLabelQemuLdst structure if the slow path * is required and fill in @h with the host address for the fast path. */ diff --git a/tcg/tcg.c b/tcg/tcg.c index ea94d0fbff4..2f56456b25b 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -751,12 +751,13 @@ static void alloc_tcg_plugin_context(TCGContext *s) * In user-mode we just point tcg_ctx to tcg_init_ctx. See the documentati= on * of tcg_region_init() for the reasoning behind this. * - * In softmmu each caller registers its context in tcg_ctxs[]. Note that in - * softmmu tcg_ctxs[] does not track tcg_ctx_init, since the initial conte= xt + * In system-mode each caller registers its context in tcg_ctxs[]. Note th= at in + * system-mode tcg_ctxs[] does not track tcg_ctx_init, since the initial c= ontext * is not used anymore for translation once this function is called. * - * Not tracking tcg_init_ctx in tcg_ctxs[] in softmmu keeps code that iter= ates - * over the array (e.g. tcg_code_size() the same for both softmmu and user= -mode. + * Not tracking tcg_init_ctx in tcg_ctxs[] in system-mode keeps code that + * iterates over the array (e.g. tcg_code_size() the same for both system/= user + * modes. */ #ifdef CONFIG_USER_ONLY void tcg_register_thread(void) @@ -1340,7 +1341,7 @@ static void tcg_context_init(unsigned max_cpus) * In user-mode we simply share the init context among threads, since = we * use a single region. See the documentation tcg_region_init() for the * reasoning behind this. - * In softmmu we will have at most max_cpus TCG threads. + * In system-mode we will have at most max_cpus TCG threads. */ #ifdef CONFIG_USER_ONLY tcg_ctxs =3D &tcg_ctx; diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 462289f47cc..f3a189c9d46 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -120,7 +120,7 @@ endif %: %.S $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) else -# For softmmu targets we include a different Makefile fragment as the +# For system targets we include a different Makefile fragment as the # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. EXTRA_CFLAGS +=3D -ffreestanding diff --git a/tests/tcg/multiarch/gdbstub/interrupt.py b/tests/tcg/multiarch= /gdbstub/interrupt.py index e222ac94c5a..c016e7afbbf 100644 --- a/tests/tcg/multiarch/gdbstub/interrupt.py +++ b/tests/tcg/multiarch/gdbstub/interrupt.py @@ -1,6 +1,6 @@ from __future__ import print_function # -# Test some of the softmmu debug features with the multiarch memory +# Test some of the system debug features with the multiarch memory # test. It is a port of the original vmlinux focused test case but # using the "memory" test instead. # diff --git a/tests/tcg/multiarch/gdbstub/memory.py b/tests/tcg/multiarch/gd= bstub/memory.py index dd25e722813..fb1d06b7bb7 100644 --- a/tests/tcg/multiarch/gdbstub/memory.py +++ b/tests/tcg/multiarch/gdbstub/memory.py @@ -1,6 +1,6 @@ from __future__ import print_function # -# Test some of the softmmu debug features with the multiarch memory +# Test some of the system debug features with the multiarch memory # test. It is a port of the original vmlinux focused test case but # using the "memory" test instead. # diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/syst= em/memory.c index e29786ae559..6eb2eb16f7f 100644 --- a/tests/tcg/multiarch/system/memory.c +++ b/tests/tcg/multiarch/system/memory.c @@ -1,14 +1,14 @@ /* * Memory Test * - * This is intended to test the softmmu code and ensure we properly + * This is intended to test the system-mode code and ensure we properly * behave across normal and unaligned accesses across several pages. * We are not replicating memory tests for stuck bits and other * hardware level failures but looking for issues with different size * accesses when access is: * * - unaligned at various sizes (if -DCHECK_UNALIGNED set) - * - spanning a (softmmu) page + * - spanning a (system) page * - sign extension when loading */ =20 diff --git a/tests/tcg/s390x/pgm-specification-softmmu.S b/tests/tcg/s390x/= pgm-specification-softmmu.S index d534f4e505d..86c340aeef0 100644 --- a/tests/tcg/s390x/pgm-specification-softmmu.S +++ b/tests/tcg/s390x/pgm-specification-softmmu.S @@ -1,5 +1,5 @@ /* - * Common softmmu code for specification exception testing. + * Common system code for specification exception testing. * * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/tests/tcg/s390x/pgm-specification.mak b/tests/tcg/s390x/pgm-sp= ecification.mak index 2999aee26e6..73dc47af0d2 100644 --- a/tests/tcg/s390x/pgm-specification.mak +++ b/tests/tcg/s390x/pgm-specification.mak @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # List of specification exception tests. -# Shared between the softmmu and the user makefiles. +# Shared between the system and the user makefiles. PGM_SPECIFICATION_TESTS =3D \ br-odd \ cgrl-unaligned \ diff --git a/tests/tcg/s390x/softmmu.ld b/tests/tcg/s390x/softmmu.ld index ea944eaa3cb..c7a8864407e 100644 --- a/tests/tcg/s390x/softmmu.ld +++ b/tests/tcg/s390x/softmmu.ld @@ -1,5 +1,5 @@ /* - * Linker script for the softmmu test kernels. + * Linker script for the system test kernels. * * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Ma= kefile.softmmu-target index 78bf72dfaa4..a29571b367c 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -1,5 +1,5 @@ # -# Xtensa softmmu tests +# Xtensa system tests # =20 CORE=3Ddc232b diff --git a/tests/tcg/xtensaeb/Makefile.softmmu-target b/tests/tcg/xtensae= b/Makefile.softmmu-target index 4204a96d53c..95d0528c372 100644 --- a/tests/tcg/xtensaeb/Makefile.softmmu-target +++ b/tests/tcg/xtensaeb/Makefile.softmmu-target @@ -1,5 +1,5 @@ # -# Xtensa softmmu tests +# Xtensa system tests # =20 include $(SRC_PATH)/tests/tcg/xtensa/Makefile.softmmu-target --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590915; cv=none; d=zohomail.com; s=zohoarc; b=VmtDUDzdVgMuWbwt5k9Bq4mpjs5V+VCO3R43A1YxedlBqVRRZrCqzuq2oxWTQWyx1w1iLOtHm1h/RG75qVIhy6dbNdOkDK5c6cRlBnZa0G7x0An/lT2QsWId/FiJ4INjZxtEiRfSc15y0VIz4NL98A/+oJIA3271uSipkDIYXYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590915; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; b=TOkeXpNMXO4b9Io+blstxdtE0b8MTeooirUVYtrgCvvu6yxwg1dLG98ZlX2+TVnSq1tLH2rgRi/lGOgmJwDyIjReOENOHgm4He6MDIdUCa5SefJK/eZdd7dpJRCtP1iGLwDIT2WzSOzVjgzgmeold6Zj89628Ba8xfjnAv9HD2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590915538528.2699435046461; Fri, 6 Oct 2023 04:15:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinD-00088B-AH; Fri, 06 Oct 2023 07:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin4-000873-7V for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoimx-0000IO-LA for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:40 -0400 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-460-dbh-XtYZNACf6IpNFZNfxg-1; Fri, 06 Oct 2023 07:14:33 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-537fb536554so1818171a12.2 for ; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id g18-20020a056402181200b0053782c81c69sm2397206edy.96.2023.10.06.04.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590875; 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=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; b=JdEaUXjWyA1A7PFFEbpKK2L77Zkw8eEA3SCbLojAY3PI28DurBHcdtSoG+coD2Pv32iY1u n/XlgJmVZxGANYKiRLfHc7hQgGkYCo01wtRpFHQW9PWEQO6JZ0EYjWLYGbpqbXOtIQy0d4 i06XZzuMTuE0q5fXBZsC2GKKoppH33A= X-MC-Unique: dbh-XtYZNACf6IpNFZNfxg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590872; x=1697195672; 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=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; b=QdO8cyU07reysCCsHMS6CIWAt+lzFBJen87RePwLC0SvJJVL8W2AwqFVUMTOt6+vA3 ycKQe5BZFWLEGV8bpYWb/5nX++WvWPD5DRIlekXQp4cgdIogvvPIz9tsF13bMsw+Xm9R wvloM7A+emMNs1CLr0m4jJp9YDmp5sLM13kdJv6QbsB33AHeC7/dl8zLoUxRRpWmlyzL mkG6c4vI+ZWEivZj+++yExq9zFpjkrONQcc+p6W8PVaDqqDTm8jC7sv65iOpuJhwXFFZ 0QBoXuJKS4Jdt5RilIx3pmqz2zbF+IwVDHap9IvfvJ/vYleMFECL/qVw/UsOJc9GCmst +kyw== X-Gm-Message-State: AOJu0Yzg2EiAjFDlChz/aibqF/lQ3nwMy3ZV4rRzBFZ5YrdKEI0jZ07v JiSn1A+Fcs0nGsV0tmXMw+gpDGICvC3C1LKHJNgRu+DCQli5C58oHk/C9VIexV07Vwx/5G8h+6Y cSwHPb3eKoV9AJWmHxJk4O/8Kmj1QiiCGzSZEwUiSTIpekDifGNPDW/D08hVVXikipp2yLgweHd A= X-Received: by 2002:a05:6402:6d4:b0:533:4c67:c911 with SMTP id n20-20020a05640206d400b005334c67c911mr7269537edy.19.1696590872060; Fri, 06 Oct 2023 04:14:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2UaqAZpxVjHRdLXoSSxAISDySWV6mfojDYSRdE2Xkdg3q0nFcnzZSnH8xnPjkHeyFhZrxoA== X-Received: by 2002:a05:6402:6d4:b0:533:4c67:c911 with SMTP id n20-20020a05640206d400b005334c67c911mr7269519edy.19.1696590871653; Fri, 06 Oct 2023 04:14:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/26] accel: Rename accel_softmmu* -> accel_system* Date: Fri, 6 Oct 2023 13:13:56 +0200 Message-ID: <20231006111412.13130-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590917439100003 From: Philippe Mathieu-Daud=C3=A9 Rename accel.softmmu -> accel.system in file paths and the register_types() method. Rename sysemu_stubs_ss -> system_stubs_ss in meson following the pattern used on other source set names. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-7-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- accel/accel-common.c | 2 +- accel/{accel-softmmu.c =3D> accel-system.c} | 6 +++--- accel/{accel-softmmu.h =3D> accel-system.h} | 6 +++--- accel/meson.build | 2 +- accel/stubs/meson.build | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename accel/{accel-softmmu.c =3D> accel-system.c} (96%) rename accel/{accel-softmmu.h =3D> accel-system.h} (77%) diff --git a/accel/accel-common.c b/accel/accel-common.c index df72cc989a9..965318daa36 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -30,7 +30,7 @@ #include "hw/core/accel-cpu.h" =20 #ifndef CONFIG_USER_ONLY -#include "accel-softmmu.h" +#include "accel-system.h" #endif /* !CONFIG_USER_ONLY */ =20 static const TypeInfo accel_type =3D { diff --git a/accel/accel-softmmu.c b/accel/accel-system.c similarity index 96% rename from accel/accel-softmmu.c rename to accel/accel-system.c index 9c804ba9e3b..fa8f43757ce 100644 --- a/accel/accel-softmmu.c +++ b/accel/accel-system.c @@ -28,7 +28,7 @@ #include "hw/boards.h" #include "sysemu/cpus.h" #include "qemu/error-report.h" -#include "accel-softmmu.h" +#include "accel-system.h" =20 int accel_init_machine(AccelState *accel, MachineState *ms) { @@ -99,8 +99,8 @@ static const TypeInfo accel_ops_type_info =3D { .class_size =3D sizeof(AccelOpsClass), }; =20 -static void accel_softmmu_register_types(void) +static void accel_system_register_types(void) { type_register_static(&accel_ops_type_info); } -type_init(accel_softmmu_register_types); +type_init(accel_system_register_types); diff --git a/accel/accel-softmmu.h b/accel/accel-system.h similarity index 77% rename from accel/accel-softmmu.h rename to accel/accel-system.h index 5e192f1882e..d41c62f21b1 100644 --- a/accel/accel-softmmu.h +++ b/accel/accel-system.h @@ -7,9 +7,9 @@ * See the COPYING file in the top-level directory. */ =20 -#ifndef ACCEL_SOFTMMU_H -#define ACCEL_SOFTMMU_H +#ifndef ACCEL_SYSTEM_H +#define ACCEL_SYSTEM_H =20 void accel_init_ops_interfaces(AccelClass *ac); =20 -#endif /* ACCEL_SOFTMMU_H */ +#endif /* ACCEL_SYSTEM_H */ diff --git a/accel/meson.build b/accel/meson.build index 638a9a03ba9..3376810921d 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -1,5 +1,5 @@ specific_ss.add(files('accel-common.c', 'accel-blocker.c')) -system_ss.add(files('accel-softmmu.c')) +system_ss.add(files('accel-system.c')) user_ss.add(files('accel-user.c')) =20 subdir('tcg') diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 6b0f200efe9..91a2d219258 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,6 +1,6 @@ -sysemu_stubs_ss =3D ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +system_stubs_ss =3D ss.source_set() +system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) =20 -specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss) +specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss) --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590992; cv=none; d=zohomail.com; s=zohoarc; b=BbPZomHn/8YOC8L0YrxKGj9i+kRiRpjw9e8oyIFxp8nEhLfz8vGbPyQwpPRrDkQU1Z1748zTfBMdOTT5tXMH2YVmHD+RJLGt4Ly/Fd4tAmwQvNmDvisoXz6l7n6PVV6D6YxEKhdr0afLTAQwTLggS5nFpbbCsbPgKUQKGT1OWp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590992; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0xB3F5N3hazXwUg7/Q8GgLwNzUPETqU4qEAMwqj5k+M=; b=ZMlZPjLQf3zu/z94WG9txLrr/s3+JknzekWqBJCKeR026ourDyREtrhB9yx2ftkXxGkz9sqQQa25U14s9Xf2F2F0msYCzkPxjfPJ/1ZcRWyTjI8xVyBMLZqkY3lgw3Na8Ihs7HzMUlXGirW1xfIWPNkSSZ0XQZekfu3JyCJtnpo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590992006953.8160190579775; Fri, 6 Oct 2023 04:16:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinL-0008Kp-Th; Fri, 06 Oct 2023 07:14:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008FW-Hx for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin5-0000Ji-20 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 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-197-2Crj_WJ2PxyuoYHUr1mevQ-1; Fri, 06 Oct 2023 07:14:36 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-533d8a785a5so1817734a12.3 for ; Fri, 06 Oct 2023 04:14:35 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id g26-20020aa7c59a000000b00530ccd180a3sm2381412edq.97.2023.10.06.04.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590882; 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=0xB3F5N3hazXwUg7/Q8GgLwNzUPETqU4qEAMwqj5k+M=; b=SuBu9ttU5dq0Ph+wjGABb2cLZVYwwSyob7Cd27MyRKFhjf/rdewQq9XMpzJHumm9qYnI2t U7sz9ZYx0hZCe+IE6pjUJUGZPiotljaClxlrs5YKL2Jv2dV3yxwG172V4Y7nw/5nV5v+A2 LZ+xjgeF6/VBurJ7Zxb0HZ3XUMg/p8Q= X-MC-Unique: 2Crj_WJ2PxyuoYHUr1mevQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590874; x=1697195674; 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=0xB3F5N3hazXwUg7/Q8GgLwNzUPETqU4qEAMwqj5k+M=; b=GKST/O/S436lMvepHjvLKEaAD1Wd2ZkfPgF/Nklqy+mQzzSp0IcLNTwz4w4061bJJS p0y6t9WySjZl8c6wUH5bs5pan1wEmNJmylWR+0oNzCMte/QcYgxgillk2bMaatfOs8wk mtL2Q7cF+nOal3+CQ2ks2mR+UlLMm6qE4PAXVC7FT4a+NAB7LJ2PnO7RgS+gRf+O8Lzi jDZOR6IbbCOZ8p6UiW09zjD5pH7uYAHA1tG2yMj5dIj7xPjzGagWXzpCEEHL9hSxqwRj kj6wIaxsz5aTMYhQlt04M91U+VG5TDgPPb4fAH91st4wWvh4uf5/RbqxZLt/4MoCsJZh J8CA== X-Gm-Message-State: AOJu0Yx849KLBMS/no8XZ31AD7za6DUbXqKhz5RuFSaRjpNmuIB73jlz /2PiubMX7KVrY0g274Am1wjjRKgn7sLNQbMb51U/q3TMdGdt8dT/p3UC0svQ0Cz4EkeAQMO/+/f 5mtQVitKTDp5BdfYcKlWUmeVEp895B95CaIzTA5H3cu9UKXt2atR4wPaLDOCrSRgn5XOGZM8ptL Q= X-Received: by 2002:a05:6402:751:b0:532:c41d:1dcd with SMTP id p17-20020a056402075100b00532c41d1dcdmr6173050edy.25.1696590874082; Fri, 06 Oct 2023 04:14:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQl3cpBuyR+tDJqXaffrd8UHliP01AR8i3bOSKryURqFer18J+DBij4rJEkx8lMRHRLRLS9g== X-Received: by 2002:a05:6402:751:b0:532:c41d:1dcd with SMTP id p17-20020a056402075100b00532c41d1dcdmr6173035edy.25.1696590873645; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system' Date: Fri, 6 Oct 2023 13:13:57 +0200 Message-ID: <20231006111412.13130-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590993380100005 From: Philippe Mathieu-Daud=C3=A9 We have gdbstub/user.c for user emulation code, use gdbstub/system.c for system emulation part. Rename s/softmmu/system/ in meson and few comments. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-8-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- gdbstub/internals.h | 4 ++-- gdbstub/meson.build | 10 +++++----- gdbstub/{softmmu.c =3D> system.c} | 2 +- gdbstub/trace-events | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename gdbstub/{softmmu.c =3D> system.c} (99%) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index fee243081ff..f7fd1bede50 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -103,7 +103,7 @@ static inline int tohex(int v) } =20 /* - * Connection helpers for both softmmu and user backends + * Connection helpers for both system and user backends */ =20 void gdb_put_strbuf(void); @@ -229,7 +229,7 @@ void gdb_breakpoint_remove_all(CPUState *cs); * @is_write: is it a write operation * * This function is specialised depending on the mode we are running - * in. For softmmu guests we can switch the interpretation of the + * in. For system guests we can switch the interpretation of the * address to a physical address. */ int gdb_target_memory_rw_debug(CPUState *cs, hwaddr addr, diff --git a/gdbstub/meson.build b/gdbstub/meson.build index a5a1f4e433f..e5bccba34e5 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -1,6 +1,6 @@ # # The main gdbstub still relies on per-build definitions of various -# types. The bits pushed to softmmu/user.c try to use guest agnostic +# types. The bits pushed to system/user.c try to use guest agnostic # types such as hwaddr. # =20 @@ -12,7 +12,7 @@ gdb_system_ss =3D ss.source_set() =20 # We build two versions of gdbstub, one for each mode gdb_user_ss.add(files('gdbstub.c', 'user.c')) -gdb_system_ss.add(files('gdbstub.c', 'softmmu.c')) +gdb_system_ss.add(files('gdbstub.c', 'system.c')) =20 gdb_user_ss =3D gdb_user_ss.apply(config_targetos, strict: false) gdb_system_ss =3D gdb_system_ss.apply(config_targetos, strict: false) @@ -23,15 +23,15 @@ libgdb_user =3D static_library('gdb_user', c_args: '-DCONFIG_USER_ONLY', build_by_default: false) =20 -libgdb_softmmu =3D static_library('gdb_softmmu', +libgdb_system =3D static_library('gdb_system', gdb_system_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) =20 gdb_user =3D declare_dependency(link_whole: libgdb_user) user_ss.add(gdb_user) -gdb_softmmu =3D declare_dependency(link_whole: libgdb_softmmu) -system_ss.add(gdb_softmmu) +gdb_system =3D declare_dependency(link_whole: libgdb_system) +system_ss.add(gdb_system) =20 common_ss.add(files('syscalls.c')) =20 diff --git a/gdbstub/softmmu.c b/gdbstub/system.c similarity index 99% rename from gdbstub/softmmu.c rename to gdbstub/system.c index 9f0b8b54977..189975b1d62 100644 --- a/gdbstub/softmmu.c +++ b/gdbstub/system.c @@ -104,7 +104,7 @@ static void gdb_chr_event(void *opaque, QEMUChrEvent ev= ent) } =20 /* - * In softmmu mode we stop the VM and wait to send the syscall packet + * In system-mode we stop the VM and wait to send the syscall packet * until notification that the CPU has stopped. This must be done * because if the packet is sent now the reply from the syscall * request could be received while the CPU is still in the running diff --git a/gdbstub/trace-events b/gdbstub/trace-events index 7bc79a73c42..4fd126a38c1 100644 --- a/gdbstub/trace-events +++ b/gdbstub/trace-events @@ -28,5 +28,5 @@ gdbstub_err_checksum_invalid(uint8_t ch) "got invalid com= mand checksum digit: 0x gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command= packet with incorrect checksum, expected=3D0x%02x, received=3D0x%02x" gdbstub_err_unexpected_runpkt(uint8_t ch) "unexpected packet (0x%02x) whil= e target running" =20 -# softmmu.c +# system.c gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr= ) "Watchpoint hit, type=3D\"%s\" cpu=3D%d, vaddr=3D0x%" PRIx64 "" --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590971; cv=none; d=zohomail.com; s=zohoarc; b=ei/xUcycwkD44PEzdtADmQFM1rO+kKE9TUIee/QkPlAnkUl59e6EqO0bzDQn8ly6QRvjxIdpfnF8CCBUVmZdutyUXVhTlFzlG5anUBPzVEueucsbSJJZSN0Y9cw1mfD/QvCIncKSIsqjWErHhHdWEFLrVDTxql0ebm5tyDc+T0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590971; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=l4z5x8Uu4dREQUi7wI/K7/deSe5fP0uIUCLyqAJ6KbM=; b=QwoUoonuTyAE8lM0AGkcfT8uT47g1sR0EeAA4KWueIsCIKNeKhMfjZI+5Rdf2uG8RslVwmFzBiwhlxVyBt/+QGbVwYZkNhA6sUhm7Ijr8Z0976ecSifvNUh+d2dKSt//7WZbIbqfspWeFoeE5PFNYf3wFO4QLnPHfM8l0n1rnEE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590971576507.6104193533497; Fri, 6 Oct 2023 04:16:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinH-0008Gx-G7; Fri, 06 Oct 2023 07:14:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008FB-Ep for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin2-0000JC-6X for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:52 -0400 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-437-YR28VF1-Mj-ckhqw0Xu7wg-1; Fri, 06 Oct 2023 07:14:38 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae70250ef5so351018966b.0 for ; Fri, 06 Oct 2023 04:14:37 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id i25-20020a1709064ed900b009b947aacb4bsm2698889ejv.191.2023.10.06.04.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590879; 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=l4z5x8Uu4dREQUi7wI/K7/deSe5fP0uIUCLyqAJ6KbM=; b=b0xSSwFO/t8bMyrQehKcp3hGURqYAJhSTtZkIUUXq+ao1XYIt2rWSC27LJe4ga0ybq84cx 87Z+bxcc2AV//8le+ujxXvDoT1vR4psOmBatRnsx5zyUQ3xL1HouCQe7N1l/9ebFoSA8DL Wb+bo1iMEiZkUZSQFa06NSum4eoLyBg= X-MC-Unique: YR28VF1-Mj-ckhqw0Xu7wg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590876; x=1697195676; 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=l4z5x8Uu4dREQUi7wI/K7/deSe5fP0uIUCLyqAJ6KbM=; b=W645sy8b948Ad+q8rTYOga+U01JGlaz1xCKooWElE7GEGQhrF1Rt6COXbve7Da26Wy e/300fkHKWoMAcBI5OKcbahe0PKgf1XkfE+lI3OucKLltGRSuNTzApM4yiFyzYtecEI1 k6KxkO/NcK6donG6KhYWA87DqOxydyPWeSs41RPxWAvXNEUuBQuCznBhybFNNhUnJ6DD uFrnSaIaJd4wn25DfIAIKdUj1cutLmNzODOF4zDa4/geCEIpGt5gKTXxzzPPp1fP3Jl+ 3de16XogChKqeoKXGv24mLLmFCL7XSKGOiYaoGXCebn4xQYEWWCumOwkePexGBNk2ix8 9X9A== X-Gm-Message-State: AOJu0Yx8IeJNVXcHXUrWrCXz5YRlAzwCmEwy1yXD2oSACV2JeIMzV9xx 1iX5dFGKFxGVPQf6wi4OQ4CJw7NAJ+ab0RH5av259DkCPvkhrXCU33wTtBcbzb0zkpsf9qzI8Y+ l9Xw2QiqTEGUXciVlWEWtou69XJlzlYNSC1uezevWGX3yQ7zru1MQoQ1NSUyntkgi4Z4zPTztx3 c= X-Received: by 2002:a17:906:8455:b0:9a2:1e14:86b9 with SMTP id e21-20020a170906845500b009a21e1486b9mr4230291ejy.0.1696590876239; Fri, 06 Oct 2023 04:14:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHc7VTMooHwElT0J394SoiMCUdgyhX/lrb0nk9OwYbuBrJqUUXSfCQnbOER7z6TGi1M8P84fQ== X-Received: by 2002:a17:906:8455:b0:9a2:1e14:86b9 with SMTP id e21-20020a170906845500b009a21e1486b9mr4230283ejy.0.1696590875920; Fri, 06 Oct 2023 04:14:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/26] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user() Date: Fri, 6 Oct 2023 13:13:58 +0200 Message-ID: <20231006111412.13130-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590981824100004 From: Philippe Mathieu-Daud=C3=A9 Add a check in 'softmmu-uaccess.h' that the header is only include in system emulation, and rename it as 'uaccess.h'. Rename the API methods: - softmmu_[un]lock_user*() -> uaccess_[un]lock_user*() - softmmu_strlen_user() -> uaccess_strlen_user(). Update a pair of comments. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-9-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .../{softmmu-uaccess.h =3D> uaccess.h} | 24 +++++++++++-------- semihosting/arm-compat-semi.c | 4 ++-- semihosting/config.c | 2 +- semihosting/guestfd.c | 2 +- semihosting/syscalls.c | 2 +- semihosting/uaccess.c | 14 +++++------ stubs/semihost.c | 4 ++-- target/m68k/m68k-semi.c | 2 +- target/mips/tcg/sysemu/mips-semi.c | 2 +- target/nios2/nios2-semi.c | 2 +- 10 files changed, 31 insertions(+), 27 deletions(-) rename include/semihosting/{softmmu-uaccess.h =3D> uaccess.h} (75%) diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/ua= ccess.h similarity index 75% rename from include/semihosting/softmmu-uaccess.h rename to include/semihosting/uaccess.h index 4f08dfc0986..3963eafc3e2 100644 --- a/include/semihosting/softmmu-uaccess.h +++ b/include/semihosting/uaccess.h @@ -7,8 +7,12 @@ * This code is licensed under the GPL */ =20 -#ifndef SEMIHOSTING_SOFTMMU_UACCESS_H -#define SEMIHOSTING_SOFTMMU_UACCESS_H +#ifndef SEMIHOSTING_UACCESS_H +#define SEMIHOSTING_UACCESS_H + +#ifdef CONFIG_USER_ONLY +#error Cannot include semihosting/uaccess.h from user emulation +#endif =20 #include "cpu.h" =20 @@ -42,18 +46,18 @@ =20 #define put_user_ual(arg, p) put_user_u32(arg, p) =20 -void *softmmu_lock_user(CPUArchState *env, target_ulong addr, +void *uaccess_lock_user(CPUArchState *env, target_ulong addr, target_ulong len, bool copy); -#define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy) +#define lock_user(type, p, len, copy) uaccess_lock_user(env, p, len, copy) =20 -char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr); -#define lock_user_string(p) softmmu_lock_user_string(env, p) +char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr); +#define lock_user_string(p) uaccess_lock_user_string(env, p) =20 -void softmmu_unlock_user(CPUArchState *env, void *p, +void uaccess_unlock_user(CPUArchState *env, void *p, target_ulong addr, target_ulong len); -#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len) +#define unlock_user(s, args, len) uaccess_unlock_user(env, s, args, len) =20 -ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr); -#define target_strlen(p) softmmu_strlen_user(env, p) +ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr); +#define target_strlen(p) uaccess_strlen_user(env, p) =20 #endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */ diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 564fe17f75c..bb43f012652 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -202,13 +202,13 @@ static LayoutInfo common_semi_find_bases(CPUState *cs) * The semihosting API has no concept of its errno being thread-safe, * as the API design predates SMP CPUs and was intended as a simple * real-hardware set of debug functionality. For QEMU, we make the - * errno be per-thread in linux-user mode; in softmmu it is a simple + * errno be per-thread in linux-user mode; in system-mode it is a simple * global, and we assume that the guest takes care of avoiding any races. */ #ifndef CONFIG_USER_ONLY static target_ulong syscall_err; =20 -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #endif =20 static inline uint32_t get_swi_errno(CPUState *cs) diff --git a/semihosting/config.c b/semihosting/config.c index 8ca569735d0..61e4016fc5f 100644 --- a/semihosting/config.c +++ b/semihosting/config.c @@ -12,7 +12,7 @@ * linux-user targets. However in that use case no configuration of * the outputs and command lines is supported. * - * The config module is common to all softmmu targets however as vl.c + * The config module is common to all system targets however as vl.c * needs to link against the helpers. * * SPDX-License-Identifier: GPL-2.0-or-later diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c index acb86b50ddc..955c2efbd0c 100644 --- a/semihosting/guestfd.c +++ b/semihosting/guestfd.c @@ -15,7 +15,7 @@ #ifdef CONFIG_USER_ONLY #include "qemu.h" #else -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #include CONFIG_DEVICES #endif =20 diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index d27574a1e2b..4060211d196 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -15,7 +15,7 @@ #ifdef CONFIG_USER_ONLY #include "qemu.h" #else -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #endif =20 =20 diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index 7505eb6d1ba..5d889f92638 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -9,9 +9,9 @@ =20 #include "qemu/osdep.h" #include "exec/exec-all.h" -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" =20 -void *softmmu_lock_user(CPUArchState *env, target_ulong addr, +void *uaccess_lock_user(CPUArchState *env, target_ulong addr, target_ulong len, bool copy) { void *p =3D malloc(len); @@ -24,7 +24,7 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong a= ddr, return p; } =20 -ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr) +ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr) { int mmu_idx =3D cpu_mmu_index(env, false); size_t len =3D 0; @@ -72,16 +72,16 @@ ssize_t softmmu_strlen_user(CPUArchState *env, target_u= long addr) } } =20 -char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr) +char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr) { - ssize_t len =3D softmmu_strlen_user(env, addr); + ssize_t len =3D uaccess_strlen_user(env, addr); if (len < 0) { return NULL; } - return softmmu_lock_user(env, addr, len + 1, true); + return uaccess_lock_user(env, addr, len + 1, true); } =20 -void softmmu_unlock_user(CPUArchState *env, void *p, +void uaccess_unlock_user(CPUArchState *env, void *p, target_ulong addr, target_ulong len) { if (len) { diff --git a/stubs/semihost.c b/stubs/semihost.c index aad7a703532..9343d385d79 100644 --- a/stubs/semihost.c +++ b/stubs/semihost.c @@ -1,9 +1,9 @@ /* - * Semihosting Stubs for SoftMMU + * Semihosting Stubs for system emulation * * Copyright (c) 2019 Linaro Ltd * - * Stubs for SoftMMU targets that don't actually do semihosting. + * Stubs for system targets that don't actually do semihosting. * * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 80cd8d70dbb..b4ffb70f8b7 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -27,7 +27,7 @@ #include "gdbstub/syscalls.h" #include "gdbstub/helpers.h" #include "semihosting/syscalls.h" -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #include "hw/boards.h" #include "qemu/log.h" =20 diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mi= ps-semi.c index f3735df7b9e..cc084eb1a24 100644 --- a/target/mips/tcg/sysemu/mips-semi.c +++ b/target/mips/tcg/sysemu/mips-semi.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "gdbstub/syscalls.h" #include "gdbstub/helpers.h" -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #include "semihosting/semihost.h" #include "semihosting/console.h" #include "semihosting/syscalls.h" diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c index 9d0241c758f..0b84fcb6b62 100644 --- a/target/nios2/nios2-semi.c +++ b/target/nios2/nios2-semi.c @@ -26,7 +26,7 @@ #include "gdbstub/syscalls.h" #include "gdbstub/helpers.h" #include "semihosting/syscalls.h" -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #include "qemu/log.h" =20 #define HOSTED_EXIT 0 --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591123; cv=none; d=zohomail.com; s=zohoarc; b=FVyuGCGuAJtXgMkCBHdfaThjoisuEyw8ygzIlW+Zxd3hSeHVaVDLY8rhgvTHHFZ/wVPP7gaND1SdOhf8BGBOCP+qs/dhoncprN+YsnNSsbG6AQoAcGu4sHsU6qTTwvuamTFvg87GUZin60uSmfgVt2+FLzHG6Ioxm4s8bpC27lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591123; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bf5kliQJvODafTBVKI8xhSD2Qcuhj4Z5mREXuzd9NXw=; b=LYNtWRs8cYzRHAu7YJRwXfsBIMcz85fetJg7QMy2ll7e3+W3L8SVTSodEG1MWhyOOwI8zGHzv6yFBXJRniKM7n9nB6dEXx++dqhFf2t7m86fE87YJuYs3ihREwp8jgyF2W6FnDi+3VadxT8fd4sdGqgk3gZLd2xJTQz3Xuv7nXE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591123327467.8456483952731; Fri, 6 Oct 2023 04:18:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinT-00009z-D1; Fri, 06 Oct 2023 07:15:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008FY-I9 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin3-0000JW-W5 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 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-31-U4dNbeNmOtenU8vMa3gZIA-1; Fri, 06 Oct 2023 07:14:39 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9b822f5c156so171494166b.3 for ; Fri, 06 Oct 2023 04:14:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id ss7-20020a170907038700b009a9fbeb15f5sm2668221ejb.46.2023.10.06.04.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590881; 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=Bf5kliQJvODafTBVKI8xhSD2Qcuhj4Z5mREXuzd9NXw=; b=g/eU3R7B6uuoMkDpbpwJGwnJayW16a1zvZA/pTk1k4DUB96GqpXnPoaf6N/uBo+5vdOGLs E+AA37BMdPERcA2xy9DXzT4Oij1IVjiB1DHNhunpvD29KHXXnnUZXAsP5+ArlXS1bnXoL0 95C9l6RJ//Wgk7HMhKXezWZULVje4DE= X-MC-Unique: U4dNbeNmOtenU8vMa3gZIA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590878; x=1697195678; 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=Bf5kliQJvODafTBVKI8xhSD2Qcuhj4Z5mREXuzd9NXw=; b=FQ+YsfRxeTSWVv55INYcKeoS7NJTJKi7/iTKF20eu/CI3MxuTcLqrZ4XlRaNskaqFo vJyQEXqdJbfIxrOLXLy2u7E44zi7WG+1RNSHiNKuVpUhuhj9hwo5c/P1AgaxnMIBMM8W FbEJP5X4Pgx+JIO17CsZTHtsRxu8cj38xVW8+JVigiLycq1zAgchNdLJz4reNVWCVc+U reVlL3hZLFlZYHj+S6m8mcOIJl/QSQSG0VYPV52abYGQuermAMdCaa3yVzfa65rejJ28 6WTxKRF9FPrJewnlixOoN7gKRvm/oemWlQLv2PQi+U7itpFFev2S/QipMUcjhIX9U3Pr LoGA== X-Gm-Message-State: AOJu0YxsOBxLKZYboD82QJW/rcCPt3h66jIP/bn6NmiDiv9en/IOIeGn Y7+QOOhPjoG9NwgHYBfc0nhN0bfXhnVBdab3q/svQEoQcEry8RafzLHUvYtoERM1AxHCsPfiKlr 3wBljNCZTwQK8H7cK9AMoCcW/CMnHZdrSOXlreJNzRd9GhV01BhrTS0X5Optnyygmj4NG8aOKSz 0= X-Received: by 2002:a17:907:75f4:b0:9ae:699d:8a2f with SMTP id jz20-20020a17090775f400b009ae699d8a2fmr7067675ejc.2.1696590878243; Fri, 06 Oct 2023 04:14:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELq7OGp0eREBrquIAUcJHkeKgYLQFZiyzxuAJ+ns9FwnPMToLSkkdORmlo23qaYfU4bi9hKA== X-Received: by 2002:a17:907:75f4:b0:9ae:699d:8a2f with SMTP id jz20-20020a17090775f400b009ae699d8a2fmr7067656ejc.2.1696590877908; Fri, 06 Oct 2023 04:14:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss Date: Fri, 6 Oct 2023 13:13:59 +0200 Message-ID: <20231006111412.13130-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591123989100001 From: Philippe Mathieu-Daud=C3=A9 Software MMU is TCG specific. Here 'softmmu' is misused for system emulation. Anyhow, since KVM is system emulation specific, just rename as 'i386_kvm_ss'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-10-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- target/i386/kvm/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/kvm/meson.build b/target/i386/kvm/meson.build index 5d9174bbb5d..84d9143e602 100644 --- a/target/i386/kvm/meson.build +++ b/target/i386/kvm/meson.build @@ -1,14 +1,14 @@ -i386_softmmu_kvm_ss =3D ss.source_set() +i386_kvm_ss =3D ss.source_set() =20 -i386_softmmu_kvm_ss.add(files( +i386_kvm_ss.add(files( 'kvm.c', 'kvm-cpu.c', )) =20 -i386_softmmu_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c'= )) +i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen-emu.c')) =20 -i386_softmmu_kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c')) +i386_kvm_ss.add(when: 'CONFIG_SEV', if_false: files('sev-stub.c')) =20 i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_f= alse: files('hyperv-stub.c')) =20 -i386_system_ss.add_all(when: 'CONFIG_KVM', if_true: i386_softmmu_kvm_ss) +i386_system_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss) --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591025; cv=none; d=zohomail.com; s=zohoarc; b=Uq23y0JxyZrjBB/9Df1O52eQ1/ILoeSD+UC2912EEQxokM7EP0GuVoXYFTOT848EXLI96euC5m++orPM1Q4prebp5n01yOhryKHE4UY4tyZ4zeMlbEv13xkbG7578CK7Sn4lvJ6xFmj0IPwTELGiK8ZCufjf8+WhEgcbBPRiR7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591025; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=09gHDcSD3eULArN3NZoI14fwVaKeRIz+n+d4TcIpJ3c=; b=I3JsDGi5g94b8G6KwNhRD6qhStzHuiksifWDXRY/c1jBzVp8sgTmGeQ6Qz8r+F4dXPBd+ejigqYVrr/GtctXKX3DzApztORPY88qWIleJrAL+6/Sa0bVxJaL93VVjFBeH9MCJZNhyZxvtzokBGh4howIdj7FMnietUuauGCpImM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591025088155.3046569877897; Fri, 6 Oct 2023 04:17:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinU-0000AT-9L; Fri, 06 Oct 2023 07:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0008Fe-Ii for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoin5-0000Jp-Qa for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:53 -0400 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-122-x47MB7EjMW2D1pskb4GiiQ-1; Fri, 06 Oct 2023 07:14:41 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9b65d7079faso154473166b.1 for ; Fri, 06 Oct 2023 04:14:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id o12-20020a17090637cc00b0099bc80d5575sm2640330ejc.200.2023.10.06.04.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590882; 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=09gHDcSD3eULArN3NZoI14fwVaKeRIz+n+d4TcIpJ3c=; b=SKJUT7Vzh4xUNk6LHiWVcWbWlCVqDc5HcEnBp70eqp1KrUv029bcYJJwj+KbuTdEEzgodV nyhNrtSF53iD0datAMhqpXHkzdKirvT6e5E/yv9lcuDf5AK5PeQmAWfDpMQj78/Pir8GMP dyyV3aLtYujRKbSednvmz6NyVoThzZc= X-MC-Unique: x47MB7EjMW2D1pskb4GiiQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590879; x=1697195679; 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=09gHDcSD3eULArN3NZoI14fwVaKeRIz+n+d4TcIpJ3c=; b=JHEtxnkg4+jmcV+9IaCarSERZsSsWwf1xDkMrdW3N1atNUBYvuUY13xdzyzKAoPzg0 EnTSG9yPhuZb95N3gWeQMyVMwk7dcd4qQB2E075F0pO+q1M97kBY+7uitB3ZuOHEjP46 wzr5M+GFolfW8T3RBDR8q8M+VTRJuyizijpYqYc9CpVSUA29jhJQSawYkYBn/JICfIYV WNgm3NxXZY45YpOkqufYaXa4C8PcsY4+Jd83i7DSLXXa3nAQVK0Uyjlw6vYxVPuQPSYW qpokgPItWbDuPGdzt1mApMkqNAPzXPZ7r94vsqJ/iYtPOYRXsHy6wFK44e1i9UTpJMoU LJ7w== X-Gm-Message-State: AOJu0YwRvMqV8B2MFaThf78ecAnDgLLYc+HiYX+DVTW2UnoRErgnYQ6T QgpgXkEgrH+sRhDRF5EZieWLow8G50LFpYX6i/FoHwMxnwM9NzMubbLTtzYHXcUETlFVRqV07Gf HERdxtkOieIB5j1gUldgGg8+V7oRkSqXQ0jtGfjk3o3AyQkY07prTLnMgNPhy0QcWKn1UAVxk/P k= X-Received: by 2002:a17:906:7695:b0:9a9:f042:dec0 with SMTP id o21-20020a170906769500b009a9f042dec0mr7678385ejm.38.1696590879664; Fri, 06 Oct 2023 04:14:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAmyvXar3xi+4IQR21rk/zDPhd+IrilKSf1QJQpqIaicRP5AUmlmuYSc9XkeO4LBu2MWWXew== X-Received: by 2002:a17:906:7695:b0:9a9:f042:dec0 with SMTP id o21-20020a170906769500b009a9f042dec0mr7678371ejm.38.1696590879332; Fri, 06 Oct 2023 04:14:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/26] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss Date: Fri, 6 Oct 2023 13:14:00 +0200 Message-ID: <20231006111412.13130-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591026070100003 From: Philippe Mathieu-Daud=C3=A9 See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss") for rationale. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-11-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- hw/virtio/meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 13e7c6c272b..aad506fe521 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -1,18 +1,18 @@ -softmmu_virtio_ss =3D ss.source_set() -softmmu_virtio_ss.add(files('virtio-bus.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pc= i.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-m= mio.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio= -crypto.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('v= host-vsock-common.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-= iommu.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-= dev.c')) +system_virtio_ss =3D ss.source_set() +system_virtio_ss.add(files('virtio-bus.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci= .c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mm= io.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-= crypto.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('vh= ost-vsock-common.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-i= ommu.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-d= ev.c')) =20 specific_virtio_ss =3D ss.source_set() specific_virtio_ss.add(files('virtio.c')) specific_virtio_ss.add(files('virtio-config-io.c', 'virtio-qmp.c')) =20 if have_vhost - softmmu_virtio_ss.add(files('vhost.c')) + system_virtio_ss.add(files('vhost.c')) specific_virtio_ss.add(files('vhost-backend.c', 'vhost-iova-tree.c')) if have_vhost_user specific_virtio_ss.add(files('vhost-user.c')) @@ -21,7 +21,7 @@ if have_vhost specific_virtio_ss.add(files('vhost-vdpa.c', 'vhost-shadow-virtqueue.c= ')) endif else - softmmu_virtio_ss.add(files('vhost-stub.c')) + system_virtio_ss.add(files('vhost-stub.c')) endif =20 specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virt= io-balloon.c')) @@ -67,7 +67,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: file= s('virtio-md-pci.c')) =20 specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_= ss) =20 -system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss) +system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591108; cv=none; d=zohomail.com; s=zohoarc; b=GtGoCRIw56T2VxlCocYjylxWWUowPtNb/HvgLqjzxCG7rCyK9N7u1dluHngjTdJMkBvW6qQwhaN73qOVlLrrW2B4G80JHjsyuYrDLpit1uclUM2wQtaKj/SoQCEmWi8CTZ7BoDcq0nB20Vyq9Cchc3seTPq3WxwVkmKSjwRL2Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591108; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mCVCUOq7aVspI9V9Yn5TanbFRt42+uPiRwJWugQqYU4=; b=HgWqObft9zwz/H3i0cunKBC7MlBYNptWrmTXVZZzMz0k7OVRpR0uQNCVBQ8FSrG/o5AMW+1lzKa89PqstUq3IYHtpHEp9RR5vZp1uOMwjh4YfzvoToupvnb6kRz/TMWC85066BtMOrN1JkxCNLWjjVA2I/w2f70iSPCWTBvkFN8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591108711168.1151810582105; Fri, 6 Oct 2023 04:18:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinR-0008SZ-1f; Fri, 06 Oct 2023 07:15:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinO-0008Pc-3M for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinM-0000NP-8r for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:01 -0400 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-522-WoaR15IgMMSlSMQck1vimA-1; Fri, 06 Oct 2023 07:14:43 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-99c8bbc902eso169931066b.1 for ; Fri, 06 Oct 2023 04:14:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id kb4-20020a1709070f8400b009adc81bb544sm2691932ejc.106.2023.10.06.04.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590899; 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=mCVCUOq7aVspI9V9Yn5TanbFRt42+uPiRwJWugQqYU4=; b=LbUq93gSpIjDT8oIKIj7QqovCO9heHKrHkfx2g9K88i91dD3oA5RkdXE6wI2apllg9mbTD UCMXhvne9ryDLEJRMlvNzR45Rclw0aE+otp+CLAdb0FCUjgMBS5So4a8xGuP6T29P8zcc6 TSsk+YcUv00PrM6a+u248KO0ULr7/2Y= X-MC-Unique: WoaR15IgMMSlSMQck1vimA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590881; x=1697195681; 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=mCVCUOq7aVspI9V9Yn5TanbFRt42+uPiRwJWugQqYU4=; b=JEdwZxa5ssVWoQnwniK3K3gxTSFIFAGoUNBZFAy0NuIFAYxUUE69xa7K1YTVG1WQE3 ieKepamokPLN64qctYWJu6lg010iCoBm3NOIyWPZSm+2EdiIdOg1CcFgzqEq4HK4i1c5 Qj3iA93betEYVk/NqMa4t6sWk79tt8F08LY45VeK7BaJtTw8tQF+DhFR2VkAtFHxd8nm YjB5EUb2qCtIr6MvVcBl/1wdlhmJxLZ5+8TSH0jVfD6ZE1ITC4HZfz51+3SHqM9uGSt2 wx4yQMqddi+yuihkG9FljTpUkqq/AeYDxfeU5ktpd1QhRKx/v2SO+3Qi7gDIWPz6lKFJ j8NA== X-Gm-Message-State: AOJu0YwMhozCH66jkbeqqvan3jQigEJ3qIeleoK0Dz8re/6tNJucLjiE oJK9eWj6PiqWdO0SsYiP7xR/hRzUn4bMtMGD9dU9sWbwhzwwf5YfsjFHqfcp7nEVvLwF03SQte/ zAEWjXwkc1aWnEEU1HDZlEihZkEPON9CAS72I9lX08WS4bFwpgUiGmRBunidBwO8yQlE8Nmkaze c= X-Received: by 2002:a17:907:2722:b0:9b2:7f8c:ac09 with SMTP id d2-20020a170907272200b009b27f8cac09mr6995109ejl.6.1696590881680; Fri, 06 Oct 2023 04:14:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpOVyhkTOWqQez/VSu34+iTjT2i9mDiBNp2WvXyPjAAmFiQLXs868LfuivVJon/rmqJuwzSQ== X-Received: by 2002:a17:907:2722:b0:9b2:7f8c:ac09 with SMTP id d2-20020a170907272200b009b27f8cac09mr6995098ejl.6.1696590881359; Fri, 06 Oct 2023 04:14:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 15/26] meson: Rename softmmu_mods -> system_mods Date: Fri, 6 Oct 2023 13:14:01 +0200 Message-ID: <20231006111412.13130-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591109596100005 From: Philippe Mathieu-Daud=C3=A9 See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss") for rationale. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-12-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 21a1bc03f87..8890dc57480 100644 --- a/meson.build +++ b/meson.build @@ -3496,7 +3496,7 @@ modinfo_generate =3D find_program('scripts/modinfo-ge= nerate.py') modinfo_files =3D [] =20 block_mods =3D [] -softmmu_mods =3D [] +system_mods =3D [] foreach d, list : modules if not (d =3D=3D 'block' ? have_block : have_system) continue @@ -3510,7 +3510,7 @@ foreach d, list : modules if d =3D=3D 'block' block_mods +=3D sl else - softmmu_mods +=3D sl + system_mods +=3D sl endif if module_ss.sources() !=3D [] # FIXME: Should use sl.extract_all_objects(recursive: true) as @@ -3554,7 +3554,7 @@ foreach d, list : target_modules include_directories: target_inc, c_args: c_args, pic: true) - softmmu_mods +=3D sl + system_mods +=3D sl # FIXME: Should use sl.extract_all_objects(recursive: true) to= o. modinfo_files +=3D custom_target(module_name + '.modinfo', output: module_name + '.modinfo= ', @@ -3597,7 +3597,7 @@ block_syms =3D custom_target('block.syms', output: 'b= lock.syms', capture: true, command: [undefsym, nm, '@INPUT@']) qemu_syms =3D custom_target('qemu.syms', output: 'qemu.syms', - input: [libqemuutil, softmmu_mods], + input: [libqemuutil, system_mods], capture: true, command: [undefsym, nm, '@INPUT@']) =20 @@ -3682,7 +3682,7 @@ common_ss.add(hwcore) ########### =20 emulator_modules =3D [] -foreach m : block_mods + softmmu_mods +foreach m : block_mods + system_mods emulator_modules +=3D shared_module(m.name(), build_by_default: true, name_prefix: '', --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590972; cv=none; d=zohomail.com; s=zohoarc; b=UEedZJBAwq22rCY4lyhV7OYnjyAQ+sZz0+YUYwXyGAnR5onNBmJURswTjB3w7E/cNti7Ci+mFwvwLRT4XKQxrQW+qmxNIquijQhFnXrJ+OU8D+AXXzDT+8PyCPJ6OqtjM4Yuqzy3If8qlZ3uzui1+Xv9aZfjOAkYl95/RaAOhN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590972; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rOiT5Haq07zJc+LpYrAi9F7AEAvUR4uyjglw1xzimeg=; b=GNNwbVPIylf0b/ucaobVAfGlHmkFdCdOq92M26d5Ma+hOixWlzlPLTHqjDBe682Ai+Blp9HE/nnnukCfmZAQzeFRdAqOpR+r8A/NLHdjYS8kbh8FzwGf5PW+nAbQEeG6SjdYtT3qr0e9NrwoqM2sPHWgX4MeNbOQvN7YjPJoDqA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590972071121.0276386214448; Fri, 6 Oct 2023 04:16:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinK-0008Hj-LL; Fri, 06 Oct 2023 07:14:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinH-0008Gv-AP for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinE-0000KI-AV for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:54 -0400 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-349-f6Vrja-GO-qR6u1qiAe3rQ-1; Fri, 06 Oct 2023 07:14:45 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-537fb536554so1818298a12.2 for ; Fri, 06 Oct 2023 04:14:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id v4-20020aa7d9c4000000b0052284228e3bsm2420488eds.8.2023.10.06.04.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590886; 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=rOiT5Haq07zJc+LpYrAi9F7AEAvUR4uyjglw1xzimeg=; b=XU7snQf+5aDIhCStXwwkQQW3jRz9iahYR0a25vA72kxpriq65LoAeTWSZv4qKfY+503v2L LsyVg/PGdBN90zWYMPV5AE7vBgd74nnyB2f6nIScr4OYYVFMX4YZ+OR0bkZsGsoVQG44zE fxQQeyUpHN7NIDAOKm5GpnSx1puLQU8= X-MC-Unique: f6Vrja-GO-qR6u1qiAe3rQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590884; x=1697195684; 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=rOiT5Haq07zJc+LpYrAi9F7AEAvUR4uyjglw1xzimeg=; b=sqFumtIhuIEAVyjA0zrGAFgK82rOmJDi7l1ION+G7IQn5hx3o46dGGoKkt1SWB8sox O6NWdaK0v5tABNap7yzV5B2XE3G+5HeSU3yRc9xpH2yu1E5/Z7EaCswj+wp5kYvmXvP7 uGBXZQCOna1eZQPZ+jCO7vWq3yRhqHQvO9QHLS75yFjc1FMsQElU8XoiWb4a5XbNVg7W WN7f7bXVI2m28iwX0uxZlLrxv0Jns8whwmQKNkvjshzYTMZuF2o5YhqXrHw8daKPtmH5 f44sIed8TrCRHJhYspgK9ARErXm2TdmzcGW7MUrqHZc5rvpj5qYYkZ1a0El0/VnSQIu0 iuyw== X-Gm-Message-State: AOJu0YyLrOfL4jQGjA+aEY1tdYDH/vlnwst7VHDpg3dSJ9eR9e5B2bQm +F/M9jJV4xdDeuOojEdjslzU0112nWchgyCf1+XqGK2I+HeYA3N2VxEokzjdbC3fvQ54sB5Iv6H QPvlmVyRs/vxn+ZIt03PJ+uK4d2ZDKs9cGBd8zlkCjYL9Qk4fTk4j74h9FitME8xzyGVB6HI9Wo U= X-Received: by 2002:a05:6402:b0f:b0:536:aead:3486 with SMTP id bm15-20020a0564020b0f00b00536aead3486mr5798411edb.40.1696590883757; Fri, 06 Oct 2023 04:14:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwQ3d5bB2JDGDNngn5p9yKYPsBzbxZuqp6aAvHKOIj0gcXcEQ9442Zb3yEa1mKmiFkwOL4Vg== X-Received: by 2002:a05:6402:b0f:b0:536:aead:3486 with SMTP id bm15-20020a0564020b0f00b00536aead3486mr5798401edb.40.1696590883456; Fri, 06 Oct 2023 04:14:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch Date: Fri, 6 Oct 2023 13:14:02 +0200 Message-ID: <20231006111412.13130-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590982095100006 From: Philippe Mathieu-Daud=C3=A9 Finish the convertion started with commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss"). If the $target_type is 'system', then use the target_system_arch[] source set :) Mechanical change doing: $ sed -i -e s/target_softmmu_arch/target_system_arch/g \ $(git grep -l target_softmmu_arch) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-13-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 4 ++-- meson.build | 4 ++-- target/alpha/meson.build | 2 +- target/arm/meson.build | 2 +- target/avr/meson.build | 2 +- target/cris/meson.build | 2 +- target/hppa/meson.build | 2 +- target/i386/meson.build | 2 +- target/loongarch/meson.build | 2 +- target/m68k/meson.build | 2 +- target/microblaze/meson.build | 2 +- target/mips/meson.build | 2 +- target/nios2/meson.build | 2 +- target/openrisc/meson.build | 2 +- target/ppc/meson.build | 2 +- target/riscv/meson.build | 2 +- target/rx/meson.build | 2 +- target/s390x/meson.build | 2 +- target/sh4/meson.build | 2 +- target/sparc/meson.build | 2 +- target/tricore/meson.build | 2 +- target/xtensa/meson.build | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 0f990bb3e90..21f78da7d1d 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -225,14 +225,14 @@ Target-dependent emulator sourcesets: The sourceset is only used for system emulators. =20 Each subdirectory in ``target/`` instead should add one sourceset to each - of the ``target_arch`` and ``target_softmmu_arch``, which are used respe= ctively + of the ``target_arch`` and ``target_system_arch``, which are used respec= tively for all emulators and for system emulators only. For example:: =20 arm_ss =3D ss.source_set() arm_system_ss =3D ss.source_set() ... target_arch +=3D {'arm': arm_ss} - target_softmmu_arch +=3D {'arm': arm_system_ss} + target_system_arch +=3D {'arm': arm_system_ss} =20 Module sourcesets: There are two dictionaries for modules: ``modules`` is used for diff --git a/meson.build b/meson.build index 8890dc57480..497a85eb9fe 100644 --- a/meson.build +++ b/meson.build @@ -3214,7 +3214,7 @@ modules =3D {} target_modules =3D {} hw_arch =3D {} target_arch =3D {} -target_softmmu_arch =3D {} +target_system_arch =3D {} target_user_arch =3D {} =20 ############### @@ -3734,7 +3734,7 @@ foreach target : target_dirs endif if target.endswith('-softmmu') target_type=3D'system' - t =3D target_softmmu_arch[target_base_arch].apply(config_target, stric= t: false) + t =3D target_system_arch[target_base_arch].apply(config_target, strict= : false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 diff --git a/target/alpha/meson.build b/target/alpha/meson.build index 3f5253c0027..d3502dd823f 100644 --- a/target/alpha/meson.build +++ b/target/alpha/meson.build @@ -15,4 +15,4 @@ alpha_system_ss =3D ss.source_set() alpha_system_ss.add(files('machine.c')) =20 target_arch +=3D {'alpha': alpha_ss} -target_softmmu_arch +=3D {'alpha': alpha_system_ss} +target_system_arch +=3D {'alpha': alpha_system_ss} diff --git a/target/arm/meson.build b/target/arm/meson.build index e645e456da4..5d04a8e94f2 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -35,4 +35,4 @@ else endif =20 target_arch +=3D {'arm': arm_ss} -target_softmmu_arch +=3D {'arm': arm_system_ss} +target_system_arch +=3D {'arm': arm_system_ss} diff --git a/target/avr/meson.build b/target/avr/meson.build index a24cf6d26de..3e172bde1ce 100644 --- a/target/avr/meson.build +++ b/target/avr/meson.build @@ -17,4 +17,4 @@ avr_ss.add(files( avr_system_ss.add(files('machine.c')) =20 target_arch +=3D {'avr': avr_ss} -target_softmmu_arch +=3D {'avr': avr_system_ss} +target_system_arch +=3D {'avr': avr_system_ss} diff --git a/target/cris/meson.build b/target/cris/meson.build index 07dc3a5682f..bbfcdf7f7a3 100644 --- a/target/cris/meson.build +++ b/target/cris/meson.build @@ -14,4 +14,4 @@ cris_system_ss.add(files( )) =20 target_arch +=3D {'cris': cris_ss} -target_softmmu_arch +=3D {'cris': cris_system_ss} +target_system_arch +=3D {'cris': cris_system_ss} diff --git a/target/hppa/meson.build b/target/hppa/meson.build index 59b68e82e2b..f47e54f5fa9 100644 --- a/target/hppa/meson.build +++ b/target/hppa/meson.build @@ -20,4 +20,4 @@ hppa_system_ss.add(files( )) =20 target_arch +=3D {'hppa': hppa_ss} -target_softmmu_arch +=3D {'hppa': hppa_system_ss} +target_system_arch +=3D {'hppa': hppa_system_ss} diff --git a/target/i386/meson.build b/target/i386/meson.build index 6f1036d4699..7c74bfa8591 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -31,5 +31,5 @@ subdir('hvf') subdir('tcg') =20 target_arch +=3D {'i386': i386_ss} -target_softmmu_arch +=3D {'i386': i386_system_ss} +target_system_arch +=3D {'i386': i386_system_ss} target_user_arch +=3D {'i386': i386_user_ss} diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build index 7fbf045a5d2..18e8191e2b6 100644 --- a/target/loongarch/meson.build +++ b/target/loongarch/meson.build @@ -30,4 +30,4 @@ common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [fil= es('disas.c'), gen]) loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss]) =20 target_arch +=3D {'loongarch': loongarch_ss} -target_softmmu_arch +=3D {'loongarch': loongarch_system_ss} +target_system_arch +=3D {'loongarch': loongarch_system_ss} diff --git a/target/m68k/meson.build b/target/m68k/meson.build index 355db26c6f5..8d3f9ce2880 100644 --- a/target/m68k/meson.build +++ b/target/m68k/meson.build @@ -16,4 +16,4 @@ m68k_system_ss.add(files( )) =20 target_arch +=3D {'m68k': m68k_ss} -target_softmmu_arch +=3D {'m68k': m68k_system_ss} +target_system_arch +=3D {'m68k': m68k_system_ss} diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index 50fd9ff378d..3ed4fbb67a7 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -17,4 +17,4 @@ microblaze_system_ss.add(files( )) =20 target_arch +=3D {'microblaze': microblaze_ss} -target_softmmu_arch +=3D {'microblaze': microblaze_system_ss} +target_system_arch +=3D {'microblaze': microblaze_system_ss} diff --git a/target/mips/meson.build b/target/mips/meson.build index f35e8f0ecad..e57ef24ecf4 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -19,5 +19,5 @@ endif mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) =20 target_arch +=3D {'mips': mips_ss} -target_softmmu_arch +=3D {'mips': mips_system_ss} +target_system_arch +=3D {'mips': mips_system_ss} target_user_arch +=3D {'mips': mips_user_ss} diff --git a/target/nios2/meson.build b/target/nios2/meson.build index 8f0f9dc6289..12d8abf0bd2 100644 --- a/target/nios2/meson.build +++ b/target/nios2/meson.build @@ -14,4 +14,4 @@ nios2_system_ss.add(files( )) =20 target_arch +=3D {'nios2': nios2_ss} -target_softmmu_arch +=3D {'nios2': nios2_system_ss} +target_system_arch +=3D {'nios2': nios2_system_ss} diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build index c1cd943f78f..31608b6dc7f 100644 --- a/target/openrisc/meson.build +++ b/target/openrisc/meson.build @@ -22,4 +22,4 @@ openrisc_system_ss.add(files( )) =20 target_arch +=3D {'openrisc': openrisc_ss} -target_softmmu_arch +=3D {'openrisc': openrisc_system_ss} +target_system_arch +=3D {'openrisc': openrisc_system_ss} diff --git a/target/ppc/meson.build b/target/ppc/meson.build index 4c2635039e3..97ceb6e7c00 100644 --- a/target/ppc/meson.build +++ b/target/ppc/meson.build @@ -55,4 +55,4 @@ ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files( )) =20 target_arch +=3D {'ppc': ppc_ss} -target_softmmu_arch +=3D {'ppc': ppc_system_ss} +target_system_arch +=3D {'ppc': ppc_system_ss} diff --git a/target/riscv/meson.build b/target/riscv/meson.build index 660078bda1f..ff60b21d048 100644 --- a/target/riscv/meson.build +++ b/target/riscv/meson.build @@ -39,4 +39,4 @@ riscv_system_ss.add(files( )) =20 target_arch +=3D {'riscv': riscv_ss} -target_softmmu_arch +=3D {'riscv': riscv_system_ss} +target_system_arch +=3D {'riscv': riscv_system_ss} diff --git a/target/rx/meson.build b/target/rx/meson.build index 8de0ad49b9b..d196737ce33 100644 --- a/target/rx/meson.build +++ b/target/rx/meson.build @@ -13,4 +13,4 @@ rx_ss.add(files( 'disas.c')) =20 target_arch +=3D {'rx': rx_ss} -target_softmmu_arch +=3D {'rx': ss.source_set()} +target_system_arch +=3D {'rx': ss.source_set()} diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 42ed38942a0..02ca43d9f00 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -40,5 +40,5 @@ subdir('tcg') subdir('kvm') =20 target_arch +=3D {'s390x': s390x_ss} -target_softmmu_arch +=3D {'s390x': s390x_system_ss} +target_system_arch +=3D {'s390x': s390x_system_ss} target_user_arch +=3D {'s390x': s390x_user_ss} diff --git a/target/sh4/meson.build b/target/sh4/meson.build index a78e9ec7e4e..fe09f96684b 100644 --- a/target/sh4/meson.build +++ b/target/sh4/meson.build @@ -11,4 +11,4 @@ sh4_system_ss =3D ss.source_set() sh4_system_ss.add(files('monitor.c')) =20 target_arch +=3D {'sh4': sh4_ss} -target_softmmu_arch +=3D {'sh4': sh4_system_ss} +target_system_arch +=3D {'sh4': sh4_system_ss} diff --git a/target/sparc/meson.build b/target/sparc/meson.build index d32e67b287e..48025cce762 100644 --- a/target/sparc/meson.build +++ b/target/sparc/meson.build @@ -20,4 +20,4 @@ sparc_system_ss.add(files( )) =20 target_arch +=3D {'sparc': sparc_ss} -target_softmmu_arch +=3D {'sparc': sparc_system_ss} +target_system_arch +=3D {'sparc': sparc_system_ss} diff --git a/target/tricore/meson.build b/target/tricore/meson.build index 34825b60481..45f49f01288 100644 --- a/target/tricore/meson.build +++ b/target/tricore/meson.build @@ -12,4 +12,4 @@ tricore_ss.add(zlib) tricore_system_ss =3D ss.source_set() =20 target_arch +=3D {'tricore': tricore_ss} -target_softmmu_arch +=3D {'tricore': tricore_system_ss} +target_system_arch +=3D {'tricore': tricore_system_ss} diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build index 95692bd75fd..f8d60101e3d 100644 --- a/target/xtensa/meson.build +++ b/target/xtensa/meson.build @@ -24,4 +24,4 @@ xtensa_system_ss.add(files( )) =20 target_arch +=3D {'xtensa': xtensa_ss} -target_softmmu_arch +=3D {'xtensa': xtensa_system_ss} +target_system_arch +=3D {'xtensa': xtensa_system_ss} --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591074; cv=none; d=zohomail.com; s=zohoarc; b=EA6OEPfQDF45iPsxaFRih5aIE/c8x7Jj1lG36SDJ8Rsv1bfi4z0rkhSgFQusM1uHwlYe6yfZWpDVSxES4i71czaNRK9ba2AX8WWusSf0RHl7UzwSMTxWC3gBPdMUagiEH4n4AaF7SJwrrM4WZqw2Qnqu4OwarfWtdaikSig49HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591074; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vsnRu0/snRmTWvMZqVelQZHrk/C+c4xwiiTtA7NLmt8=; b=T0Jym6tdZBQ4jluNLTmU0SGhKX5xPvp4LVPQLpd2QaH0aMHPkm0pJ6c1aV4euhb3ebHUBoBi70uCFpN6UeBiRcZyte2JJuKTq/kHv2Lxq4bMaENkDOaBhn/VphIH7WLjgGB3u7u/Eb53CGq3kVQUl/M1P3X+URblpgejHoTf3MI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591074141157.74625528349554; Fri, 6 Oct 2023 04:17:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinO-0008Mv-8Z; Fri, 06 Oct 2023 07:15:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinH-0008H9-Mt for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinE-0000Kj-AX for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:55 -0400 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-619-0yrRa9PmPuSgGs1L_Z6I6w-1; Fri, 06 Oct 2023 07:14:48 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-537a183caa3so1819921a12.1 for ; Fri, 06 Oct 2023 04:14:48 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id l18-20020a056402029200b0053443c8fd90sm2421124edv.24.2023.10.06.04.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590890; 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=vsnRu0/snRmTWvMZqVelQZHrk/C+c4xwiiTtA7NLmt8=; b=BBNQml+M01Td4fz38/H/l2PPv03Y9p/pKprfE+DPQGA63LPnBhRpOOdAiAIBABZ9Pav2QL zQajII2EXYmH1KVH79MMuf6z6YYwcUk5yuHQuXTZvync+7HxZAK9ydQI4HpJuKuDVELFaW iPWsW+V5fOBHswuFNH3+2GnEWmRVZ7I= X-MC-Unique: 0yrRa9PmPuSgGs1L_Z6I6w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590886; x=1697195686; 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=vsnRu0/snRmTWvMZqVelQZHrk/C+c4xwiiTtA7NLmt8=; b=ENxHcsgJeXANWfrxkvB2B9NxewGkaT37ugr2N2fCpZekvuBa1ZfxsMizhvpfi++eK7 tr72ippFhL2MHaKl12gsyGKVnUod9bE4g/EkqMsp/fCmAOW/r1A6lUpOnslFXgZQBCf0 S2yDo3gjuP6FUJLUZRN2I6GoijVOjrzRZvMFVJ3V1iXUJrmhYJuDtRhoFInaDNM/Cl0P Hg9zsvhcXqn4AbAlfASNsdH41Xz6xjgGb8soTUin0JqHyChJlxH/Ak4PscJi1pMZUaLS 9+aQM/gMeg4miD8zbcxpWZ2AYc4wURSS2oqyZnXKC6N5g1DQ0SVktQMNYbcGjl38LBtf rq4Q== X-Gm-Message-State: AOJu0Yzam1teZn9KOpFyHjDcRtgJKkyNu87uFQddRes3h+yTa4LMNVSc VAVMVGSkBBCfN7jbkreDG8u+gMuVpDXX+BBcN6VQdIWrxZR9Wm1QQprEJUMyWRiwTWLPfhnVeCY ogEo9su80BjjtI5uFkVRe481hNn3Z1SL38HNnCkmybz9DzTSR166GYl/8U2wZLEcs/DpSqTusVO s= X-Received: by 2002:a05:6402:344a:b0:531:5126:cd5e with SMTP id l10-20020a056402344a00b005315126cd5emr7146014edc.34.1696590885994; Fri, 06 Oct 2023 04:14:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJIOVMhd8G3u4ehwfZEWCxCk12z/elvOyRZCSDOPLDkbRdpCxi2k9HCet14JFvrx/yKMpuBA== X-Received: by 2002:a05:6402:344a:b0:531:5126:cd5e with SMTP id l10-20020a056402344a00b005315126cd5emr7145993edc.34.1696590885556; Fri, 06 Oct 2023 04:14:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 17/26] system: Rename softmmu/ directory as system/ Date: Fri, 6 Oct 2023 13:14:03 +0200 Message-ID: <20231006111412.13130-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591075257100007 From: Philippe Mathieu-Daud=C3=A9 The softmmu/ directory contains files specific to system emulation. Rename it as system/. Update meson rules, the MAINTAINERS file and all the documentation and comments. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231004090629.37473-14-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- MAINTAINERS | 44 ++++++++++++------------- docs/devel/qtest.rst | 2 +- include/sysemu/runstate-action.h | 2 +- meson.build | 8 ++--- scripts/checkpatch.pl | 2 +- scripts/coverity-scan/COMPONENTS.md | 2 +- scripts/get_maintainer.pl | 2 +- scripts/oss-fuzz/build.sh | 6 ++-- softmmu/trace.h | 1 - {softmmu =3D> system}/arch_init.c | 0 {softmmu =3D> system}/async-teardown.c | 0 {softmmu =3D> system}/balloon.c | 0 {softmmu =3D> system}/bootdevice.c | 0 {softmmu =3D> system}/cpu-throttle.c | 0 {softmmu =3D> system}/cpu-timers.c | 0 {softmmu =3D> system}/cpus.c | 0 {softmmu =3D> system}/datadir.c | 0 {softmmu =3D> system}/device_tree.c | 0 {softmmu =3D> system}/dirtylimit.c | 0 {softmmu =3D> system}/dma-helpers.c | 0 {softmmu =3D> system}/globals.c | 0 {softmmu =3D> system}/icount.c | 0 {softmmu =3D> system}/ioport.c | 0 {softmmu =3D> system}/main.c | 0 {softmmu =3D> system}/memory.c | 0 {softmmu =3D> system}/memory_mapping.c | 0 {softmmu =3D> system}/meson.build | 0 {softmmu =3D> system}/physmem.c | 6 ++-- {softmmu =3D> system}/qdev-monitor.c | 0 {softmmu =3D> system}/qemu-seccomp.c | 0 {softmmu =3D> system}/qtest.c | 0 {softmmu =3D> system}/rtc.c | 0 {softmmu =3D> system}/runstate-action.c | 0 {softmmu =3D> system}/runstate-hmp-cmds.c | 0 {softmmu =3D> system}/runstate.c | 0 {softmmu =3D> system}/timers-state.h | 0 {softmmu =3D> system}/tpm-hmp-cmds.c | 0 {softmmu =3D> system}/tpm.c | 0 {softmmu =3D> system}/trace-events | 0 system/trace.h | 1 + {softmmu =3D> system}/vl.c | 0 {softmmu =3D> system}/watchpoint.c | 0 tests/unit/meson.build | 2 +- 43 files changed, 40 insertions(+), 38 deletions(-) delete mode 100644 softmmu/trace.h rename {softmmu =3D> system}/arch_init.c (100%) rename {softmmu =3D> system}/async-teardown.c (100%) rename {softmmu =3D> system}/balloon.c (100%) rename {softmmu =3D> system}/bootdevice.c (100%) rename {softmmu =3D> system}/cpu-throttle.c (100%) rename {softmmu =3D> system}/cpu-timers.c (100%) rename {softmmu =3D> system}/cpus.c (100%) rename {softmmu =3D> system}/datadir.c (100%) rename {softmmu =3D> system}/device_tree.c (100%) rename {softmmu =3D> system}/dirtylimit.c (100%) rename {softmmu =3D> system}/dma-helpers.c (100%) rename {softmmu =3D> system}/globals.c (100%) rename {softmmu =3D> system}/icount.c (100%) rename {softmmu =3D> system}/ioport.c (100%) rename {softmmu =3D> system}/main.c (100%) rename {softmmu =3D> system}/memory.c (100%) rename {softmmu =3D> system}/memory_mapping.c (100%) rename {softmmu =3D> system}/meson.build (100%) rename {softmmu =3D> system}/physmem.c (99%) rename {softmmu =3D> system}/qdev-monitor.c (100%) rename {softmmu =3D> system}/qemu-seccomp.c (100%) rename {softmmu =3D> system}/qtest.c (100%) rename {softmmu =3D> system}/rtc.c (100%) rename {softmmu =3D> system}/runstate-action.c (100%) rename {softmmu =3D> system}/runstate-hmp-cmds.c (100%) rename {softmmu =3D> system}/runstate.c (100%) rename {softmmu =3D> system}/timers-state.h (100%) rename {softmmu =3D> system}/tpm-hmp-cmds.c (100%) rename {softmmu =3D> system}/tpm.c (100%) rename {softmmu =3D> system}/trace-events (100%) create mode 100644 system/trace.h rename {softmmu =3D> system}/vl.c (100%) rename {softmmu =3D> system}/watchpoint.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 81625f036bd..2ddc3413b0f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -137,8 +137,8 @@ Overall TCG CPUs M: Richard Henderson R: Paolo Bonzini S: Maintained -F: softmmu/cpus.c -F: softmmu/watchpoint.c +F: system/cpus.c +F: system/watchpoint.c F: cpus-common.c F: page-vary.c F: page-vary-common.c @@ -2108,7 +2108,7 @@ S: Maintained F: docs/interop/virtio-balloon-stats.rst F: hw/virtio/virtio-balloon*.c F: include/hw/virtio/virtio-balloon.h -F: softmmu/balloon.c +F: system/balloon.c F: include/sysemu/balloon.h =20 virtio-9p @@ -2788,7 +2788,7 @@ Device Tree M: Alistair Francis R: David Gibson S: Maintained -F: softmmu/device_tree.c +F: system/device_tree.c F: include/sysemu/device_tree.h =20 Dump @@ -2844,11 +2844,11 @@ F: include/exec/memory.h F: include/exec/ram_addr.h F: include/exec/ramblock.h F: include/sysemu/memory_mapping.h -F: softmmu/dma-helpers.c -F: softmmu/ioport.c -F: softmmu/memory.c -F: softmmu/memory_mapping.c -F: softmmu/physmem.c +F: system/dma-helpers.c +F: system/ioport.c +F: system/memory.c +F: system/memory_mapping.c +F: system/physmem.c F: include/exec/memory-internal.h F: scripts/coccinelle/memory-region-housekeeping.cocci =20 @@ -2901,13 +2901,13 @@ F: include/sysemu/runstate.h F: include/sysemu/runstate-action.h F: util/main-loop.c F: util/qemu-timer.c -F: softmmu/vl.c -F: softmmu/main.c -F: softmmu/cpus.c -F: softmmu/cpu-throttle.c -F: softmmu/cpu-timers.c -F: softmmu/icount.c -F: softmmu/runstate* +F: system/vl.c +F: system/main.c +F: system/cpus.c +F: system/cpu-throttle.c +F: system/cpu-timers.c +F: system/icount.c +F: system/runstate* F: qapi/run-state.json =20 Read, Copy, Update (RCU) @@ -3081,7 +3081,7 @@ F: qapi/qom.json F: qapi/qdev.json F: scripts/coccinelle/qom-parent-type.cocci F: scripts/qom-cast-macro-clean-cocci-gen.py -F: softmmu/qdev-monitor.c +F: system/qdev-monitor.c F: stubs/qdev.c F: qom/ F: tests/unit/check-qom-interface.c @@ -3115,7 +3115,7 @@ M: Thomas Huth M: Laurent Vivier R: Paolo Bonzini S: Maintained -F: softmmu/qtest.c +F: system/qtest.c F: accel/qtest/ F: tests/qtest/ F: docs/devel/qgraph.rst @@ -3191,7 +3191,7 @@ F: scripts/simpletrace.py TPM M: Stefan Berger S: Maintained -F: softmmu/tpm* +F: system/tpm* F: hw/tpm/* F: include/hw/acpi/tpm.h F: include/sysemu/tpm* @@ -3226,7 +3226,7 @@ F: util/userfaultfd.c Migration dirty limit and dirty page rate M: Hyman Huang S: Maintained -F: softmmu/dirtylimit.c +F: system/dirtylimit.c F: include/sysemu/dirtylimit.h F: migration/dirtyrate.c F: migration/dirtyrate.h @@ -3250,7 +3250,7 @@ F: scripts/xml-preprocess* Seccomp M: Daniel P. Berrange S: Odd Fixes -F: softmmu/qemu-seccomp.c +F: system/qemu-seccomp.c F: include/sysemu/seccomp.h F: tests/unit/test-seccomp.c =20 @@ -3669,7 +3669,7 @@ T: git https://github.com/stefanha/qemu.git block Bootdevice M: Gonglei S: Maintained -F: softmmu/bootdevice.c +F: system/bootdevice.c =20 Quorum M: Alberto Garcia diff --git a/docs/devel/qtest.rst b/docs/devel/qtest.rst index 0455aa06ab2..c5b8546b3eb 100644 --- a/docs/devel/qtest.rst +++ b/docs/devel/qtest.rst @@ -81,7 +81,7 @@ which you can run manually. QTest Protocol -------------- =20 -.. kernel-doc:: softmmu/qtest.c +.. kernel-doc:: system/qtest.c :doc: QTest Protocol =20 =20 diff --git a/include/sysemu/runstate-action.h b/include/sysemu/runstate-act= ion.h index cff45a047bf..db4e3099ae5 100644 --- a/include/sysemu/runstate-action.h +++ b/include/sysemu/runstate-action.h @@ -11,7 +11,7 @@ =20 #include "qapi/qapi-commands-run-state.h" =20 -/* in softmmu/runstate-action.c */ +/* in system/runstate-action.c */ extern RebootAction reboot_action; extern ShutdownAction shutdown_action; extern PanicAction panic_action; diff --git a/meson.build b/meson.build index 497a85eb9fe..05387853af8 100644 --- a/meson.build +++ b/meson.build @@ -3307,7 +3307,7 @@ if have_system 'hw/gpio', 'migration', 'net', - 'softmmu', + 'system', 'ui', 'hw/remote', ] @@ -3434,7 +3434,7 @@ endif common_ss.add(files('cpus-common.c')) specific_ss.add(files('cpu.c')) =20 -subdir('softmmu') +subdir('system') =20 # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: @@ -3813,14 +3813,14 @@ foreach target : target_dirs execs =3D [{ 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', - 'sources': files('softmmu/main.c'), + 'sources': files('system/main.c'), 'dependencies': [] }] if targetos =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', - 'sources': files('softmmu/main.c'), + 'sources': files('system/main.c'), 'dependencies': [] }] endif diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1ad9ccb74ba..6e4100d2a41 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -466,7 +466,7 @@ sub top_of_kernel_tree { my @tree_check =3D ( "COPYING", "MAINTAINERS", "Makefile", "README.rst", "docs", "VERSION", - "linux-user", "softmmu" + "linux-user", "system" ); =20 foreach my $check (@tree_check) { diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/CO= MPONENTS.md index 883da95aff2..0e62f10aad3 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -148,7 +148,7 @@ tcg ~ (/qemu)?(/accel/tcg|/replay|/tcg)/.* =20 sysemu - ~ (/qemu)?(/softmmu/.*|/accel/.*) + ~ (/qemu)?(/system/.*|/accel/.*) =20 (headers) ~ (/qemu)?(/include/.*) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index e5499b94b4f..02fa828100e 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -796,7 +796,7 @@ sub top_of_tree { && (-d "${lk_path}docs") && (-f "${lk_path}VERSION") && (-d "${lk_path}linux-user/") - && (-d "${lk_path}softmmu/")) { + && (-d "${lk_path}system/")) { return 1; } return 0; diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index 3bda0d72c72..5238f833435 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -43,10 +43,10 @@ EXTRA_CFLAGS=3D"$CFLAGS -U __OPTIMIZE__" if ! { [ -e "./COPYING" ] && [ -e "./MAINTAINERS" ] && [ -e "./Makefile" ] && - [ -e "./docs" ] && + [ -d "./docs" ] && [ -e "./VERSION" ] && - [ -e "./linux-user" ] && - [ -e "./softmmu" ];} ; then + [ -d "./linux-user" ] && + [ -d "./system" ];} ; then fatal "Please run the script from the top of the QEMU tree" fi =20 diff --git a/softmmu/trace.h b/softmmu/trace.h deleted file mode 100644 index 2ad10115726..00000000000 --- a/softmmu/trace.h +++ /dev/null @@ -1 +0,0 @@ -#include "trace/trace-softmmu.h" diff --git a/softmmu/arch_init.c b/system/arch_init.c similarity index 100% rename from softmmu/arch_init.c rename to system/arch_init.c diff --git a/softmmu/async-teardown.c b/system/async-teardown.c similarity index 100% rename from softmmu/async-teardown.c rename to system/async-teardown.c diff --git a/softmmu/balloon.c b/system/balloon.c similarity index 100% rename from softmmu/balloon.c rename to system/balloon.c diff --git a/softmmu/bootdevice.c b/system/bootdevice.c similarity index 100% rename from softmmu/bootdevice.c rename to system/bootdevice.c diff --git a/softmmu/cpu-throttle.c b/system/cpu-throttle.c similarity index 100% rename from softmmu/cpu-throttle.c rename to system/cpu-throttle.c diff --git a/softmmu/cpu-timers.c b/system/cpu-timers.c similarity index 100% rename from softmmu/cpu-timers.c rename to system/cpu-timers.c diff --git a/softmmu/cpus.c b/system/cpus.c similarity index 100% rename from softmmu/cpus.c rename to system/cpus.c diff --git a/softmmu/datadir.c b/system/datadir.c similarity index 100% rename from softmmu/datadir.c rename to system/datadir.c diff --git a/softmmu/device_tree.c b/system/device_tree.c similarity index 100% rename from softmmu/device_tree.c rename to system/device_tree.c diff --git a/softmmu/dirtylimit.c b/system/dirtylimit.c similarity index 100% rename from softmmu/dirtylimit.c rename to system/dirtylimit.c diff --git a/softmmu/dma-helpers.c b/system/dma-helpers.c similarity index 100% rename from softmmu/dma-helpers.c rename to system/dma-helpers.c diff --git a/softmmu/globals.c b/system/globals.c similarity index 100% rename from softmmu/globals.c rename to system/globals.c diff --git a/softmmu/icount.c b/system/icount.c similarity index 100% rename from softmmu/icount.c rename to system/icount.c diff --git a/softmmu/ioport.c b/system/ioport.c similarity index 100% rename from softmmu/ioport.c rename to system/ioport.c diff --git a/softmmu/main.c b/system/main.c similarity index 100% rename from softmmu/main.c rename to system/main.c diff --git a/softmmu/memory.c b/system/memory.c similarity index 100% rename from softmmu/memory.c rename to system/memory.c diff --git a/softmmu/memory_mapping.c b/system/memory_mapping.c similarity index 100% rename from softmmu/memory_mapping.c rename to system/memory_mapping.c diff --git a/softmmu/meson.build b/system/meson.build similarity index 100% rename from softmmu/meson.build rename to system/meson.build diff --git a/softmmu/physmem.c b/system/physmem.c similarity index 99% rename from softmmu/physmem.c rename to system/physmem.c index 309653c7221..edc3ed8ab90 100644 --- a/softmmu/physmem.c +++ b/system/physmem.c @@ -2301,8 +2301,10 @@ RAMBlock *qemu_ram_block_by_name(const char *name) return NULL; } =20 -/* Some of the softmmu routines need to translate from a host pointer - (typically a TLB entry) back to a ram offset. */ +/* + * Some of the system routines need to translate from a host pointer + * (typically a TLB entry) back to a ram offset. + */ ram_addr_t qemu_ram_addr_from_host(void *ptr) { RAMBlock *block; diff --git a/softmmu/qdev-monitor.c b/system/qdev-monitor.c similarity index 100% rename from softmmu/qdev-monitor.c rename to system/qdev-monitor.c diff --git a/softmmu/qemu-seccomp.c b/system/qemu-seccomp.c similarity index 100% rename from softmmu/qemu-seccomp.c rename to system/qemu-seccomp.c diff --git a/softmmu/qtest.c b/system/qtest.c similarity index 100% rename from softmmu/qtest.c rename to system/qtest.c diff --git a/softmmu/rtc.c b/system/rtc.c similarity index 100% rename from softmmu/rtc.c rename to system/rtc.c diff --git a/softmmu/runstate-action.c b/system/runstate-action.c similarity index 100% rename from softmmu/runstate-action.c rename to system/runstate-action.c diff --git a/softmmu/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c similarity index 100% rename from softmmu/runstate-hmp-cmds.c rename to system/runstate-hmp-cmds.c diff --git a/softmmu/runstate.c b/system/runstate.c similarity index 100% rename from softmmu/runstate.c rename to system/runstate.c diff --git a/softmmu/timers-state.h b/system/timers-state.h similarity index 100% rename from softmmu/timers-state.h rename to system/timers-state.h diff --git a/softmmu/tpm-hmp-cmds.c b/system/tpm-hmp-cmds.c similarity index 100% rename from softmmu/tpm-hmp-cmds.c rename to system/tpm-hmp-cmds.c diff --git a/softmmu/tpm.c b/system/tpm.c similarity index 100% rename from softmmu/tpm.c rename to system/tpm.c diff --git a/softmmu/trace-events b/system/trace-events similarity index 100% rename from softmmu/trace-events rename to system/trace-events diff --git a/system/trace.h b/system/trace.h new file mode 100644 index 00000000000..cd0136dcdc1 --- /dev/null +++ b/system/trace.h @@ -0,0 +1 @@ +#include "trace/trace-system.h" diff --git a/softmmu/vl.c b/system/vl.c similarity index 100% rename from softmmu/vl.c rename to system/vl.c diff --git a/softmmu/watchpoint.c b/system/watchpoint.c similarity index 100% rename from softmmu/watchpoint.c rename to system/watchpoint.c diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 0299ef6906c..e7d72ee80a9 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -58,7 +58,7 @@ if have_system or have_tools } =20 if seccomp.found() - tests +=3D {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]} + tests +=3D {'test-seccomp': ['../../system/qemu-seccomp.c', seccomp]} endif endif =20 --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591106; cv=none; d=zohomail.com; s=zohoarc; b=gQ/JkqitNerjyGyWpdCCd4S449gvDDntI1jLHaCogX7mmr+KjJLK/01iwiNhYChySr5bBawWsyNboqOnC2CAIlLFoF6c2WWdOrVmmdJmSDDVo+wq2CylrUqLKc8jtOMNQlu3aYcgbAC96W/zzhOFFD3R+TL+70vWhhN/AyRXboM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591106; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=lqzFG0nl98wuMsJDYYI6DGaasQUrXUt/A59VW574SOI=; b=N249dzpYae+ltE63+pDXRNmHgZ44z/O5g9bRKOJu8q6jHozfISvNVfK3jWADJR2NSDxg+6nVYqLwcwxl7ExiEC6Y826KBepxsHzmFMsvUknmFpeadiEJxrzbI5qX2FVFPsAB9/19zwsLtCfZ+8aW3gwTQwGFSGJegAycEF2Q7Jc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591106849975.8993500324358; Fri, 6 Oct 2023 04:18:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinR-0008VY-4N; Fri, 06 Oct 2023 07:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinO-0008Pn-Bt for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinM-0000NY-Sx for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:02 -0400 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-76-uLBrAO__MpGmMFX49rbTnQ-1; Fri, 06 Oct 2023 07:14:48 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-536294c9526so1706888a12.3 for ; Fri, 06 Oct 2023 04:14:48 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id g11-20020aa7d1cb000000b0052c9f1d3cfasm2420893edp.84.2023.10.06.04.14.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590900; 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=lqzFG0nl98wuMsJDYYI6DGaasQUrXUt/A59VW574SOI=; b=PodaIioQdKn0hlkJBC4k31nCuY1belsP3HAKC7emzBOfCcueT8PL4wBIm41y5AfHg4PqVU Ix4ql/2Q+/VL9cUcXVcWBQnFHEAS5CBUM13edNQSVpcqwOMz38vJmByrEPF1oR+tM0FLB/ ZRu381KDDQ+2YJhnOhUrpVRwXcHLVqo= X-MC-Unique: uLBrAO__MpGmMFX49rbTnQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590887; x=1697195687; 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=lqzFG0nl98wuMsJDYYI6DGaasQUrXUt/A59VW574SOI=; b=n2VGd73FmPNZsCB6U/6X5PnFY2YGGF0UHzOWvTOPUczJqMBU6ePiIifif5VvouIm6d vwMHpo9mO79wN3ot5eGfu9puN4UjKzrWj+dfjHHFyhZxvuXMh/r4uyIp2aVXqZKetfqM 3+B9q8wrxZnUTnnI0e1eobzJc0vCJG3Jqm0SfqxeRy4rLHh5sde61e+VMIK9ktDoAk/i yoU1DYda0XXuqEVCavRBMJw1FnWSLq13wY+BMneWlu44glIh5FWLd/YNZUKO+GlUKAtd HuOhmWyhIKlverLXePuC8uq4ZxLcz6ra2VBcnmSLgdcDv60jO91Q9wBanvjVMlzTa45m FVOw== X-Gm-Message-State: AOJu0YxEPi/8ZyHh0+wSlX/AAR0jS2rjPG3osyOn3fhNhLTNJKaK/QuN Lbmkn7CZQSoWnAiqjZx/LOAtI4gg9l2yYCAQbiGGsXfaOabhK+9uP7nr9tntxpZsXGXiOODH/Zx J3X7igqrVs6FVrRe0nO/bUyAygm+wd0K2B7yGe2ujg06XarhE8DeagxluWdzgHc4Q+47rbJEm3y 8= X-Received: by 2002:aa7:c998:0:b0:527:ab3f:4350 with SMTP id c24-20020aa7c998000000b00527ab3f4350mr6535778edt.38.1696590887232; Fri, 06 Oct 2023 04:14:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4V4/JiV3tuC7HIgmPKsNuWtdMVV1QCaUvZGlOwHhJ4xRYSf91iZP0ySNjdHiHa3ue3uIfKA== X-Received: by 2002:aa7:c998:0:b0:527:ab3f:4350 with SMTP id c24-20020aa7c998000000b00527ab3f4350mr6535761edt.38.1696590886875; Fri, 06 Oct 2023 04:14:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/26] configure: change $softmmu to $system Date: Fri, 6 Oct 2023 13:14:04 +0200 Message-ID: <20231006111412.13130-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591107568100001 Content-Type: text/plain; charset="utf-8" "softmmu" is a deprecated moniker, do the easy change matching the variable to the command line option. Signed-off-by: Paolo Bonzini --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e08127045d0..97a5e8de491 100755 --- a/configure +++ b/configure @@ -252,7 +252,7 @@ docs=3D"auto" EXESUF=3D"" prefix=3D"/usr/local" qemu_suffix=3D"qemu" -softmmu=3D"yes" +system=3D"yes" linux_user=3D"" bsd_user=3D"" plugins=3D"$default_feature" @@ -740,9 +740,9 @@ for opt do ;; --enable-tcg) tcg=3D"enabled" ;; - --disable-system) softmmu=3D"no" + --disable-system) system=3D"no" ;; - --enable-system) softmmu=3D"yes" + --enable-system) system=3D"yes" ;; --disable-user) linux_user=3D"no" ; @@ -864,7 +864,7 @@ else error_exit "user mode emulation not supported on this architecture" fi fi -if [ "$softmmu" =3D "yes" ]; then +if [ "$system" =3D "yes" ]; then mak_wilds=3D"${mak_wilds} $source_path/configs/targets/*-softmmu.mak" fi =20 @@ -1756,7 +1756,7 @@ for target in $target_list; do =20 case $target in xtensa*-linux-user) - # the toolchain is not complete with headers, only build softmmu tes= ts + # the toolchain is not complete with headers, only build system tests continue ;; *-softmmu) --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591007; cv=none; d=zohomail.com; s=zohoarc; b=gMdXrgJ8GgpTwkXlctRXmiMT4T/q0w9s84WnGRAmdPh0eQfetAaHaAzWSvROlax7kmdLWLOHkl5MeNVmdJ9gPJ/neRYL06WMcbGh/2tbGyncMuvCfS9GcBn8/Zb19aQuinM3rcCmV/qmt4rEDPSFz9IkBiuhkxovz95xMYYLyeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591007; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=x5mg0EVXMpSp3/p2XABRST0eaTQHLCF3XcJ+1IJpFP4=; b=Is5xqd8XTtnMfpk9I9nRSyF8QED1F6PXKwu20zDbSXgYJeB2p6RxygLQIHrNe1KeU1b1RcfcAyJbH9Fl8Fpg4tpa2T+cDdtVF1sgLerd8kWLRMAXzuZdcjA6gmbSFYzE1ExblS9r40unNhvI3MooFohYL68O/mFkNL9G24KG6Ds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591007201639.564954496438; Fri, 6 Oct 2023 04:16:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinM-0008Mo-EC; Fri, 06 Oct 2023 07:15:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinJ-0008Hd-Ly for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinF-0000Ky-4t for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:57 -0400 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-502-oPFZUS_2M_KjrvzL_ku0zA-1; Fri, 06 Oct 2023 07:14:50 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99bca0b9234so168883766b.2 for ; Fri, 06 Oct 2023 04:14:50 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id gh18-20020a170906e09200b009786c8249d6sm2741247ejb.175.2023.10.06.04.14.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590892; 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=x5mg0EVXMpSp3/p2XABRST0eaTQHLCF3XcJ+1IJpFP4=; b=KYU8wwiRDBuUQq1oU9JPGkJEkcC3Gw+F9v68EsNGIuclzfP/Zj1DLGcsX6g/kuq+VWR8iF +z6kjMqBz/D11baV5dG1WiZvPE8i7gOV8MYGc4Eovr2SkP7Hy03RRzliVoY5/w5pSlSCGz 3dW3SUxZhGiFgAxNUpo/kUhYMRWHR48= X-MC-Unique: oPFZUS_2M_KjrvzL_ku0zA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590889; x=1697195689; 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=x5mg0EVXMpSp3/p2XABRST0eaTQHLCF3XcJ+1IJpFP4=; b=Loz9cwDvt9yn1aaLA4lQs5b9MQlPhnw+LAYuPsSpvEOHp2m+9FORlGrT1rOAeNC/8S RPCV4gOlvt+Ns3cKzr/VctWBa8y4NA818z82Qfce3E1xWxomIGjfrQAbJOkgt62RSYYe 0QL+n06VPtkZCocTyskJiFbrpsiqTDEJ2RIbuCJuCzgImwQVlUfaoPTdGbBg03p4ja2d OdTWrD2M1HdgFIpYxN9LvjsRxSZ6Ymja2H6FY6/h+4Me27B4mn0Y3CqpJYYpGFjd/DP9 0vUZaI3RZgSBALk+RjrMtsYhR3igAAOW9c7N13mNXQRrZ5dQgWFw5vHg41Am8OgUKJG4 wWdQ== X-Gm-Message-State: AOJu0Yy/aK0qyTFsePouPTMy+XnD/imYXs7hksM7xmAcA+yynHpNy1iU Q1dev2MDLOqH1OCWkl6GPiH4f4t4VIH1LLnYMQqOf+Q1vZePu3znK0tbiT+ggXzBiWFI2UxE8eh XMqIfsj8ptaJIcM08iTOEkDz4loJyuxDZdUBgfDVgnXjU8ZF+DjHh46i7sTGQ6sX/aVy6r9vh4a M= X-Received: by 2002:a17:906:2257:b0:9a1:680e:8c54 with SMTP id 23-20020a170906225700b009a1680e8c54mr7519323ejr.71.1696590888823; Fri, 06 Oct 2023 04:14:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvB6h9ao8uWkW0YUfzqlmpViSGBg5sdp1bdNbvndAOzeX6tUnGhk7xxqfSeRW14TytVyIH6g== X-Received: by 2002:a17:906:2257:b0:9a1:680e:8c54 with SMTP id 23-20020a170906225700b009a1680e8c54mr7519302ejr.71.1696590888456; Fri, 06 Oct 2023 04:14:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/26] cutils: squelch compiler warnings with custom paths Date: Fri, 6 Oct 2023 13:14:05 +0200 Message-ID: <20231006111412.13130-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591007658100001 Content-Type: text/plain; charset="utf-8" Setting --bindir=3D to an absolute path that is shorter than the prefix causes GCC to complain about array accesses out of bounds. The code however is safe, so disable the warning and explain why we are doing so. Signed-off-by: Paolo Bonzini --- util/cutils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/util/cutils.c b/util/cutils.c index 25373198adc..3856e304c52 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -1012,8 +1012,17 @@ int qemu_pstrcmp0(const char **str1, const char **st= r2) static inline bool starts_with_prefix(const char *dir) { size_t prefix_len =3D strlen(CONFIG_PREFIX); + /* + * dir[prefix_len] is only accessed if the length of dir is + * >=3D prefix_len, so no out of bounds access is possible. + */ +#pragma GCC diagnostic push +#if !defined(__clang__) || __has_warning("-Warray-bounds=3D") +#pragma GCC diagnostic ignored "-Warray-bounds=3D" +#endif return !memcmp(dir, CONFIG_PREFIX, prefix_len) && (!dir[prefix_len] || G_IS_DIR_SEPARATOR(dir[prefix_len])); +#pragma GCC diagnostic pop } =20 /* Return the next path component in dir, and store its length in *p_len. = */ --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591027; cv=none; d=zohomail.com; s=zohoarc; b=T6pCTuJgXkXM5nn/ZWvmXzTDxgD0BB0cwtAB1WkW8l1QVKjmlVtpBfe8tz2CExbonQoOltynUXPqm5usq0phcSOPZCKv9NcBY72BA2g+tzeusmZBvY6v40cX8t+IPUacNjEZtXuVEJ7/YTij3a7SWEBB+jzSVSY8m012nWgzR9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591027; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Ed06irNTewW21WPI2pKDoWbJ0mZWVCO4roCwazcqpEM=; b=Qy/0jTc/U9KNt10Q3yKvjxDso6JW3OveR9V7XMGH4SG48hxl711xh2Nh5isjkbAsvO6BLnX/Gy4HEEZMNAbcxqHUCDh6GaGxpqzUGLOD0w5b3NmZvKkHADL27fUpsKqcSYVgHUG+V6mdX3AV6Iw4p3ugaMPvgLTr9hYwPmBALNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591027658706.3679803953057; Fri, 6 Oct 2023 04:17:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinO-0008Pp-DQ; Fri, 06 Oct 2023 07:15:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinJ-0008He-MQ for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinH-0000Ly-2Y for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:57 -0400 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-568-ZfT34JYyMuaTVsOB5Ba_bw-1; Fri, 06 Oct 2023 07:14:52 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99c8bbc902eso169941466b.1 for ; Fri, 06 Oct 2023 04:14:52 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id ci24-20020a170906c35800b009a2235ed496sm2756205ejb.141.2023.10.06.04.14.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590893; 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=Ed06irNTewW21WPI2pKDoWbJ0mZWVCO4roCwazcqpEM=; b=HmhkR7f5NJUS505umkM5S+wrKOz8yZadiN+z0OTyz8S809ls4mmXyGHhVoHQ8JmSe7RWlz nJzjqkTMwew6W9WNGG30VuY4FcZ06OZn99w8iaW1oHja/nYxeBmDQi74t9SXLo/l7wVFWT /5n2t4M7PViblsl1zIRugyJJuRn7JyQ= X-MC-Unique: ZfT34JYyMuaTVsOB5Ba_bw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590890; x=1697195690; 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=Ed06irNTewW21WPI2pKDoWbJ0mZWVCO4roCwazcqpEM=; b=KPmJgN3bEZv4xXshie1knIi8e/CxN1W2o+celQC6H0vU+SuwKUM/Zhnv+x1XIONNic dTr1aQC46tq2akUPoLxBDkfqzyUIDObmrR/X43+Sq55kLYGk3BXHWVvyxlPBiZpSX7UP /MxsQR9eH1dwkjctA6SIpfMeRnuO9nZgXyfH4jjTtyf98WS5Se5e53xXoVUkwKTjcyEX M+vY9qdjse0+4EPUpE5mLHHDjdJeEmvILJex2wsOWWqTZl/3hgudUxcZKQExsVtOlETs nyy8z/btvKwKef0jbUDqSac/DEUZNAQv14FMTBHamff1B72DJVxX7qPHw3PYh4ZEVFBZ TTrA== X-Gm-Message-State: AOJu0Yw1SyZ6D3zZuvn1M5GjrtbZaEYbcMS024YghUi3fmAnLCDV90uz X6ZjoFnIG9LrnhZLF+ABEb8q1QqRIWA7JeODW0T8s7ArYoVVBKyXish7TXknreLysUhiO+5Uf6p 5ff/yqXe8jp2aAMf/4HC7F2CdQCKasSbdw1nT8Da3w2NpIdM9F7HrrNUNWFCNsqUZ0MNQj0IVQ1 4= X-Received: by 2002:a17:906:7485:b0:9ae:5fe1:ef03 with SMTP id e5-20020a170906748500b009ae5fe1ef03mr6719431ejl.67.1696590890765; Fri, 06 Oct 2023 04:14:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrH7+mKup4N7Sl0mhAU4ShcidSkBp78af976U/2viwOAsgPRLjenOMiF+Oryyk0OK65GWoaA== X-Received: by 2002:a17:906:7485:b0:9ae:5fe1:ef03 with SMTP id e5-20020a170906748500b009ae5fe1ef03mr6719416ejl.67.1696590890419; Fri, 06 Oct 2023 04:14:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/26] audio: error hints need a trailing \n Date: Fri, 6 Oct 2023 13:14:06 +0200 Message-ID: <20231006111412.13130-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591028154100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- audio/audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio.c b/audio/audio.c index 730bf2498dc..98621576d95 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1833,7 +1833,7 @@ bool AUD_register_card (const char *name, QEMUSoundCa= rd *card, Error **errp) card->state =3D audio_init(NULL, errp); if (!card->state) { if (!QSIMPLEQ_EMPTY(&audiodevs)) { - error_append_hint(errp, "Perhaps you wanted to set aud= iodev=3D%s?", + error_append_hint(errp, "Perhaps you wanted to set aud= iodev=3D%s?\n", QSIMPLEQ_FIRST(&audiodevs)->dev->id); } return false; --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696590990; cv=none; d=zohomail.com; s=zohoarc; b=NzNrePVcD4XltiRTnJgoC9FgpkXFGSPESTUSlUkUg+KamZnnN4V6AHtj4jNCdeCHsDoEX+nwnpn8Ay3JaVbHbHgUUaqf5E8jMBnWZHkQY/UUkx1ypgzvu2jfYrHodmUyqcD1J5n/ijp/h0+VBf88n63nR4TTjZh5MZqyNNUDDPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696590990; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=6OAsxA5U/Cvno5qxaUaVEnzr/FfY4M6hU6vewG0xKvA=; b=Wds5x3nqCz/heK0LDltRogc03/WCcn7RtJavJC4i1Runf3Oky2LGN/dfVtva7sqakDvFWOkIsd21JY06LMBr0mgsIeJwpxaH7UMhz4dp1S0Q0SOXI0I/4oBzq1PNZ+cUQrA32c6H5T1/GUtitq8oCtdIH/y7+46Jbi/cBpxmLCM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696590990735716.5949629156639; Fri, 6 Oct 2023 04:16:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinU-0000AL-Pz; Fri, 06 Oct 2023 07:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinL-0008Kg-Hg for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinJ-0000MP-Db for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:14:58 -0400 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-481-DRH-HsoZNrS6SPnS4a4QAg-1; Fri, 06 Oct 2023 07:14:53 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9ae686dafedso181660066b.3 for ; Fri, 06 Oct 2023 04:14:53 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id lz11-20020a170906fb0b00b009b97521b58bsm2716767ejb.39.2023.10.06.04.14.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590895; 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=6OAsxA5U/Cvno5qxaUaVEnzr/FfY4M6hU6vewG0xKvA=; b=FA6Sbo3VI94yzVvGvUwP9PYcjcO8Sr4KefMXW8NIa86aJgEe7itMHGkx9xaEnktIiTDtzs 88PeD27GTv1cO7x12winBl6BXInlibCNpKBab+ApnOfe2cNSkwoRGDrbe/M72jfWU0Qo4L QQ6pXHu7OANghV50ja4E/Mu362sKs1o= X-MC-Unique: DRH-HsoZNrS6SPnS4a4QAg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590892; x=1697195692; 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=6OAsxA5U/Cvno5qxaUaVEnzr/FfY4M6hU6vewG0xKvA=; b=gu6SW/CmNHYIilsliSEGjZht9JIKkuEZOeFzRJ6Y1EV3rwzDoR7ToPCDkz0oTUIoBP QXkqiglR5ViTDE4dILH6WMjfcgUs7biComgIsTmaMaMJqw2oRPBDJh4gJSwyJ0aDOUs6 osTRhjoi6LC+1FK9yfuDFag+VuuqEN1ITOOWQR3lIm+wpMFjnhVBEjsyS25fzN/f49h6 RiYH9PFCxfbZypJQ3Qcao2AOOMi8u46S0Ddsl3yAfsNGHrvlT0Ph/qn9Fypj17V74nhS r5vpm/CTkF/KCvWhomQyIBYdaO4neO03bJoudsdR0/7NjxT/66dscXfCEZvqVRW6bNbx VihA== X-Gm-Message-State: AOJu0Yw+8OS8X10IVSjL4obdsUh9GNnWsq3ybHeSoqF0H4/qgdUn8TV6 dyp2skay/EPlQFlo3rCYNqo54PVfbXG2hMYVwtisKk1Z11r0tjNI3o1aiVQW8v1HMQi/tyqh7fF 8poyPQrtqAAZwHjmQ8vAsQIDXcGq2noFtrl5AJLuWYDHdb0+GLlavQ4zzeKSwSk1vDeyx2wTyTK E= X-Received: by 2002:a17:906:8443:b0:9ae:6632:a8c0 with SMTP id e3-20020a170906844300b009ae6632a8c0mr6388940ejy.10.1696590892368; Fri, 06 Oct 2023 04:14:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMdOs1CqiYsX92+tyoXh2UL9m8OIoQMieiNA93xKedppTe9Ivhzv/HSI/pEtKlL0IUbwkoLw== X-Received: by 2002:a17:906:8443:b0:9ae:6632:a8c0 with SMTP id e3-20020a170906844300b009ae6632a8c0mr6388931ejy.10.1696590892038; Fri, 06 Oct 2023 04:14:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/26] audio: disable default backends if -audio/-audiodev is used Date: Fri, 6 Oct 2023 13:14:07 +0200 Message-ID: <20231006111412.13130-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696590991366100001 Content-Type: text/plain; charset="utf-8" Match what is done for other options, for example -monitor, and also the behavior of QEMU 8.1 (see the "legacy_config" variable). Require the user to specify a backend if one is specified on the command line. Signed-off-by: Paolo Bonzini --- audio/audio.c | 9 +-------- audio/audio.h | 1 + docs/about/removed-features.rst | 3 +++ system/vl.c | 7 +++++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 98621576d95..67a7e25254d 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1688,14 +1688,10 @@ static const VMStateDescription vmstate_audio =3D { =20 static void audio_validate_opts(Audiodev *dev, Error **errp); =20 -static void audio_create_default_audiodevs(void) +void audio_create_default_audiodevs(void) { const char *drvname =3D getenv("QEMU_AUDIO_DRV"); =20 - if (!defaults_enabled()) { - return; - } - /* QEMU_AUDIO_DRV=3Dnone is used by libqtest. */ if (drvname && !g_str_equal(drvname, "none")) { error_report("Please use -audiodev instead of QEMU_AUDIO_*"); @@ -1827,9 +1823,6 @@ bool AUD_register_card (const char *name, QEMUSoundCa= rd *card, Error **errp) } card->state =3D QTAILQ_FIRST(&audio_states); } else { - if (QSIMPLEQ_EMPTY(&default_audiodevs)) { - audio_create_default_audiodevs(); - } card->state =3D audio_init(NULL, errp); if (!card->state) { if (!QSIMPLEQ_EMPTY(&audiodevs)) { diff --git a/audio/audio.h b/audio/audio.h index 80f3f92124d..53b1d7e6227 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -170,6 +170,7 @@ void audio_sample_from_uint64(void *samples, int pos, =20 void audio_define(Audiodev *audio); void audio_parse_option(const char *opt); +void audio_create_default_audiodevs(void); void audio_init_audiodevs(void); void audio_help(void); =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index e83ed087f6b..8a0a8fe0765 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -442,6 +442,9 @@ line using a ``secret`` object instance. The ``-audiodev`` and ``-audio`` command line options are now the only way to specify audio backend settings. =20 +Note that the default audio backend must be configured on the command +line if the ``-nodefaults`` options is used. + Creating vnc without ``audiodev=3D`` property (removed in 8.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/system/vl.c b/system/vl.c index 98e071e63bb..7ca92d4490d 100644 --- a/system/vl.c +++ b/system/vl.c @@ -184,6 +184,7 @@ static const char *qtest_log; static bool opt_one_insn_per_tb; =20 static int has_defaults =3D 1; +static int default_audio =3D 1; static int default_serial =3D 1; static int default_parallel =3D 1; static int default_monitor =3D 1; @@ -1327,6 +1328,7 @@ static void qemu_disable_default_devices(void) default_sdcard =3D 0; } if (!has_defaults) { + default_audio =3D 0; default_monitor =3D 0; default_net =3D 0; default_vga =3D 0; @@ -1963,6 +1965,9 @@ static void qemu_create_early_backends(void) */ configure_blockdev(&bdo_queue, machine_class, snapshot); audio_init_audiodevs(); + if (default_audio) { + audio_create_default_audiodevs(); + } } =20 =20 @@ -2925,6 +2930,7 @@ void qemu_init(int argc, char **argv) break; #endif case QEMU_OPTION_audiodev: + default_audio =3D 0; audio_parse_option(optarg); break; case QEMU_OPTION_audio: { @@ -2933,6 +2939,7 @@ void qemu_init(int argc, char **argv) Audiodev *dev =3D NULL; Visitor *v; QDict *dict =3D keyval_parse(optarg, "driver", &help, &err= or_fatal); + default_audio =3D 0; if (help || (qdict_haskey(dict, "driver") && is_help_option(qdict_get_str(dict, "driver"))= )) { audio_help(); --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591001; cv=none; d=zohomail.com; s=zohoarc; b=k9P8Lh0yOqJOrDBqM9gQr247HJ/3XQfIQt2Ac/32CiRUMDpfQwgNPGbI4sqz+OnoQB4SGs2RmV/eOWp5dfr/j4MF0VyU9tan7WgtLZH8SIKcawcgyZSpcxmN1yqGjV8Ci5GlvcSe7tXvhtSqpSL7q1W7isqRd3ab1V5CKW2TV/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591001; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=wxClbUpyEzaOhzjOLMt2mI013puUd8aozGogBdkxNu8=; b=NwSDKpVSm6xjJzYkOm6KOJ6auuIvP6z239AzhC8fquCBh0xOcuVhCXVcbbPIcUZpWa+8h+LQ8egGjlLeg5NOWWjNj93bPcPIGiOxjOJFPc2gmIn3HMlempCwxkT1FVTEPBjJ6XrpLhYDEP7JPQLJh1vBDQEaShQhiaU0YHvZsHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169659100128688.58964025175862; Fri, 6 Oct 2023 04:16:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinV-0000F4-Pr; Fri, 06 Oct 2023 07:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinM-0008Mm-A7 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinJ-0000Mj-RC for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:00 -0400 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-281-qRa8o3mSNfCC8t1mG35tkA-1; Fri, 06 Oct 2023 07:14:55 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9b274cc9636so178634166b.0 for ; Fri, 06 Oct 2023 04:14:55 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id n12-20020a170906378c00b009ade1a4f795sm2670049ejc.168.2023.10.06.04.14.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590897; 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=wxClbUpyEzaOhzjOLMt2mI013puUd8aozGogBdkxNu8=; b=KPfAnFnq1tvNbRcLTZvwyBq/QFMUcvFaAzagnyPpSLi+Ozw3Mi5MHSulhnp56K/enx16jf GT268rSqvT+gVH+1ikZVERJY1lbt/Gak4fNBO9PA+KndGURhPRhiDoj513OdaGPXsJO6b6 10D6WmJzJJkXs9Cwzs0wec2kGnU6YBU= X-MC-Unique: qRa8o3mSNfCC8t1mG35tkA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590894; x=1697195694; 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=wxClbUpyEzaOhzjOLMt2mI013puUd8aozGogBdkxNu8=; b=d0liJ/WjzUKAy74TVKSs4p8oCgIzQB51QWzrs7Zs0qRNmBoU6fKA1Y5iSAq3/5OlYP uckTxZwSKqAQV2FVFMATr8wvZYNHRuh+sHA7pws6yoDGJOMBL2RDvFZrIXJfmUJWPgRi 8x6NYrj/fP7HX6enHKHsLEXVJdnUIaKElt/rUho6AqsR7uINvhNdbUxACY25GfrvmUJZ NQVBkW79oy9LtScP8sj82wMy9I5agjA20pyWr1HerkcVYZGzCEqxsny1FDfCDTLyYLFo 3sI1p9zWOD3OmnkdSqaxhX3+FDoVE9TxyDx0iWboCMFkl/jmvAohOhKqdnPDxuSgc9F3 McGg== X-Gm-Message-State: AOJu0Yy9Q91qcxADzp4rOqFinxA0tAiFdL09qvK7V7+QS2Xm2oiKXqLl ANmqbFP9A9lTyURH0rk1cz+1jG7bOFp4imkM5U1fKhTTjScTYMu0swuSzdrkICFDZsjiEbWXwVG u8VqRIbTz365Fz5MrOOED2QRgCbh8NN08ynGtPBUg+PRg4SUOi7Rsr40XlBDdNzRQItPM35X73i M= X-Received: by 2002:a17:906:3ca1:b0:9b6:5b56:bbe3 with SMTP id b1-20020a1709063ca100b009b65b56bbe3mr5875851ejh.72.1696590894131; Fri, 06 Oct 2023 04:14:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEtcjtThh5zFAvF9SnN6iPmFZDDSKUteEtv39CwffqddltnLFQOsK+oOqWeOyfG8BphsoYtZQ== X-Received: by 2002:a17:906:3ca1:b0:9b6:5b56:bbe3 with SMTP id b1-20020a1709063ca100b009b65b56bbe3mr5875836ejh.72.1696590893752; Fri, 06 Oct 2023 04:14:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/26] audio: extract audio_define_default Date: Fri, 6 Oct 2023 13:14:08 +0200 Message-ID: <20231006111412.13130-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591001503100001 Content-Type: text/plain; charset="utf-8" It will be used soon to define a default audio device from the command line. Signed-off-by: Paolo Bonzini --- audio/audio.c | 19 ++++++++++++------- audio/audio.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 67a7e25254d..887219e0ce4 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1686,8 +1686,6 @@ static const VMStateDescription vmstate_audio =3D { } }; =20 -static void audio_validate_opts(Audiodev *dev, Error **errp); - void audio_create_default_audiodevs(void) { const char *drvname =3D getenv("QEMU_AUDIO_DRV"); @@ -1706,7 +1704,6 @@ void audio_create_default_audiodevs(void) if (audio_driver_lookup(audio_prio_list[i])) { QDict *dict =3D qdict_new(); Audiodev *dev =3D NULL; - AudiodevListEntry *e; Visitor *v; =20 qdict_put_str(dict, "driver", audio_prio_list[i]); @@ -1717,10 +1714,7 @@ void audio_create_default_audiodevs(void) visit_type_Audiodev(v, NULL, &dev, &error_fatal); visit_free(v); =20 - audio_validate_opts(dev, &error_abort); - e =3D g_new0(AudiodevListEntry, 1); - e->dev =3D dev; - QSIMPLEQ_INSERT_TAIL(&default_audiodevs, e, next); + audio_define_default(dev, &error_abort); } } } @@ -2165,6 +2159,17 @@ void audio_define(Audiodev *dev) QSIMPLEQ_INSERT_TAIL(&audiodevs, e, next); } =20 +void audio_define_default(Audiodev *dev, Error **errp) +{ + AudiodevListEntry *e; + + audio_validate_opts(dev, errp); + + e =3D g_new0(AudiodevListEntry, 1); + e->dev =3D dev; + QSIMPLEQ_INSERT_TAIL(&default_audiodevs, e, next); +} + void audio_init_audiodevs(void) { AudiodevListEntry *e; diff --git a/audio/audio.h b/audio/audio.h index 53b1d7e6227..6da5e8f6f0f 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -169,6 +169,7 @@ void audio_sample_from_uint64(void *samples, int pos, uint64_t left, uint64_t right); =20 void audio_define(Audiodev *audio); +void audio_define_default(Audiodev *dev, Error **errp); void audio_parse_option(const char *opt); void audio_create_default_audiodevs(void); void audio_init_audiodevs(void); --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591087; cv=none; d=zohomail.com; s=zohoarc; b=ekTp0WoddYeW6+xjWPD11bFAQ5PXbPE0HPxf1ekwN9JGaNtX4ot/JyS+ZlI0vD0SjY5EdaxjjP9wu233nYY1/D9/ylarAOtj/mimgc+4k/ZerbRzTPF5hwwC3Q7APEy1/MmUl9CqIPUCTmxc+kcAKYTdVPowS0pwRe46fK8oTSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591087; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=WbrCmPB68Z8c52mvckXXYYd42GA9Z2PO/AQo6w0dlUs=; b=UFmI/mF9GSrwxLSOuonGrFlO9nRa+KFOXhv2xwaAXG0hs2+mdyBfncBuSUXdS89LjMTUTY84NKZwrlE3x+TrSY0saQhe+HWHqEisMRBmZrOI7MiSgFqcnGimBf4cKjFkydGFUf7IUSyxOUwhue61Of0QnWpoC55QhsPprcoGG6c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16965910877130.8689519482635433; Fri, 6 Oct 2023 04:18:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinV-0000Cn-6I; Fri, 06 Oct 2023 07:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinN-0008Oi-8g for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinL-0000N7-Hm for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:00 -0400 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-642-U52aKxY3PfeIzphG8Nkzjg-1; Fri, 06 Oct 2023 07:14:57 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9a9e3f703dfso160355266b.1 for ; Fri, 06 Oct 2023 04:14:57 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id qh9-20020a170906eca900b009add084a00csm2705584ejb.36.2023.10.06.04.14.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590899; 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=WbrCmPB68Z8c52mvckXXYYd42GA9Z2PO/AQo6w0dlUs=; b=Wroxr8l6NBX/7UQmHNgkk55XqZSzRoHxvvdRQnSPjGpNHyv7TQCuhnzolUIo5VCGw+N6xB YHsQtkHCx9SNCs5KEGVhqGjP9o87sy/9u3o8PN9B+O7+XKFipkiTwEzA2gV4bjvXdJkPYX Agb1OrIWFbMyQObcMWfbxfqi3okL2mQ= X-MC-Unique: U52aKxY3PfeIzphG8Nkzjg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590896; x=1697195696; 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=WbrCmPB68Z8c52mvckXXYYd42GA9Z2PO/AQo6w0dlUs=; b=YoemC0amdIifB+nVFzyBqYLZ1Ruc7ydtNh2EUOWk//FCTC9kOz+/ivrmQGy9SxHOZh a+qBmLPdFyUFNQK4LUoKIW4NbvrAFsKalzLS7mCxnpRXd2958Am8p/WnOLzB8yaoxt3B 0aiqTOJhlFbpXKgpR+2IfuXY/pJOSlv6UPsFxcRmacRjbgJ05zz1ugpLCOIfxyKOZhe9 3XUg3LM4KKEYt5OKXQGAvxQmHByg/q8RgKWQ+AZUV4pVpSw/sbakxV86MSnDCz4LpnxJ BnqtZN+u7hm+Eus8q7OTBIfKE1EAQVi8ADy+UR9b4WHOR82s396F5zs74EuFAoC2StHS nAhw== X-Gm-Message-State: AOJu0YxT3qICZuBwbVpl6aOHDbhAWpW5DpyRbhmU+Z6lV7gcn0qOkqcM EO0S76c/P8YaMI4VlfSLW/lTDWOdtAPVGkpfnGMJ8UuYNXaN0TgzYQlDOlEaAdjkBp0JqbpzI7A PWRBPHHuwsA+hQPRHKUvWizbl2IX1eS+tg7mEEBkEL34yNj9+HDkiPlMkTkpC981mou4o96hf0f c= X-Received: by 2002:a17:907:270a:b0:9b2:b749:ff93 with SMTP id w10-20020a170907270a00b009b2b749ff93mr7490124ejk.24.1696590895767; Fri, 06 Oct 2023 04:14:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWwSabwCwsHUXOxbrYmUtDtLyT5hZYhiacdHoHjTTrHLywEPbjQDvTdvXsYBhUb4L5bjJr9Q== X-Received: by 2002:a17:907:270a:b0:9b2:b749:ff93 with SMTP id w10-20020a170907270a00b009b2b749ff93mr7490105ejk.24.1696590895343; Fri, 06 Oct 2023 04:14:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/26] audio: extend -audio to allow creating a default backend Date: Fri, 6 Oct 2023 13:14:09 +0200 Message-ID: <20231006111412.13130-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591089337100003 Content-Type: text/plain; charset="utf-8" If "-audio BACKEND" is used without a model, the resulting backend will be used whenever the audiodev property is not specified. Signed-off-by: Paolo Bonzini --- audio/audio.c | 2 +- qemu-options.hx | 29 +++++++++++++++++++++-------- system/vl.c | 27 +++++++++++++++------------ 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 887219e0ce4..a5e6eb4952e 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1820,7 +1820,7 @@ bool AUD_register_card (const char *name, QEMUSoundCa= rd *card, Error **errp) card->state =3D audio_init(NULL, errp); if (!card->state) { if (!QSIMPLEQ_EMPTY(&audiodevs)) { - error_append_hint(errp, "Perhaps you wanted to set aud= iodev=3D%s?\n", + error_append_hint(errp, "Perhaps you wanted to use -au= dio or set audiodev=3D%s?\n", QSIMPLEQ_FIRST(&audiodevs)->dev->id); } return false; diff --git a/qemu-options.hx b/qemu-options.hx index 9ce8a5b9578..5f4c240a1e2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -728,20 +728,22 @@ ERST =20 =20 DEF("audio", HAS_ARG, QEMU_OPTION_audio, + "-audio [driver=3D]driver[,prop[=3Dvalue][,...]]\n" + " specifies default audio backend when `audiodev` is no= t\n" + " used to create a machine or sound device;" + " options are the same as for -audiodev\n" "-audio [driver=3D]driver,model=3Dvalue[,prop[=3Dvalue][,...]]\n" " specifies the audio backend and device to use;\n" " apart from 'model', options are the same as for -audi= odev.\n" " use '-audio model=3Dhelp' to show possible devices.\n= ", QEMU_ARCH_ALL) SRST -``-audio [driver=3D]driver,model=3Dvalue[,prop[=3Dvalue][,...]]`` - This option is a shortcut for configuring both the guest audio - hardware and the host audio backend in one go. - The driver option is the same as with the corresponding ``-audiodev`` = option below. - The guest hardware model can be set with ``model=3Dmodelname``. - - Use ``driver=3Dhelp`` to list the available drivers, - and ``model=3Dhelp`` to list the available device types. +``-audio [driver=3D]driver[,model=3Dvalue][,prop[=3Dvalue][,...]]`` + If the ``model`` option is specified, ``-audio`` is a shortcut + for configuring both the guest audio hardware and the host audio + backend in one go. The guest hardware model can be set with + ``model=3Dmodelname``. Use ``model=3Dhelp`` to list the available + device types. =20 The following two example do exactly the same, to show how ``-audio`` can be used to shorten the command line length: @@ -750,6 +752,17 @@ SRST =20 |qemu_system| -audiodev pa,id=3Dpa -device sb16,audiodev=3Dpa |qemu_system| -audio pa,model=3Dsb16 + + If the ``model`` option is not specified, ``-audio`` is used to + configure a default audio backend that will be used whenever the + ``audiodev`` property is not set on a device or machine. In + particular, ``-audio none`` ensures that no audio is produced even + for machines that have embedded sound hardware. + + In both cases, the driver option is the same as with the corresponding + ``-audiodev`` option below. Use ``driver=3Dhelp`` to list the availab= le + drivers. + ERST =20 DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev, diff --git a/system/vl.c b/system/vl.c index 7ca92d4490d..72be5a49764 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2935,7 +2935,7 @@ void qemu_init(int argc, char **argv) break; case QEMU_OPTION_audio: { bool help; - char *model; + char *model =3D NULL; Audiodev *dev =3D NULL; Visitor *v; QDict *dict =3D keyval_parse(optarg, "driver", &help, &err= or_fatal); @@ -2948,22 +2948,25 @@ void qemu_init(int argc, char **argv) if (!qdict_haskey(dict, "id")) { qdict_put_str(dict, "id", "audiodev0"); } - if (!qdict_haskey(dict, "model")) { - error_setg(&error_fatal, "Parameter 'model' is missing= "); - } - model =3D g_strdup(qdict_get_str(dict, "model")); - qdict_del(dict, "model"); - if (is_help_option(model)) { - show_valid_soundhw(); - exit(0); + if (qdict_haskey(dict, "model")) { + model =3D g_strdup(qdict_get_str(dict, "model")); + qdict_del(dict, "model"); + if (is_help_option(model)) { + show_valid_soundhw(); + exit(0); + } } v =3D qobject_input_visitor_new_keyval(QOBJECT(dict)); qobject_unref(dict); visit_type_Audiodev(v, NULL, &dev, &error_fatal); visit_free(v); - audio_define(dev); - select_soundhw(model, dev->id); - g_free(model); + if (model) { + audio_define(dev); + select_soundhw(model, dev->id); + g_free(model); + } else { + audio_define_default(dev, &error_fatal); + } break; } case QEMU_OPTION_h: --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591029; cv=none; d=zohomail.com; s=zohoarc; b=Z3cruvrXp/pvL4jnYZxBjqobqgM1G9Lv1GfRB1TvFy/zhbCA63zpSHIoAa3sj5+GA7J4ViWKDlrrxS02qhYponUTZ2LaGTMwO56/C4mRhLFVhDUsgWtRqvrWkPb6y/yj6TvVltpDFbhAcwahzu3YZ8RV/XDm5EmOzMHiAnN+WbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591029; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=rDhVfR35z3X3xylEmcM6bmMtPhshZV4B0CfwZiTj6Bo=; b=dduINUVei43YcapOk5GBpQ8fVoHkuxFp/FhlcgNtknroLjoF4GNFoTUNtGZxzadkeSTVuun8iiKADktXSPLN0QFcCaGQnmd4o+jOmFBfBw9imeiIPh1RVo0VBKEvrFuNg/tPY/2fwnQRoPpLJGhYQKU1P7yE3tGt10sxE0wrg70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591029600179.45789977378126; Fri, 6 Oct 2023 04:17:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoinX-0000Ow-1m; Fri, 06 Oct 2023 07:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinQ-0008VX-Cq for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinO-0000Nh-IH for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:04 -0400 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-688-_FPqIUVZN8e237eDPaDXzA-1; Fri, 06 Oct 2023 07:14:59 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9b274cc9636so178638666b.0 for ; Fri, 06 Oct 2023 04:14:59 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id qh9-20020a170906eca900b009add084a00csm2705612ejb.36.2023.10.06.04.14.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590901; 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=rDhVfR35z3X3xylEmcM6bmMtPhshZV4B0CfwZiTj6Bo=; b=XnXHub5eeMw6Q6YRFUFrwSBAApr2BdAKt63hsQk1asPKfDvbTAgscD9RIan+A/G4pTgglu VvAuSG6U8K5dyB+FpBLkfREBQrOvFJhvSy4yvcOaZC796jlY7v8Inek9OOkMunzSK75Ka5 SBlREx4Wb8EGcAs+abfkfh63l58WfvE= X-MC-Unique: _FPqIUVZN8e237eDPaDXzA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590898; x=1697195698; 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=rDhVfR35z3X3xylEmcM6bmMtPhshZV4B0CfwZiTj6Bo=; b=lFnt2XKbPs3iZdyMEOy/ZiZC5VivNzrMoOgkMh89LEGUU5sc3eU00rFWvTS8cK5X8L inuoNextgIPM+8yI1lTZimW2K2JI0M36vQhN0eUftejnjqoNRtLK75Icpw7zQAUFbBTb c4Esxk/FuXgzOT+ysVx3bv2zXlj2ZPoEGwQZmfjQX/DEywv276/3E/wjHPu10hwDI3i+ 0DnDkGHc1Pyd9Y4YD4LqvGRx2lcTy3gR8Wdv3cG3x68pnUZ7YsErV2XyoUTyrxYGMRNv cuU4c1lKlfc1idv1fV4tFPN31Wu9X9ro08cwe3c6zKEuUI7I6HG9R0XV92raNXe/8fmt BVlA== X-Gm-Message-State: AOJu0YwuyysxidyZHTVIoE4rrtnGQFvNU47wb7cm6p2VdnkR0adAWIb0 rin06z/djCsSo+SKovk8UiIlFiCGqrSyr8OA9aASt4cLfcN8sLyGiMcFqhEdniipMVNhczo9S+L PVLFHidrJ5CpkRgPLtM+S/vDB4RG0LLwCAgKNCnV6xt0CuFCz8xU0hGYw6Tc0MeaSbA7hSCK1EA Q= X-Received: by 2002:a17:907:6c14:b0:9b6:f0e2:3c00 with SMTP id rl20-20020a1709076c1400b009b6f0e23c00mr5950163ejc.71.1696590898021; Fri, 06 Oct 2023 04:14:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGA6aJbx3nZw6ZmAcKyf2rBrD/q4pKizMH4Tk+aBfiIG450hbKuN+EEH/n3+EUKryLPp8dqWA== X-Received: by 2002:a17:907:6c14:b0:9b6:f0e2:3c00 with SMTP id rl20-20020a1709076c1400b009b6f0e23c00mr5950147ejc.71.1696590897572; Fri, 06 Oct 2023 04:14:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/26] audio: do not use first -audiodev as default audio device Date: Fri, 6 Oct 2023 13:14:10 +0200 Message-ID: <20231006111412.13130-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591030153100009 Content-Type: text/plain; charset="utf-8" It is now possible to specify the options for the default audio device using -audio, so there is no need anymore to use a fake -audiodev option. Remove the fall back to QTAILQ_FIRST(&audio_states), instead remember the AudioState that was created from default_audiodevs and use that one. Signed-off-by: Paolo Bonzini --- audio/audio.c | 25 +++++++------------------ docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index a5e6eb4952e..bd4bcabccaf 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -104,6 +104,7 @@ static audio_driver *audio_driver_lookup(const char *na= me) =20 static QTAILQ_HEAD(AudioStateHead, AudioState) audio_states =3D QTAILQ_HEAD_INITIALIZER(audio_states); +static AudioState *default_audio_state; =20 const struct mixeng_volume nominal_volume =3D { .mute =3D 0, @@ -1660,6 +1661,7 @@ static void free_audio_state(AudioState *s) =20 void audio_cleanup(void) { + default_audio_state =3D NULL; while (!QTAILQ_EMPTY(&audio_states)) { AudioState *s =3D QTAILQ_FIRST(&audio_states); QTAILQ_REMOVE(&audio_states, s, list); @@ -1760,6 +1762,7 @@ static AudioState *audio_init(Audiodev *dev, Error **= errp) goto out; } } else { + assert(!default_audio_state); for (;;) { AudiodevListEntry *e =3D QSIMPLEQ_FIRST(&default_audiodevs); if (!e) { @@ -1801,24 +1804,9 @@ out: bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **err= p) { if (!card->state) { - if (!QTAILQ_EMPTY(&audio_states)) { - /* - * FIXME: once it is possible to create an arbitrary - * default device via -audio DRIVER,OPT=3DVALUE (no "model"), - * replace this special case with the default AudioState*, - * storing it in a separate global. For now, keep the - * warning to encourage moving off magic use of the first - * -audiodev. - */ - if (QSIMPLEQ_EMPTY(&default_audiodevs)) { - dolog("Device %s: audiodev default parameter is deprecated= , please " - "specify audiodev=3D%s\n", name, - QTAILQ_FIRST(&audio_states)->dev->id); - } - card->state =3D QTAILQ_FIRST(&audio_states); - } else { - card->state =3D audio_init(NULL, errp); - if (!card->state) { + if (!default_audio_state) { + default_audio_state =3D audio_init(NULL, errp); + if (!default_audio_state) { if (!QSIMPLEQ_EMPTY(&audiodevs)) { error_append_hint(errp, "Perhaps you wanted to use -au= dio or set audiodev=3D%s?\n", QSIMPLEQ_FIRST(&audiodevs)->dev->id); @@ -1826,6 +1814,7 @@ bool AUD_register_card (const char *name, QEMUSoundCa= rd *card, Error **errp) return false; } } + card->state =3D default_audio_state; } =20 card->name =3D g_strdup (name); diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 2f51cf770ae..d59bcf36230 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -37,12 +37,6 @@ coverage. System emulator command line arguments -------------------------------------- =20 -Creating sound card devices without ``audiodev=3D`` property (since 4.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -When not using the deprecated legacy audio config, each sound card -should specify an ``audiodev=3D`` property. - Short-form boolean options (since 6.0) '''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 8a0a8fe0765..ed94b4cd0c8 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -442,6 +442,21 @@ line using a ``secret`` object instance. The ``-audiodev`` and ``-audio`` command line options are now the only way to specify audio backend settings. =20 +Using ``-audiodev`` to define the default audio backend (removed in 8.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +If no audiodev property is specified, previous versions would use the +first ``-audiodev`` command line option as a fallback. Starting with +version 8.2, audio backends created with ``-audiodev`` will only be +used by clients (sound cards, machines with embedded sound hardware, VNC) +that refer to it in an ``audiodev=3D`` property. + +In order to configure a default audio backend, use the ``-audio`` +command line option without specifying a ``model``; while previous +versions of QEMU required a model, starting with version 8.2 +QEMU does not require a model and will not create any sound card +in this case. + Note that the default audio backend must be configured on the command line if the ``-nodefaults`` options is used. =20 --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591074; cv=none; d=zohomail.com; s=zohoarc; b=RxtQnoHpy0O1oPwEI44Nmq0Sd0KBtlD/QiDkBsujdNZq9zPO6PheTMlJI8pXYtmkyspkaMLRgBoztB2gJ/PM2lCtnaasR7nCQm808E4BU4SRc66SA/Off/b5IWSQDJHR1O2J5RWlMRQkllgOE9dS4rAtozjYKQun9j+LNB9n+d0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591074; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Wuy5B84uv5TljCLYEICtx4w/cjiaLI/Y3wriDjVZTyc=; b=ZSb1DO6Ffizum3YCljq/2RyBUnRICXluTOJ0B1/UaS8IS8fFwX6l+ZFjQH0inIe8+DGPHG0dq6qg2WeV9l6twJL6Sg8xoD352p/xTsQCoevg0gsU5vWtkeZZmO6zIr2hoVwCM2oamsIuHOcq9B7NjfDAvE3ebZ9YyweKOE7mUUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16965910741031021.7544106390408; Fri, 6 Oct 2023 04:17:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoina-0000ZH-Gc; Fri, 06 Oct 2023 07:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinU-0000AN-2D for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinP-0000RY-Ni for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:06 -0400 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-22-G6SA5oqcOqWeK_ddxF9vjA-1; Fri, 06 Oct 2023 07:15:01 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9b65d7079faso154494666b.1 for ; Fri, 06 Oct 2023 04:15:01 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id ci24-20020a170906c35800b00992ea405a79sm2702776ejb.166.2023.10.06.04.14.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590903; 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=Wuy5B84uv5TljCLYEICtx4w/cjiaLI/Y3wriDjVZTyc=; b=hRmp458GeMDlpvKDXgOGz73r92l/UJ6hBlZLRt7caESlDHe8I189cks8bJ/ln1ozFRFRxv kiL4HgIOO0s/m3abt7PYy94eJEJkBs2wIK8MV6eZX+tbufPG9zRctRNUj7Z/f6shs1RHQH mL0X2bkr1AybpisQmtIeFMwq4CFhbbY= X-MC-Unique: G6SA5oqcOqWeK_ddxF9vjA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590900; x=1697195700; 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=Wuy5B84uv5TljCLYEICtx4w/cjiaLI/Y3wriDjVZTyc=; b=J74a6GYHNalXBsdkvCkJ/o5be3qlRtctmdSDHuK/aV7pA/uavwcwABU0vLzyka616j efjYMXVi68hMFpk1VyKraUbcVQqPuC1Li/Nfx0Xre+xsMem6hD87VZtiQGqzqzdGjEgW akoP1ZtzxBxTk7cucH4x2lubn/dfMnHavXMznZRlokJG9xAcU6UsHiQ6MtGOSVhq2YBV z6dWB4XoF+NJ6GT5IidFAqcvv9eXTutYugyEdWN9qcDAqtZg22r0pSCPTlKcCuzArQDb Ra7X7he6OwPA9+dCpjxWi7Pf9vRCHbtlSWTJyx2gH2T8xBoaNPLDTfzZSaocUzPaDaG2 Zd6g== X-Gm-Message-State: AOJu0YyMEM+RUat+xHgzWCPyFz91B4BeZukKw1wu7sAv5BF2yckQP4pV Gr70iwfpmmS0zSLdmdi2wEVwUDH5rPCKZFXF5JF1d/zTc6B7rHvnpWnqiv/37WlhBgrHRP8z0CU 0UMp5e2sygibxrwxlKbmWBCahcm7ev+7xo09K2d1xmdYpp58quISQ1dPH6kHrScgh7ym24ftZpq E= X-Received: by 2002:a17:906:31cc:b0:9b2:b2f8:85dc with SMTP id f12-20020a17090631cc00b009b2b2f885dcmr6615832ejf.34.1696590899899; Fri, 06 Oct 2023 04:14:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvEckLnEDx1PBv/nj/kV7rHr2MdZEGRd6szcn4O65UxY8CIlHqCt1npwRhds9xIgYTnPM9mw== X-Received: by 2002:a17:906:31cc:b0:9b2:b2f8:85dc with SMTP id f12-20020a17090631cc00b009b2b2f885dcmr6615815ejf.34.1696590899509; Fri, 06 Oct 2023 04:14:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/26] audio: reintroduce default audio backend for VNC Date: Fri, 6 Oct 2023 13:14:11 +0200 Message-ID: <20231006111412.13130-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591075177100005 Content-Type: text/plain; charset="utf-8" Make VNC use the default backend again if one is defined. The recently introduced support for disabling the VNC audio extension is still used, in case no default backend exists. Signed-off-by: Paolo Bonzini --- audio/audio.c | 28 ++++++++++++++++++---------- audio/audio.h | 1 + docs/about/removed-features.rst | 6 ------ ui/vnc.c | 2 ++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index bd4bcabccaf..73b65dc3b9b 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1801,20 +1801,28 @@ out: return NULL; } =20 +AudioState *audio_get_default_audio_state(Error **errp) +{ + if (!default_audio_state) { + default_audio_state =3D audio_init(NULL, errp); + if (!default_audio_state) { + if (!QSIMPLEQ_EMPTY(&audiodevs)) { + error_append_hint(errp, "Perhaps you wanted to use -audio = or set audiodev=3D%s?\n", + QSIMPLEQ_FIRST(&audiodevs)->dev->id); + } + } + } + + return default_audio_state; +} + bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **err= p) { if (!card->state) { - if (!default_audio_state) { - default_audio_state =3D audio_init(NULL, errp); - if (!default_audio_state) { - if (!QSIMPLEQ_EMPTY(&audiodevs)) { - error_append_hint(errp, "Perhaps you wanted to use -au= dio or set audiodev=3D%s?\n", - QSIMPLEQ_FIRST(&audiodevs)->dev->id); - } - return false; - } + card->state =3D audio_get_default_audio_state(errp); + if (!card->state) { + return false; } - card->state =3D default_audio_state; } =20 card->name =3D g_strdup (name); diff --git a/audio/audio.h b/audio/audio.h index 6da5e8f6f0f..fcc22307bee 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -176,6 +176,7 @@ void audio_init_audiodevs(void); void audio_help(void); =20 AudioState *audio_state_by_name(const char *name, Error **errp); +AudioState *audio_get_default_audio_state(Error **errp); const char *audio_get_id(QEMUSoundCard *card); =20 #define DEFINE_AUDIO_PROPERTIES(_s, _f) \ diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index ed94b4cd0c8..f04036987b1 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -460,12 +460,6 @@ in this case. Note that the default audio backend must be configured on the command line if the ``-nodefaults`` options is used. =20 -Creating vnc without ``audiodev=3D`` property (removed in 8.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -When using vnc, you should specify an ``audiodev=3D`` property if -you plan to transmit audio through the VNC protocol. - QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/ui/vnc.c b/ui/vnc.c index acbb88c4ca0..7f4c471503a 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -4185,6 +4185,8 @@ void vnc_display_open(const char *id, Error **errp) if (!vd->audio_state) { goto fail; } + } else { + vd->audio_state =3D audio_get_default_audio_state(NULL); } =20 device_id =3D qemu_opt_get(opts, "display"); --=20 2.41.0 From nobody Sat May 18 16:47:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696591055; cv=none; d=zohomail.com; s=zohoarc; b=GscUklFvdiyyb0O6ZVXzkDevwhfvX0q4pXlVd54LgKLUBBiE7FvcYAFL140Y3r3aAtieD+DCZ6hLIFW/EsXsKFRr1cyiVAHkuIW+Tb5s0SgnIsmyQ/x2DKKeGmXx+Z7N2HAlyG4hWdVgK13MjzOxwpoS2r9GNezsXdPzGp9sisc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696591055; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3t7PXu2o9STYkD4Ove8P8ngjPUeCmULu2g1anj2DDGQ=; b=QPN38puAY4619qKUgahTsDG+obETjuCMeSisrSG2XupQ4zyJ5+0sGw4jgeCoCfgu4yf3kBoou5IkLQKYBR7zRjm3zWcAvVdbEdZO3hVNVwRUndNcbZBT/ung6jfV730/85ZR7SOtVQCl8XjYPBd/slarYq08tz+H8CSnrt0RP4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696591055006872.7500017333434; Fri, 6 Oct 2023 04:17:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoio4-0000rU-1j; Fri, 06 Oct 2023 07:15:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinY-0000Wi-1A for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoinT-0000ZO-A8 for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:15:11 -0400 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-421-5f_lXw0kOg6Um8W2faM08w-1; Fri, 06 Oct 2023 07:15:03 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-533f8bc82a8so1788121a12.0 for ; Fri, 06 Oct 2023 04:15:03 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id n10-20020aa7c78a000000b00535204ffdb4sm2438746eds.72.2023.10.06.04.15.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696590905; 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=3t7PXu2o9STYkD4Ove8P8ngjPUeCmULu2g1anj2DDGQ=; b=QbRiPgzvdfEBi5UH11VLT89MnDp+bzcjMZYsL+F++W4709SITZjvg2QYg17je2iCJ/5wrI ++nsk7+D+GTh7f+GuOQbFRpTzz4Jbfdf5g8fFPXw84/FhkAOUjdYM4UbPxb1fygIp7GO8s xcKdk37dW+3hGcxfas7O5Mp59NFIho4= X-MC-Unique: 5f_lXw0kOg6Um8W2faM08w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696590902; x=1697195702; 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=3t7PXu2o9STYkD4Ove8P8ngjPUeCmULu2g1anj2DDGQ=; b=pc7jAhOquPjNwkYOO5MXnAhpl6o3bZCqcFcKqPsA+pLYqjQIPoxd0zt2ksDsQxoOgX YBXIESDLjh9t0VLmwFj0sPu5eDXiDCIMjp8ZLkVcnXLRrV6infJL6nAF+Dmrw+OiHHtb +8VczmY0Iy7FDkJjoDieIemP4c6xD6fjJuT+DtXl3zro1B7oIcHzXNn3VeoO97oJPQQS WTW8sYGAH6yQEaZe3uBfBiCSSRMSi2J7w0xwRKTxpjaUeaKNpQRHaSqS/602b/j2uvoE ILZKVwRnU15xu97mJk8hyKZa5EWcZkEcCyf6M+45UG/f9RHS3NZJay+qrvm6vp9PXBAT km/w== X-Gm-Message-State: AOJu0YwEVQrZ18Z88zruc/sGKbGVp3gs9znI7aW6ne0nKOeswOcb690x wRBqCpFmDY1+RgRLOKE2LKum0BxKkg2ohynHw2qeOUG9lZCHRip2hPwVc6IAq532RHqZBwmP+8V xisLXQoECRy1ltoUdoC+5dxDvW1a2jEqkWOvmjyeFwwvrbUPB8pUFU0tv/keWtfz44I0Wvz29sr o= X-Received: by 2002:a50:fb94:0:b0:52e:86b3:a4a6 with SMTP id e20-20020a50fb94000000b0052e86b3a4a6mr7142412edq.29.1696590901825; Fri, 06 Oct 2023 04:15:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6EbP2XHGzx0g9RoCqd4r6jdFNHqNj7iRo3iAjSK83fQOGlZZdMaacES+km8i5CQSPbCngiQ== X-Received: by 2002:a50:fb94:0:b0:52e:86b3:a4a6 with SMTP id e20-20020a50fb94000000b0052e86b3a4a6mr7142400edq.29.1696590901504; Fri, 06 Oct 2023 04:15:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/26] audio, qtest: get rid of QEMU_AUDIO_DRV Date: Fri, 6 Oct 2023 13:14:12 +0200 Message-ID: <20231006111412.13130-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com> References: <20231006111412.13130-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696591056699100009 Content-Type: text/plain; charset="utf-8" Default audio devices can now be created with "-audio". Tests for soundcards were already using "-audiodev" if they want to specify a particular backend, for the others remove the last remnants of legacy audio configuration. Signed-off-by: Paolo Bonzini --- audio/audio.c | 12 ------------ tests/qtest/libqtest.c | 4 +--- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 73b65dc3b9b..e9815d68121 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1690,19 +1690,7 @@ static const VMStateDescription vmstate_audio =3D { =20 void audio_create_default_audiodevs(void) { - const char *drvname =3D getenv("QEMU_AUDIO_DRV"); - - /* QEMU_AUDIO_DRV=3Dnone is used by libqtest. */ - if (drvname && !g_str_equal(drvname, "none")) { - error_report("Please use -audiodev instead of QEMU_AUDIO_*"); - exit(1); - } - for (int i =3D 0; audio_prio_list[i]; i++) { - if (drvname && !g_str_equal(drvname, audio_prio_list[i])) { - continue; - } - if (audio_driver_lookup(audio_prio_list[i])) { QDict *dict =3D qdict_new(); Audiodev *dev =3D NULL; diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index b1eba71ffe5..3f94a4f4773 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -421,9 +421,6 @@ static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu= (const char *fmt, ...) int sig =3D SIGKILL; procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig); #endif /* __FreeBSD__ */ - if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) { - exit(1); - } execlp("/bin/sh", "sh", "-c", command->str, NULL); exit(1); } @@ -464,6 +461,7 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) "-chardev socket,path=3D%s,id=3Dchar0 " "-mon chardev=3Dchar0,mode=3Dcontrol " "-display none " + "-audio none " "%s" " -accel qtest", socket_path, --=20 2.41.0