From patchwork Fri Oct 6 11:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729976 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447791wrp; Fri, 6 Oct 2023 04:17:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEAwDGiAiCFAgfBYKRNaaB3WTo2G5eoWm9yfSVLKc0v5kGchoZ/Eccrr2jAvroGY90Oi7i X-Received: by 2002:a05:6871:726:b0:1e1:371:c3b2 with SMTP id f38-20020a056871072600b001e10371c3b2mr8510086oap.53.1696591053702; Fri, 06 Oct 2023 04:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591053; cv=none; d=google.com; s=arc-20160816; b=u6XLSqe2ZKjo8By90MdVmc/TN+yK5TsK7GUXIVYgKugF+hHJh1vzPg6k9efP3D5v25 Pm8fpx03lSSsBoYbsjcDqqQkn6m1SfPYbv7DIxlWRa1lR8EDBtZY4zRXvCXvoBhywuEq HOXWken0RMO5nP8bgGy0AO/ex+MHSd/rZxgG1FvpuNwvxrXYaSCVld59nsgTCYEfmOOR rXaNfLQVlzkEy86H5XQXKqPCm84HpnNiWMRSYEG1SLVvg0x35lXgjWL7dCtApzQDHfd1 lJ7wwHEueWe3G7xZThQfThZj/rokDsN4kDlLDSNx1WXvUyYNH/SaJbWlj/CKil4+HyCJ mnmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3ih1ItFgUjyLDwAKRKghxifXgQduOcEOb4rpNW8gc4o=; fh=v4MrmpPai/aPgRldxqyttF3Tdq5lpMw70iKdNfRd+cI=; b=T1/p5tR0Kt0jmy41q9zGzY6IhkWsWKZ0wV23rL12jY34ktJuUffNEs/XkR3OxxMF36 Z/GHVK+qdP6AKSQvH1B2/u/LNzQp8M+i4CW/D0yPmHhzCj7l5EY1NVgsvqMRD0cVcpPU wiipd6O936srRLqOOFY7BEjfJp8YgQxROmXwrcLkriGlXINTh1UqbU5oEYVahZ44Ovi1 zFDnUioAF56lbCKWTaUj8PJ4cjRIIYPum9Jeq81f6Atvb0V8humXL3pMJtcsC8U5NduE l7nLmQgCjsl//WcPlsmboiRavshPVW6w0SDCZ29oKkB+W08ortR2q0zlfrZMtAeD2eiv jIiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HoWAs8l/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o14-20020a0ccb0e000000b0064bbe315095si2150781qvk.68.2023.10.06.04.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:17:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HoWAs8l/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: tDXiFfykN86r_aCk5vHqzA-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ba0616b761so7893566b.2 for ; Fri, 06 Oct 2023 04:14:17 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 -#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); /* Host specific functions */ From patchwork Fri Oct 6 11:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729972 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447245wrp; Fri, 6 Oct 2023 04:16:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEes0g2mNWtaFEKlm+4wp6ACq/yi2f0OV/oZZusgx5RpfK7giwv992FEJ4RiU57RAe4G2Zi X-Received: by 2002:a0c:cc01:0:b0:64f:50c2:d57a with SMTP id r1-20020a0ccc01000000b0064f50c2d57amr8069054qvk.28.1696590979369; Fri, 06 Oct 2023 04:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590979; cv=none; d=google.com; s=arc-20160816; b=GUj13n+QezduoeBAamYDO/mjMjbxqFpH0+WsURp1SdGTCH5Ug72Id2GhOKgudy7IDm 7XDwH3qtuG5ZkNX9ngqUOtLBwRhgtUNAqgopVrNvGgAI6CJiDFGvWgQ+QEcnKJoQ530L S2PKuHmQOY2a8YU7LygaBa9wwhLIhtAzuz4tLapSABDRxj3k5VeGqGeZaL0WzvNHp75X MVmj72N4Hoevt59fTKqj0HYjpJcACQ6tQINUaQmGEZzMGgkfSwGnh7g8+YvtNST7JHyM qKdQsMUm8saqiT/v+PR+xz3BDlACKHrApAD+uLxe+6r56swbrtFzMcsiDf51YHq525ha hEmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zsB4uEpw6TQ/yGY1vvqEV3rLzLTAOPIU4fgZDEtmCyc=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=bocCa4K7+4XfVJX+3hIBA4DL8VTJrZ3kSx69cdZVK0eBtAlvOuxi3i4mASMt5D6Jp7 N+Tt41Gqv/2IPINSDGMcdjbTraQRd4SvPpyiO61kcExOosGLR2NyFqHpGOg0G6g4XurA WE+zcjZHj8newzDVzYvOehrgjHazB2fUuNzUcvlBJ0MIPjug/bGByUqzx86l5aJrZNaC AVDx1zk2Rl43u+6TJaYpYGj/Qu/l/Hj74Gvhi/4NgUtny40wuSwTB2rMV6SEB6ArtLpo oEKP/7k+OMKCukyKrSzj8z1k9eWjkJPHB5+Xph154Z/IbkhXog7qTJEmLCxHa5QKpm+D Uh0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AOfAOVSE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m11-20020a0cac4b000000b0065b0541ddb9si2155281qvb.93.2023.10.06.04.16.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AOfAOVSE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: m1oqScArMbCmr5I0OXYnXg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae7663e604so168533666b.3 for ; Fri, 06 Oct 2023 04:14:19 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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" #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 */ #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" 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 +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); /* 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" static bool xgetbv(uint32_t cpuid_ecx, uint32_t idx, uint64_t *xcr) { From patchwork Fri Oct 6 11:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729965 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp446493wrp; Fri, 6 Oct 2023 04:14:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmp4sFS/s7cGU6ONYUNI4Z4WuMzluKaQL0WOMHDtK4Cy047O5uxt/yjhXb7VCmpH7r5Qvn X-Received: by 2002:a05:622a:15d0:b0:418:1a08:729 with SMTP id d16-20020a05622a15d000b004181a080729mr8510740qty.10.1696590887925; Fri, 06 Oct 2023 04:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590887; cv=none; d=google.com; s=arc-20160816; b=mz6Tss3kmYyixhHOlTSUAhgSRrolXuyBXKX3Tf3bQw/LbSoXvRucD/rTziNeRv17qK Z85SwoF3OEvOWkcpPW1h7YBAhUmNdcVro4sEAZwpapLIdBSL3yK5Lsma8aUv9IU14dvs Vht4ZzYaJFsE4ezDbwFAyQ3i+F42W6WMD/+gMRlAdn63Fy7pU5EqQo31Da2QSrVnZuTt ErheT6LtwgGp7AZh491f80T+8WMRF5ij/melAWIRqyLTavFlkoLQuHMH1yHolCCu6QMB qukz7Y1Fo8GwCvTQROG1L3t2/BadoOre8ZNZxkfCV57K658i9Vir/BDdnniJXmF4x/ES NxDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VQp06QznhTp32bkj6DiTtyEnXwB982LrJKbC153Y+wQ=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=H/7UOEdly3D1WxQNBexdck4+3Q7WWNWirhpnPgLlxqsQSg9Tkob+1AFkHAUGqyrUB8 46zaX9GR/3SGHOjTLje9/AMba3qA7uxcKuKiYZhx+l27A1D+Qybz9L8MQGgSiu4hJi1N KfPnNxHEHdHU3nDnzJs42UOITSfwGGY1dMjvLw1zjgpW0NrNHT/lbPUj0bG8MVDEXR/I LNQGO5FlkAgk6w7nBquEuFL+dB/ujuJbDFWS5xRVZWvRIFl2nNCF6iH4llT+bxoBqWWv Y2y15LLlRNoopQf9/jDikhgTxfjSFkt+KB5fAkxyQCjbZZ//pDuXxC96Jx55w9Dvw8w+ ntHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EoxGSrat; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g2-20020ac85d42000000b0041812c64682si2249645qtx.112.2023.10.06.04.14.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:14:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EoxGSrat; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: UYdrf6uUOE2GyqdLrFDD1w-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso174290766b.0 for ; Fri, 06 Oct 2023 04:14:22 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 vendor1, CPUID_7_0_EBX_HLE CPUID_7_0_EBX_INVPCID, CPUID_7_0_EBX_RTM */ -#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, uint64_t val) 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) != 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) != 0) +#else +#define LMA(S) false #endif #ifdef TARGET_X86_64 From patchwork Fri Oct 6 11:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729966 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp446621wrp; Fri, 6 Oct 2023 04:15:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGidzPPb7O7bcBfGUE3u5ZjRqJUdGrJ4RF5IHnFgmYOEBgdHnuhSGbnjHPOqQ9Oojf6vFS X-Received: by 2002:a05:6870:1714:b0:1c0:2e8f:17fd with SMTP id h20-20020a056870171400b001c02e8f17fdmr9117664oae.40.1696590903499; Fri, 06 Oct 2023 04:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590903; cv=none; d=google.com; s=arc-20160816; b=llxSEkfiOzwRCdh0m1lcR4fJC+fAQsHcf8APcVkGlq7a/gon5yd8Li+WdA/4piHaR7 zm+c1a2EfRuEvHEexyx5dVFeO/D6a8LxfiDUf5Rwe+tgPRVDCOcBV7+Lr2PXnh2R5hCl glti+6q5906EoKv1gAoNA/1HI+9rOzYkR3RXeK9RVhVPxky7tEltgmirjE7deCEgd5QY HIF2A23cb7y2edUHHATEdkZGW+qdDoEoliRkBCgjPPXAyUqGZGLwE+AGsRrj3Gq7PHup 4DqFEKeUunAU5jPtF9ZQ+b4Rynu9YgejClPkHkF/LgGnGs83lB/jmiggSFB4TEP0/VL1 DgHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iSaoZDLtMbdcEKV3jUJN3mk/qKz/NtrRlOhHUjSJjMw=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Ljj10/txoLSE+LMFqoAGrcEcfLPdvCu4sCkswRD0UXVlNNb1P3Wz0uGSLvLk89x9cd d8rNdYIRlWo49FDd+Phdhh1mGWErRVjovonaoFkTjpd5tlr3VJePvQKOUzumPC6Q7yUc BBThingUsZJWN/QdNji8MP55WhLxwQ32+9kKimtxiBcKTgF3UtMF6kXHtih1gB/R7tmK tGQyxwLEPpIXVbCXuG418UvPvWhfoJMoSSQcHOWU26l+MGdNRYOAjdHGsBntZLG5Vhy8 MQ9U5JHeyaIX5vEJ58hQCN9JPvHhEP9pAEzd9/b9oS8itwx9l44pFJMDF+9lWKPuEuqP f92Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JHtf/In1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d4-20020a0cdb04000000b0065d067f07casi2193567qvk.134.2023.10.06.04.15.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:15:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JHtf/In1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: CXA96p1iOwuvW8DF3CmAQg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9adc78b386cso172066866b.0 for ; Fri, 06 Oct 2023 04:14:24 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 -# softmmu.c +# cpus.c vm_stop_flush_all(int ret) "ret %d" # vl.c From patchwork Fri Oct 6 11:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729971 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447187wrp; Fri, 6 Oct 2023 04:16:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdWzA3ysQqJvA6Lg/MXNlFpa8yOqQlyrE1ekK2zYbKFjXhEPQ/cxxRLQiqD2WKVnW9Or+B X-Received: by 2002:a05:6870:a448:b0:1bf:61d1:a4d4 with SMTP id n8-20020a056870a44800b001bf61d1a4d4mr9214717oal.6.1696590973389; Fri, 06 Oct 2023 04:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590973; cv=none; d=google.com; s=arc-20160816; b=iugRgw5BwAbSALqghm85m0kEAT4NdzA3GZU5BzvjM+wg2lilEVaQbfBXd8lyOptvH6 hsoTH90T2hahjTTJAocJEUHrZd3H4N9LueQ6Ot2s4uKrkx1g7xcb8Ou/HhBQcbE46L2/ 87obBTNZvfU3okES0xAOLWJhCiZVEMz3gb1jTdTpGB/5gigZvQjTCTqCG7OedUGEFhUC dCUluN9APFhf0agy/RJ02kEEWzuQ5VnokfEKzhpNvpZQMbMd+htzrZ0IeWflxnRm54Fq vmCWRxIGrS7DBhLn4E4d7KCvSCb2BOeSU7pVIMt/XCkyLICFgxmHa75D52LbEOKvSm2L Flbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Luqbg0iv9QomaP+bzgEzMOtbMBnMckqWwEvz6p/CP1I=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=yZ6hK8kpcRQEBNcvD+h2CUyKnYXoqY0wqhIqMtASpsdmrxIwyrnVFjqgLb7/0hyGwV Ooeli9gYJm6uJbYRnzWccRAmU51Nfs02LQtjFjvrULawVrZY22BFRVzCg9thC3kAvxz1 M7oq3b5wCGfZUVLpFFwpneIV2hbu5qu+qjw8tnTd6swRrOyjufgNkM9e5cXbi5PKc4rm Nu5D9SX1BPKAEzCRGsfKznJe05B0+JVi3cJGtGX3M2JJfTYrzTpDH8WmHPan5uteHHi3 xlzNFR67GJRrYAncy1cd46NjgWSNZI8DSdpizrSvrGjoqLvaPIIOfj6ol7cZjp6DbcdF OCqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PJAgPUUy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m3-20020a0cdb83000000b00656545e238asi2158344qvk.177.2023.10.06.04.16.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PJAgPUUy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: u4IS52XhNbyBKvpAH8Gnrg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5344aaf2703so1722151a12.0 for ; Fri, 06 Oct 2023 04:14:26 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé 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="--disable-docs --disable-tools" - TEST_BUILD_CMD="" - TEST_CMD="make check V=1" - # This is broadly a list of "mainline" softmmu targets which have support across the major distros + # This is broadly a list of "mainline" system targets which have support across the major distros - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime" - CCACHE_MAXSIZE=1G @@ -197,7 +197,7 @@ jobs: $(exit $BUILD_RC); fi - - name: "[s390x] GCC (other-softmmu)" + - name: "[s390x] GCC (other-system)" arch: s390x dist: focal addons: From patchwork Fri Oct 6 11:13:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729969 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447173wrp; Fri, 6 Oct 2023 04:16:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/1LQAt0PjdhzBAoC4RskARl64oPdTnERTlQYLkwsVNoG2zpseNK6sNsW0+wZcCt5vyn7O X-Received: by 2002:a0c:eb07:0:b0:64f:3795:c10 with SMTP id j7-20020a0ceb07000000b0064f37950c10mr7567334qvp.10.1696590971840; Fri, 06 Oct 2023 04:16:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590971; cv=none; d=google.com; s=arc-20160816; b=JipngayiaJEvqcLqB4gGqLUrOmcDY035MgHIK/v4JzyRW5bQ1c4m5lY1mkfXWRVK7X v6wLQqeBtJeeVKz3M8kCTJ/fYQuH3CsmY08A4pIfqCZ/PDVnP27mZtVOlRgwkcNaqCAK 9+9daVZ2wACuVOLK8DgPMQT2IJJagrTTH0JdaCjno2TQNMPmonk7+P993okAhzOBJua1 BL6N6gOi7FUVdOT5m18hPl/iY+HsSGrEj8w5h2Sdq92Y5YRrR897ZFcH7nhOLy5F0+yF SG+3PdH96qkUEvdTo7a1Neb5tpmnxBpLctfnRdJI1HYdBTrrkvS464FqCDl9xJQDRsmq H9fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B6fm9E/O2tM3qMMoTzowAunSSCopmIRl6nWdSkz7Ns4=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=qMEYTdszqLf337JFRBoGlGiqcTZ+LQWFm5oRH3SP9l7ex+NDOQ1AY2LRFx6SWldTV+ 6zfxB5pmzEZHSoJZSCO8nZSOpuSZlT4RPpY1NhV1K2yJ3n7FK8P/ZuSZd6MD0cSR5Fyd yhLQVfs/JMA+923cLdv/5wghcqjUA4+wz5S8H7u4JZUa17YAO5B/IqL5xykfOqDL7qIf OK2yVDqvYxyu2+7xnfT68wkJvBhyWjNZewNi8/Lylh+hvVsCaNlCCZbr3S5qq2PHzdZW m+HycptsewkYDFnIQO+mWBHN80eIAg203VYBULxAOnPXCU7jb9Zg1NNy4jVJZaTr4TnK arIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ARtTpIe1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x5-20020a05620a258500b0076762f87d06si2151083qko.784.2023.10.06.04.16.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ARtTpIe1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: 5gIW62gFMf-fC0OEtED2Rg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso174293866b.0 for ; Fri, 06 Oct 2023 04:14:28 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé 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[] = { 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 = UNASSIGNED_CPU_INDEX; cpu->cluster_index = UNASSIGNED_CLUSTER_INDEX; cpu->gdb_num_regs = cpu->gdb_num_g_regs = 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 = 1; cpu->nr_threads = 1; cpu->cflags_next_tb = -1; From patchwork Fri Oct 6 11:13:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729974 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447345wrp; Fri, 6 Oct 2023 04:16:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFa8En0AZNabZOhEv/z2XK32cVR2YBewYuzfI2N6VDhO57TQstwB/d2WetauxiXFhrzO+Ng X-Received: by 2002:ad4:4428:0:b0:65b:7a2:eecd with SMTP id e8-20020ad44428000000b0065b07a2eecdmr7659681qvt.61.1696590991995; Fri, 06 Oct 2023 04:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590991; cv=none; d=google.com; s=arc-20160816; b=dDbCv0OtPt2QKE4X+l89P/5JAw6F6NbcWafJLVeVx/KdHswyng+Y2Qyf+pXSl9b0Rt x9Ob42wLwOkrQJ3YA+dQG2i09iQ6tNTp6J0KtfLbyO+oyeQtmTwA6K+2Jq+RQIhR4ZNT NnpQZ3pSu2+EO7iTZi6XEeoyWt4ydPLO9ltoW9Ni67111Q1uvS9KPnrk/GtUdVyz9a0m pOyt/Zeic7cFl+FIzLQsAD09JPz5kxfVru3LnCbKTZNQBzF0g76o6ZsnhdkABaLqohfU Bab8Hj3X5S0w5m3GOSOR9pgJZF5ruIIayNuMPwxncpDKIWJAFtFgNKx7VGzZj/um0AZ3 0svg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mrLgVIQkAHjAMRqFWa/jP4n4ukjcbGYSSbVn59AYU2E=; fh=tt+3ECGW8cDEhVx2HU0Owtb2/5U3Hq1G+1swpphCm4g=; b=GHVLnB8yCjfg0W7thLpQ3NRflOBtIvxQ0+I+xmGTBOZkb2N4/ze4DqhniMEuWsK8oK mxD6mjjbDhcRVXM4ELUiC/UswswyelAdneX/KoW2z19+R+Tb5/pAOgIErFqaLF8VEQDV UDqeK9bWh+hBC+uk3MmdZWvlrIKAT5LRK1Nxn8MKNDgGgt3b8RokNoq7FK+24Wm9qlVw 3xiCuamDcVl+dQGSmLwaUmaiBd8Wm8gJ+MDLgaITyLJwV3mhfiYk5uA8YagJzR9yREye rAuWePoPLRqRMkoZWzDJX+bnDHzshn+V9obRsEsAwcPIEi5+nGYrBIpC/ksyC4yYSoBU oDfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=N3JzYM7n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a21-20020a0cb355000000b0065d04b7c43bsi2195242qvf.180.2023.10.06.04.16.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=N3JzYM7n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: ywIFhpXPP0Gri7xJ6nAT6w-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9ba0616b761so7908566b.2 for ; Fri, 06 Oct 2023 04:14:29 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé 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, } /* - * 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 for * 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(); } - /* Run QEMU's softmmu main with the fuzz-target dependent arguments */ + /* Run QEMU's system main with the fuzz-target dependent arguments */ cmd_line = 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 { /* - * 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 *); /* - * 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 */ From patchwork Fri Oct 6 11:13:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729977 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447919wrp; Fri, 6 Oct 2023 04:17:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExpU+U7dLnP8Jnk2kZZF7p/Z02ftMbci7WvTQheHieZR2lTSR9QY4orxVM78VkvLE2h1qf X-Received: by 2002:a05:622a:1aa0:b0:415:15bd:94d2 with SMTP id s32-20020a05622a1aa000b0041515bd94d2mr8290449qtc.43.1696591072065; Fri, 06 Oct 2023 04:17:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591072; cv=none; d=google.com; s=arc-20160816; b=F6f3SvuTkf7AMDDc7vZDNyQzsZHxccbfO4nlblQRiKMmUoKFO+pSX09wiyA8jPwNgQ 2W967EhXC2H83tcMdDWacHozpPKZj0CdJmErjS2QinnLI+r213SRTA8cXsr/yF2RuEkG ovb7UztQtTFW+al3zLUcQvylsZy0M17G3uBrpYDnhmX/KVivH/bf4fkaxuKKf+dMrFn2 mFaWlbrnG7WF4G3LFk4+ml/upXjYOiiC/TrvXVmEGDjvrDXB5x4KXhM/1vR5Kjqu4z8E dE0fNxZBlP/rupHKgaRNeZMDJjMvxZ0dKv4Fw0P/sTB13s/FcvGGLV2n2dXiWKiCWYGT P6eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gc5d66zj1z2mWfgNRF83cak7oV9eJ59PKQmCJrWqMiY=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=tf0WQEHUdkfaRYIPvcxrKe5c58QNN/hqGwoHBHWSkOmsE6QmgrLGOSbo86WTCTBGus wOOVP8BxYrONWm3QtrD/DSeYXgnPCBa1M77dQAaLE/OItmvWZMbs4sYQFK6Lk/I3M2Q6 VMSmD60xjx+adQtJQmfwjPYUW/NWV2w2EVk4VlisaLW3tg7Ki65lj8X04LOwBgz9P1Vf 54yCn68EJpY1VK63NJnJMYsfCVqZQjnXrrD8HEKrKSoq/FCpieiaYMrrKrFgQlzxOikf VUe3IlQQ53u2ghrQKRgi3LJdPKaC2UsaELtCL8rI+BL6Hpc/L80M2sWngWWlYEcfxWJj MzUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E8TuXKXA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h14-20020ac8584e000000b004196b9a23absi2162307qth.145.2023.10.06.04.17.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:17:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E8TuXKXA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: L8L747C5NoyAbRVPpqu3kQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ae686dafedso181629666b.3 for ; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé 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 */ -/* The softmmu versions of these helpers are in cputlb.c. */ +/* The system-mode versions of these helpers are in cputlb.c. */ 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 ~~~~~~~~~~~~~~~~~~~~~ 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. 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=80878 * * 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, unsigned idx); * * See tcg/README for more info about this TCG operation. * - * NOTE: In softmmu emulation, direct jumps with goto_tb are only safe within + * NOTE: In system emulation, direct jumps with goto_tb are only safe within * 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 only 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 *env, target_ulong addr) /* * This function checks watchpoint before real load operation. * - * In softmmu mode, the TLB API probe_access is enough for watchpoint check. + * 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 /* - * 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 type, #define ALL_VECTOR_REGS 0xffff0000u /* - * 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, TCGReg datalo, TCGReg datahi, int movop = OPC_MOVL_EvGv; /* - * 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) /* - * 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 = declare_dependency(link_with: libtcg_user, dependencies: tcg_ss.dependencies()) user_ss.add(tcg_user) -libtcg_softmmu = static_library('tcg_softmmu', +libtcg_system = static_library('tcg_system', tcg_ss.sources() + genh, name_suffix: 'fa', c_args: '-DCONFIG_SOFTMMU', build_by_default: false) -tcg_softmmu = declare_dependency(link_with: libtcg_softmmu, +tcg_system = 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 /* - * 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 /* - * 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 splitwx, Error **errp) * and then assigning regions to TCG threads so that the threads can translate * 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=tcg,[...]) * 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 splitwx, Error **errp) * * However, this user-mode limitation is unlikely to be a significant problem * in practice. Multi-threaded guests share most if not all of their translated - * code, which makes parallel code generation less appealing than in softmmu. + * code, which makes parallel code generation less appealing than in system-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) /* - * 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) /* - * 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) /* - * 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 documentation * 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 context + * In system-mode each caller registers its context in tcg_ctxs[]. Note that in + * system-mode tcg_ctxs[] does not track tcg_ctx_init, since the initial context * is not used anymore for translation once this function is called. * - * Not tracking tcg_init_ctx in tcg_ctxs[] in softmmu keeps code that iterates - * 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 = &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 += -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/gdbstub/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/system/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 */ 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-specification.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 = \ 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/Makefile.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 # CORE=dc232b diff --git a/tests/tcg/xtensaeb/Makefile.softmmu-target b/tests/tcg/xtensaeb/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 # include $(SRC_PATH)/tests/tcg/xtensa/Makefile.softmmu-target From patchwork Fri Oct 6 11:13:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729967 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp446737wrp; Fri, 6 Oct 2023 04:15:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5vDL25dQP2UfAbyDt837gpiqmak7ZETydDO5EMz3dM5wQBhd0cCPr73s0TTmes9D1MBcx X-Received: by 2002:a05:620a:240f:b0:775:6bb9:2956 with SMTP id d15-20020a05620a240f00b007756bb92956mr8341192qkn.67.1696590915223; Fri, 06 Oct 2023 04:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590915; cv=none; d=google.com; s=arc-20160816; b=XLLs3BpTXyUU5SA0Isu/5eB0NUBCXRTPRFzUuGhH66lT1ovWIS/E0Ywmuu1Zh2s198 K42nMCdRXic7HtkS2m2CslVLORwyoBeaW9Cw2+rrtC5oXW2zzKwF3HcF8uCYAt7gUuo4 4O5SIXO88gZ8Zt6m0HM96a3ZajK8fXR2thiwRt65V0LndxaEYktNvTF1+kmz0j6UwJ3h 7r/eIJ5TUp/1bDOVpnJQde4uB3rEbfxFE/r8R7JbKFtXSdfrgt3SEXZO22/86EG3KSzK JwGHg0Oi8Zcl2lHXLN+0QeiOnSafH1t1EPb7VCdex8ZorNnzBX9XSMTYy589sUqSqZgH 8HMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o3cXt43+FQ9EnnJkDNOxNY5f5+ZzR2mdEtgZC0Jw9AQ=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=lLXxT6jc2NK20FujXXX0O98awZJ12dxXlKKY1FyiVMgtnIgwMjqRBQATPjl2pSTlpg ix2sPVVmMp6E3/1K7Gq4fe1F250Sfodz1dRXQyrklPwI+LWOWN/lAUg/kGrE6r4ge/Wj nQH6W7gGkG3J2RJEd3a6E7mkNWbFLNvrLWYOXc3vWY/vX/Vzmx2aRuJmrbApfIT09DLP dQfjfUNUTh47sM+F0/Ag6nlLZ05fQPZ4AKmBxh8HSPfBsXgSxzakxC5lIAjDFijsbBcm E2eW8lDyEDWmyKCSxjKDNYSOcqNs4gMaXL1O226Lw+xchvqYDswxhsHfLZGAlCDTFMyK 77vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JdEaUXjW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t6-20020a05620a0b0600b00773d3c0bcdbsi2156526qkg.427.2023.10.06.04.15.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JdEaUXjW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: dbh-XtYZNACf6IpNFZNfxg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-537fb536554so1818171a12.2 for ; Fri, 06 Oct 2023 04:14:33 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-ID: <20231004090629.37473-7-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- accel/accel-common.c | 2 +- accel/{accel-softmmu.c => accel-system.c} | 6 +++--- accel/{accel-softmmu.h => 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 => accel-system.c} (96%) rename accel/{accel-softmmu.h => 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" #ifndef CONFIG_USER_ONLY -#include "accel-softmmu.h" +#include "accel-system.h" #endif /* !CONFIG_USER_ONLY */ static const TypeInfo accel_type = { 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" int accel_init_machine(AccelState *accel, MachineState *ms) { @@ -99,8 +99,8 @@ static const TypeInfo accel_ops_type_info = { .class_size = sizeof(AccelOpsClass), }; -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. */ -#ifndef ACCEL_SOFTMMU_H -#define ACCEL_SOFTMMU_H +#ifndef ACCEL_SYSTEM_H +#define ACCEL_SYSTEM_H void accel_init_ops_interfaces(AccelClass *ac); -#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')) 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 = 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 = 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')) -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) From patchwork Fri Oct 6 11:13:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729973 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447344wrp; Fri, 6 Oct 2023 04:16:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHn9+MItZ+DeqO9VJTPtt+L1nHbTjW2TDNq6ntO5bE17cvNMu1oLaWIPiFmTfgIvCuEjk8/ X-Received: by 2002:a05:620a:17a5:b0:775:77a5:f20b with SMTP id ay37-20020a05620a17a500b0077577a5f20bmr1466702qkb.59.1696590991778; Fri, 06 Oct 2023 04:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590991; cv=none; d=google.com; s=arc-20160816; b=lvK0lWc/gBoVko58sTiiUhuGYgE+ydBbLNVfDwx+pqPmZI50/r484nUThfMU8w15ce TEQdivL4cYaIZWaE0xJlXd4aDzI6UpoPZSiXhdj1IQzcY/9artdzHwsV5iUKTV8uVrYG xnmBAij9KHxgfV8caolWXXveoL2GL+SSTqj1NcAdWfoO8olTVsATuHBcgcShTjvIJL76 Ly8KgJIbp0AoQnn17i4x1Wpd4NBpjS5kTLivWPqqNGvZ/dei/qSIZ3rFRJcv0PUIShAv +TZUOXDpTjV9kUuBUeqlxWcmXEvCgq/LVlogVPbAszpcEL9QBqTe+izYRvTnNbVtbqPu O61g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0xB3F5N3hazXwUg7/Q8GgLwNzUPETqU4qEAMwqj5k+M=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=R0YVnCYZdyMhH09Vj6a42DUVBLD5JFZmFFvJit+P+O+I6+S3Ig4zkB6MdC0t/U4m55 i1pnrqkHliXo/YTQ4wVnOORQ7Omm0Wzb5KP/CnXLe7GL/7XclN2mkJXc/7vWuRKLuKEi V3b7aJaBnm8T4L6eKb9b5orMB6lWekDP5mRDpAKX99YFw/r4YUSmaGamgUPyZ5v+NJo1 22ABzdiZBMyCp2Ngnsp65+nZ6KUVnJnHcBK/B/pKcgMrV8wf+6vh0b8hfuZzi4iiI504 1WnrfmaLz+tGXATO8HztGNAxHJ67/Ql2e07ZmYmE6THQv7i4TJMAVOGIGGjomfy5NtGs RXrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SuBu9ttU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id or14-20020a05620a618e00b0076dbda0e488si2221072qkn.84.2023.10.06.04.16.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SuBu9ttU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: 2Crj_WJ2PxyuoYHUr1mevQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-533d8a785a5so1817734a12.3 for ; Fri, 06 Oct 2023 04:14:35 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-ID: <20231004090629.37473-8-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- gdbstub/internals.h | 4 ++-- gdbstub/meson.build | 10 +++++----- gdbstub/{softmmu.c => system.c} | 2 +- gdbstub/trace-events | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename gdbstub/{softmmu.c => 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) } /* - * Connection helpers for both softmmu and user backends + * Connection helpers for both system and user backends */ 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. # @@ -12,7 +12,7 @@ gdb_system_ss = ss.source_set() # 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')) gdb_user_ss = gdb_user_ss.apply(config_targetos, strict: false) gdb_system_ss = gdb_system_ss.apply(config_targetos, strict: false) @@ -23,15 +23,15 @@ libgdb_user = static_library('gdb_user', c_args: '-DCONFIG_USER_ONLY', build_by_default: false) -libgdb_softmmu = static_library('gdb_softmmu', +libgdb_system = static_library('gdb_system', gdb_system_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) gdb_user = declare_dependency(link_whole: libgdb_user) user_ss.add(gdb_user) -gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu) -system_ss.add(gdb_softmmu) +gdb_system = declare_dependency(link_whole: libgdb_system) +system_ss.add(gdb_system) common_ss.add(files('syscalls.c')) 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 event) } /* - * 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 command checksum digit: 0x gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command packet with incorrect checksum, expected=0x%02x, received=0x%02x" gdbstub_err_unexpected_runpkt(uint8_t ch) "unexpected packet (0x%02x) while target running" -# softmmu.c +# system.c gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr) "Watchpoint hit, type=\"%s\" cpu=%d, vaddr=0x%" PRIx64 "" From patchwork Fri Oct 6 11:13:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729968 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447164wrp; Fri, 6 Oct 2023 04:16:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMxcOHW41S4X6eQ+XfId7zHQpOnoaPAhEaqpf8mO8e1ukcZJpPwwSXh2v81lfUFHfr64VJ X-Received: by 2002:a05:622a:407:b0:410:a249:bee6 with SMTP id n7-20020a05622a040700b00410a249bee6mr8489372qtx.14.1696590971082; Fri, 06 Oct 2023 04:16:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590971; cv=none; d=google.com; s=arc-20160816; b=aqdGUBg9aFkoYyHxx9z/hjuM52t2RWDolo0E39Cx4/QW4J2ThC/d1dj1BA9AK4iD38 o7To6cN2j0TvrhiHlz1hmpILb7QoYL+52aAnhr+q+cRnJ4hEkxbBYv/B9QS+ed4itqmz XbA8fdaEg7vqU40GIg5crzz7D1J3wpk+XIhmQbG7Rk0+hStXWXayOijCARxL0yRbsnLF 7fwNWjXuTPhGFUd0y7mkKmF/8zlWmqWvx7jPyry9ka9j5175yc1cSkn/7xUdtO0x/i7S 4gNFU/6j0ToN+jkwDchXATwctPImD2G7Swt/tmtlppDcZrlsZ0xdlxVUxPZPiQ7OCpc4 N8NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l4z5x8Uu4dREQUi7wI/K7/deSe5fP0uIUCLyqAJ6KbM=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=hv2dpmuCJ2c981ZUxUKevP+yqX5MAwz1dKI7PDGOF+ac2bCdfvuu4I925z1Z57vori 2GPzY1l1L6z0FNB/BfIL6asYD32MpOiARdjto/RwhJadk95R+IPFSBNvzowxv3YNcnwP ZJpRSMTg3VMtPS70UDo3XFCamXC14Oba5kfyC+RznH1E7ocKtJk3fDED0dWbdoqGKoYJ 3om4FzWBkzIALn8WOoqyN94QYnaOk38zeuvzPaWE69n1Ulnv89XoPfu/JdYYtxbNebsv kfchvzPiriAyyWh2YDxTF2I58cBnKnSztRS8VVC9JpOGLYkByjair1wxpYkCTZrJTdld x6rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=b0xSSwFO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h11-20020a05622a170b00b00403b977323dsi2231781qtk.18.2023.10.06.04.16.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=b0xSSwFO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: YR28VF1-Mj-ckhqw0Xu7wg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae70250ef5so351018966b.0 for ; Fri, 06 Oct 2023 04:14:37 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é Message-ID: <20231004090629.37473-9-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .../{softmmu-uaccess.h => 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 => uaccess.h} (75%) diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/uaccess.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 */ -#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 #include "cpu.h" @@ -42,18 +46,18 @@ #define put_user_ual(arg, p) put_user_u32(arg, p) -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) -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) -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) -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) #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; -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" #endif 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 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 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 @@ #include "qemu/osdep.h" #include "exec/exec-all.h" -#include "semihosting/softmmu-uaccess.h" +#include "semihosting/uaccess.h" -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 = malloc(len); @@ -24,7 +24,7 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr, return p; } -ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr) +ssize_t uaccess_strlen_user(CPUArchState *env, target_ulong addr) { int mmu_idx = cpu_mmu_index(env, false); size_t len = 0; @@ -72,16 +72,16 @@ ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr) } } -char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr) +char *uaccess_lock_user_string(CPUArchState *env, target_ulong addr) { - ssize_t len = softmmu_strlen_user(env, addr); + ssize_t len = 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); } -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" diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-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" #define HOSTED_EXIT 0 From patchwork Fri Oct 6 11:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729980 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp448291wrp; Fri, 6 Oct 2023 04:18:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6P8LDf6yEjaqt7CRuEXCbB7fO7m91RUEZk+9CoBrxCsXILUdg8zlfJ6T8MRqmGC2vTex1 X-Received: by 2002:a81:6c04:0:b0:5a1:cc37:7c91 with SMTP id h4-20020a816c04000000b005a1cc377c91mr8264763ywc.19.1696591123032; Fri, 06 Oct 2023 04:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591123; cv=none; d=google.com; s=arc-20160816; b=0Oc8SrYj+Pkw7dcSqOMbARC6u/WnMX8XELCiLK8YODqYX0F1LH7WzXTqOKQWbZeIe4 5DCesMuLH8V9E/XMfcxwLqQF6ibBB4M9OGwkamixUhFL/10BDfzkEilRwUbWqLKbh3Lh u/TDHCEV3g0MpvGooaIczbA9Dv0zN7u/9xhYRu6oUaaGkCRwBBxyepRCgmebZq6qUMwQ aii2icK4Cghyh29flFatsvoQEOPEGOrX51YTj35QUXiLMmvUxuADM97Z5RhvX+/vtX3D O/94OtGgFfVquwpz+ghYBU/9jpBzGOSgb64OT1kasQkGfMyaJv8PqX7mrlOqg+AyyYUH HvCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Bf5kliQJvODafTBVKI8xhSD2Qcuhj4Z5mREXuzd9NXw=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=A46ULZGVaEcLjI5q8UXJ3knkCVQobdERpyLmataSeG8sBd5Y3RA38JoI5dkAbBHIQQ nKTpKav577Z/fjur3Yrfm8jD9kTClVSY/pXzrsI6Fy+2hw9WxE61rIYuJd08GNX3JN59 GvVuIZh1kJ+a9LpYhDK4lMGoM/IlwTMYzzMTqqUr3Rc3vpV9NzOJcB6+FEb6RprZd6KO 65duBva9jNXB3tz1fk2/s8iOX+2RcOAMzfs6ANT2ZAS6qbaxbhLFJksmWKhNO4Y1zqhy FYDrqDcFajX3dWRAQv0P6Q9rV7xyPxF73jIWstBmHEwCqEDQzuqemObKAfbuA0KG4tvf XCVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="g/eU3R7B"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p10-20020a05622a00ca00b004069466b1c0si2195805qtw.562.2023.10.06.04.18.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:18:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="g/eU3R7B"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: U4dNbeNmOtenU8vMa3gZIA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9b822f5c156so171494166b.3 for ; Fri, 06 Oct 2023 04:14:39 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 = ss.source_set() +i386_kvm_ss = ss.source_set() -i386_softmmu_kvm_ss.add(files( +i386_kvm_ss.add(files( 'kvm.c', 'kvm-cpu.c', )) -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')) -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')) i386_system_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'), if_false: files('hyperv-stub.c')) -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) From patchwork Fri Oct 6 11:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729975 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447593wrp; Fri, 6 Oct 2023 04:17:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9svUqwFFGK8O1+BL4QdrsQ48af62s9NjukcUqkqaPA7qLjwYyBrzX+sQBtmpVBRxU2KNM X-Received: by 2002:a05:620a:3188:b0:76f:509:c78a with SMTP id bi8-20020a05620a318800b0076f0509c78amr8665795qkb.22.1696591024821; Fri, 06 Oct 2023 04:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591024; cv=none; d=google.com; s=arc-20160816; b=GB1o5rk/K+6YW9oibW95F3b47XgjxvQxoiwHC2eYSknHGZD5FHMD7so5XM3yMbTDev u/R929QqDsG5356ZEHFA3hiIK4IBGeA4bA6q1Q1Evcdpcg/1XKiwPaPBpUcpE+hqByOw D87McWC5yKK+bnHzhTeVgftyi/W/ZzQ9+dEXmMRh1lkW+JSfp1im5rciMEnksYhawsCK x6/btm4r2qb33sfznl3PnK3v/neYjKFRRTuM/LpWpL82LJ5SC2V4s5u69pmdCDutFg+S xdgoaDwtTZu+6VeqpjYRwFDPE9RG1b9gRvkbP1bJCD/s0uSiqEw0s6IThVuX5vxJRmvH Y2LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=09gHDcSD3eULArN3NZoI14fwVaKeRIz+n+d4TcIpJ3c=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=x9e3IpWOWRJshPPb2/7gnA12dG4Vd71h9YlQsdO4Zrf1qRhh22Ly77TMEzdujeWSJZ 4PKQtRi4vnwuFSxp/01iP2ldT4AWSDAe+dfZ6nSLTk1hRMV871Qlj5MlD4BCR5vgAGOY MlZd3sCPnc156CHncqZwn1Va8VOKfkRPbav50F1bUDRk1G945f4/1RgUxCl3QCNEB0hL 7QOF3b1d6iMupXcMkRY8p+T5x2vT7F3GCzjhFSfL/NLW9SqC6Tg6HPCDL0oEqVXBomNi P7PRnShUmO7K3QW3KDf5286AJ7eBKWSZbI38tyKzPBFYx0yaEfMWSxyJRUAZfZooE7me ISEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SKJUT7Vz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id vr15-20020a05620a55af00b007740c7e430csi2166333qkn.192.2023.10.06.04.17.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:17:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SKJUT7Vz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: x47MB7EjMW2D1pskb4GiiQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9b65d7079faso154473166b.1 for ; Fri, 06 Oct 2023 04:14:41 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss") for rationale. Signed-off-by: Philippe Mathieu-Daudé 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 = ss.source_set() -softmmu_virtio_ss.add(files('virtio-bus.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c')) -softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.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('vhost-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 = 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-mmio.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('vhost-vsock-common.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev.c')) specific_virtio_ss = ss.source_set() specific_virtio_ss.add(files('virtio.c')) specific_virtio_ss.add(files('virtio-config-io.c', 'virtio-qmp.c')) 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 specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) @@ -67,7 +67,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c')) specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) -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')) From patchwork Fri Oct 6 11:14:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729979 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp448195wrp; Fri, 6 Oct 2023 04:18:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRDxo5xH/hh7O7Igyy3GW+o8LBCIr5iZkQnazG/sGS8UlVaGyWgAyOcWYpmVZntngC+XcH X-Received: by 2002:a0c:f4cf:0:b0:64f:7fe6:bf1d with SMTP id o15-20020a0cf4cf000000b0064f7fe6bf1dmr7618951qvm.12.1696591108354; Fri, 06 Oct 2023 04:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591108; cv=none; d=google.com; s=arc-20160816; b=b4vh8B1TeTWs1vQd8BuetUHmb929+IsyJ1oW0ApT/5fs8gatEBtjktVa/NHBh+s4vF 8DmI4kYz6xLkiM0eNTRlrOjiabIXEVXgaVNXFOACCx7R3ZE5C5neNaSCxnttUkfqNi+4 OXhjRInuOehEFLcH5Se6KTvFX8EyS8TmHEqZObiQMDahcpyHspKFE8WVhroce68SlTmA 4+OVxCWqRTYMAZMv4duacD3HC6/73C13pGcG9yqOfQRdbunl9PV6c1TETH1OtlwplLUR iFbNlwEKYzy8Hl4tPBMOEQIXVAgZAm03xduMBfl/4DYTcoT7PaxFlNHCBp5JRQt/2w5R 9+dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mCVCUOq7aVspI9V9Yn5TanbFRt42+uPiRwJWugQqYU4=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=mwav93DmFVIFm7k1LWx2/E6scQwsu6Bk94oa8IYUKmKnbuLUO/gbKhxRoWnqXOUEhl JUv3TYvrlYbT7XOLnnEEJd5g382UFUHdu4SBMuAYgFP8v0k9nAZs9CNd26UQnlcNdFnV ipJ7FTQGoIxfzK6VlEiBu5FiC2Kdnttr3PygVfT0pdGuMOkZxuMDjbIUA7ThTibO4RO8 L9LoiBL0rquBGN6jVCEfOfXQ+WzRhE3+zV7xXUDaZ2NXOxD/TZrVGwLlb+VzDaJ6n1+s za0POkdsn0RXt9t5rCeMGPxzz7z9Fy5oeKn0QSPiyNFvBrSLHEbkE7A6apZ3XS56x7kM y0UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LbUq93gS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d13-20020a05622a05cd00b004197623ef46si2138837qtb.784.2023.10.06.04.18.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:18:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LbUq93gS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: WoaR15IgMMSlSMQck1vimA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-99c8bbc902eso169931066b.1 for ; Fri, 06 Oct 2023 04:14:43 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss") for rationale. Signed-off-by: Philippe Mathieu-Daudé 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 = find_program('scripts/modinfo-generate.py') modinfo_files = [] block_mods = [] -softmmu_mods = [] +system_mods = [] foreach d, list : modules if not (d == 'block' ? have_block : have_system) continue @@ -3510,7 +3510,7 @@ foreach d, list : modules if d == 'block' block_mods += sl else - softmmu_mods += sl + system_mods += sl endif if module_ss.sources() != [] # 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 += sl + system_mods += sl # FIXME: Should use sl.extract_all_objects(recursive: true) too. modinfo_files += custom_target(module_name + '.modinfo', output: module_name + '.modinfo', @@ -3597,7 +3597,7 @@ block_syms = custom_target('block.syms', output: 'block.syms', capture: true, command: [undefsym, nm, '@INPUT@']) qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', - input: [libqemuutil, softmmu_mods], + input: [libqemuutil, system_mods], capture: true, command: [undefsym, nm, '@INPUT@']) @@ -3682,7 +3682,7 @@ common_ss.add(hwcore) ########### emulator_modules = [] -foreach m : block_mods + softmmu_mods +foreach m : block_mods + system_mods emulator_modules += shared_module(m.name(), build_by_default: true, name_prefix: '', From patchwork Fri Oct 6 11:14:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729970 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447174wrp; Fri, 6 Oct 2023 04:16:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIWNlkrfrUDM71Vy32q6XV4z5Y5WBeobxR6OOiSRAdMq4wpNsO1ZC79qN8yfXVyaAxqWSc X-Received: by 2002:a05:620a:4106:b0:76f:1614:576b with SMTP id j6-20020a05620a410600b0076f1614576bmr8678522qko.1.1696590971834; Fri, 06 Oct 2023 04:16:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590971; cv=none; d=google.com; s=arc-20160816; b=yuQFXHGNDpo4dBrShqlppeT/6IEGjSWUOa1/S5j+3hSgyGshU8wk0e8tleOuT4R81t qTE06m5NQHowzQoArV3uPtFt6zY5KlfdTUDxdYZVpU7fkNRfk+hwhn++xAG3KtJrrNx6 iHGtUcz4V0rtmO5A6Ee424DRJIg9wwCvAAzZqam/Dfs2Kkq1ZidjFHEVecmx5dulDCQk GeGel6e4wnV48HbRRyzYrVzL3ofJeqhmXRJF6xgIyGt5JCWVCq4wJtlEE77m7aDSeEit FuKx2gL82kYdZFumm1P58ijQ4WCKIJeMAS3K3T/ElHpSJ/r/U75ukk/EwHblJo7EZyxG QTxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rOiT5Haq07zJc+LpYrAi9F7AEAvUR4uyjglw1xzimeg=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=m5g7zSzsCvNDFn98ykHNL3OCuEfeuUE8FRwWjTuByYgUfZACNMdqszJ8K/hp5/upoL N1HXbzLoBViWqHA1C5SBcYm4Nmicdlae+zX0Jcm4VdSt+gBewnga+xj725Bg19vBn4co xAMEWSXyTqDPgjS82cE0j69gWjtgN5/olNUAdjKBth3yVZ/gabEGUWYXtoU3grJJQ+5L qvnQngaVfS066jL8oyjkXoZwf0vZjlgLwDpTXIEX4atmZtkmaGTvXMGrf7sI57FKTj/z 3T3beOjAx1NxkYlOqNs/q83votUx6LClAxFwPe0hppYfj+IhSsSshbPu0YDRTJRRikIf ck1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XU7snQf+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w4-20020a05620a444400b0077055f2ec4dsi2327679qkp.250.2023.10.06.04.16.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:16:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XU7snQf+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: f6Vrja-GO-qR6u1qiAe3rQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-537fb536554so1818298a12.2 for ; Fri, 06 Oct 2023 04:14:45 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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. Each subdirectory in ``target/`` instead should add one sourceset to each - of the ``target_arch`` and ``target_softmmu_arch``, which are used respectively + of the ``target_arch`` and ``target_system_arch``, which are used respectively for all emulators and for system emulators only. For example:: arm_ss = ss.source_set() arm_system_ss = ss.source_set() ... target_arch += {'arm': arm_ss} - target_softmmu_arch += {'arm': arm_system_ss} + target_system_arch += {'arm': arm_system_ss} 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 = {} target_modules = {} hw_arch = {} target_arch = {} -target_softmmu_arch = {} +target_system_arch = {} target_user_arch = {} ############### @@ -3734,7 +3734,7 @@ foreach target : target_dirs endif if target.endswith('-softmmu') target_type='system' - t = target_softmmu_arch[target_base_arch].apply(config_target, strict: false) + t = target_system_arch[target_base_arch].apply(config_target, strict: false) arch_srcs += t.sources() arch_deps += t.dependencies() 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 = ss.source_set() alpha_system_ss.add(files('machine.c')) target_arch += {'alpha': alpha_ss} -target_softmmu_arch += {'alpha': alpha_system_ss} +target_system_arch += {'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 target_arch += {'arm': arm_ss} -target_softmmu_arch += {'arm': arm_system_ss} +target_system_arch += {'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')) target_arch += {'avr': avr_ss} -target_softmmu_arch += {'avr': avr_system_ss} +target_system_arch += {'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( )) target_arch += {'cris': cris_ss} -target_softmmu_arch += {'cris': cris_system_ss} +target_system_arch += {'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( )) target_arch += {'hppa': hppa_ss} -target_softmmu_arch += {'hppa': hppa_system_ss} +target_system_arch += {'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') target_arch += {'i386': i386_ss} -target_softmmu_arch += {'i386': i386_system_ss} +target_system_arch += {'i386': i386_system_ss} target_user_arch += {'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: [files('disas.c'), gen]) loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss]) target_arch += {'loongarch': loongarch_ss} -target_softmmu_arch += {'loongarch': loongarch_system_ss} +target_system_arch += {'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( )) target_arch += {'m68k': m68k_ss} -target_softmmu_arch += {'m68k': m68k_system_ss} +target_system_arch += {'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( )) target_arch += {'microblaze': microblaze_ss} -target_softmmu_arch += {'microblaze': microblaze_system_ss} +target_system_arch += {'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')) target_arch += {'mips': mips_ss} -target_softmmu_arch += {'mips': mips_system_ss} +target_system_arch += {'mips': mips_system_ss} target_user_arch += {'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( )) target_arch += {'nios2': nios2_ss} -target_softmmu_arch += {'nios2': nios2_system_ss} +target_system_arch += {'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( )) target_arch += {'openrisc': openrisc_ss} -target_softmmu_arch += {'openrisc': openrisc_system_ss} +target_system_arch += {'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( )) target_arch += {'ppc': ppc_ss} -target_softmmu_arch += {'ppc': ppc_system_ss} +target_system_arch += {'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( )) target_arch += {'riscv': riscv_ss} -target_softmmu_arch += {'riscv': riscv_system_ss} +target_system_arch += {'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')) target_arch += {'rx': rx_ss} -target_softmmu_arch += {'rx': ss.source_set()} +target_system_arch += {'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') target_arch += {'s390x': s390x_ss} -target_softmmu_arch += {'s390x': s390x_system_ss} +target_system_arch += {'s390x': s390x_system_ss} target_user_arch += {'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 = ss.source_set() sh4_system_ss.add(files('monitor.c')) target_arch += {'sh4': sh4_ss} -target_softmmu_arch += {'sh4': sh4_system_ss} +target_system_arch += {'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( )) target_arch += {'sparc': sparc_ss} -target_softmmu_arch += {'sparc': sparc_system_ss} +target_system_arch += {'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 = ss.source_set() target_arch += {'tricore': tricore_ss} -target_softmmu_arch += {'tricore': tricore_system_ss} +target_system_arch += {'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( )) target_arch += {'xtensa': xtensa_ss} -target_softmmu_arch += {'xtensa': xtensa_system_ss} +target_system_arch += {'xtensa': xtensa_system_ss} From patchwork Fri Oct 6 11:14:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 729978 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp447934wrp; Fri, 6 Oct 2023 04:17:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJwxhLQIKmeYdsQWSpKtMmmvXR8PcQxem5zbCylHZTS+FeOGv/WcS3Gse2uBI21u8qBiLy X-Received: by 2002:a67:e20c:0:b0:452:6320:60da with SMTP id g12-20020a67e20c000000b00452632060damr7476361vsa.22.1696591073887; Fri, 06 Oct 2023 04:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696591073; cv=none; d=google.com; s=arc-20160816; b=IjlE5cs2Tth1rfTHHUs8+m4+1QauTbaEgfJcKEuQQ4M6tNGwvAvV1+k7TIuftgEIMZ wjY9hSl7YJpYHgZfj1EPOemCe+sE471XO+Ed8MXmBZtcsQNLUnxPbOM3qS92OvdmXKrL 05WzyQ65dGAg+fJulLa/WJLLBKrul1kpNOCfCtXF4FZCa+C83Wx1VCRweI0SZAg/nS8R Rtj7kEObUZOc/p5zcjj8Bek0mR0fPH9kvIK5JBPchw7Zq3/Nfb8wbanYM3fW8bioT+6W BTUL+/dQIdqGWD/7TJMIrv8jAOWFXZKKCghh42ZjHqRq9wHf/GF69G5hPZrgId6PxKxQ TydQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vsnRu0/snRmTWvMZqVelQZHrk/C+c4xwiiTtA7NLmt8=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=rkrzVGQKTknS/D9LrYp8ISpQpg0WVUHpcoRQcbTfzJr8dKNFAFrXY6tTk+wMoZdH1z rnckh2EZFbmPk5dwqi3Ou68pKkGeBkJ0QUZkZssuNuYvdBICVikDmNmVzIkkPnriufCu 4gXfhO/MjNglKMX2RGg4D81yU6pLnQY+QiCSNGcGaiwAvkiNjXKpVV0zj5eNzG3jwu9Z /orKAjy+C00QUujIAcRmsbl5vMSCL7Vf1BGvrzbA+yH0c0D75+6kSYFfM/3rfL+tK91k 6stZWZwd8kuRJq8BMK0oGern7ZhYmk8JinYvzBypQYfI/2TDmmPCfI3ZmufVoh3tMEQW Q7TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BBNQml+M; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bj42-20020a05620a192a00b0075daf23cc89si2342462qkb.248.2023.10.06.04.17.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:17:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BBNQml+M; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: 0yrRa9PmPuSgGs1L_Z6I6w-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-537a183caa3so1819921a12.1 for ; Fri, 06 Oct 2023 04:14:48 -0700 (PDT) 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-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) 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) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 => system}/arch_init.c | 0 {softmmu => system}/async-teardown.c | 0 {softmmu => system}/balloon.c | 0 {softmmu => system}/bootdevice.c | 0 {softmmu => system}/cpu-throttle.c | 0 {softmmu => system}/cpu-timers.c | 0 {softmmu => system}/cpus.c | 0 {softmmu => system}/datadir.c | 0 {softmmu => system}/device_tree.c | 0 {softmmu => system}/dirtylimit.c | 0 {softmmu => system}/dma-helpers.c | 0 {softmmu => system}/globals.c | 0 {softmmu => system}/icount.c | 0 {softmmu => system}/ioport.c | 0 {softmmu => system}/main.c | 0 {softmmu => system}/memory.c | 0 {softmmu => system}/memory_mapping.c | 0 {softmmu => system}/meson.build | 0 {softmmu => system}/physmem.c | 6 ++-- {softmmu => system}/qdev-monitor.c | 0 {softmmu => system}/qemu-seccomp.c | 0 {softmmu => system}/qtest.c | 0 {softmmu => system}/rtc.c | 0 {softmmu => system}/runstate-action.c | 0 {softmmu => system}/runstate-hmp-cmds.c | 0 {softmmu => system}/runstate.c | 0 {softmmu => system}/timers-state.h | 0 {softmmu => system}/tpm-hmp-cmds.c | 0 {softmmu => system}/tpm.c | 0 {softmmu => system}/trace-events | 0 system/trace.h | 1 + {softmmu => system}/vl.c | 0 {softmmu => system}/watchpoint.c | 0 tests/unit/meson.build | 2 +- 43 files changed, 40 insertions(+), 38 deletions(-) delete mode 100644 softmmu/trace.h rename {softmmu => system}/arch_init.c (100%) rename {softmmu => system}/async-teardown.c (100%) rename {softmmu => system}/balloon.c (100%) rename {softmmu => system}/bootdevice.c (100%) rename {softmmu => system}/cpu-throttle.c (100%) rename {softmmu => system}/cpu-timers.c (100%) rename {softmmu => system}/cpus.c (100%) rename {softmmu => system}/datadir.c (100%) rename {softmmu => system}/device_tree.c (100%) rename {softmmu => system}/dirtylimit.c (100%) rename {softmmu => system}/dma-helpers.c (100%) rename {softmmu => system}/globals.c (100%) rename {softmmu => system}/icount.c (100%) rename {softmmu => system}/ioport.c (100%) rename {softmmu => system}/main.c (100%) rename {softmmu => system}/memory.c (100%) rename {softmmu => system}/memory_mapping.c (100%) rename {softmmu => system}/meson.build (100%) rename {softmmu => system}/physmem.c (99%) rename {softmmu => system}/qdev-monitor.c (100%) rename {softmmu => system}/qemu-seccomp.c (100%) rename {softmmu => system}/qtest.c (100%) rename {softmmu => system}/rtc.c (100%) rename {softmmu => system}/runstate-action.c (100%) rename {softmmu => system}/runstate-hmp-cmds.c (100%) rename {softmmu => system}/runstate.c (100%) rename {softmmu => system}/timers-state.h (100%) rename {softmmu => system}/tpm-hmp-cmds.c (100%) rename {softmmu => system}/tpm.c (100%) rename {softmmu => system}/trace-events (100%) create mode 100644 system/trace.h rename {softmmu => system}/vl.c (100%) rename {softmmu => 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 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 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 @@ -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 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 @@ -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 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 -------------- -.. kernel-doc:: softmmu/qtest.c +.. kernel-doc:: system/qtest.c :doc: QTest Protocol diff --git a/include/sysemu/runstate-action.h b/include/sysemu/runstate-action.h index cff45a047bf..db4e3099ae5 100644 --- a/include/sysemu/runstate-action.h +++ b/include/sysemu/runstate-action.h @@ -11,7 +11,7 @@ #include "qapi/qapi-commands-run-state.h" -/* 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')) -subdir('softmmu') +subdir('system') # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: @@ -3813,14 +3813,14 @@ foreach target : target_dirs execs = [{ 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', - 'sources': files('softmmu/main.c'), + 'sources': files('system/main.c'), 'dependencies': [] }] if targetos == 'windows' and (sdl.found() or gtk.found()) execs += [{ '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 = ( "COPYING", "MAINTAINERS", "Makefile", "README.rst", "docs", "VERSION", - "linux-user", "softmmu" + "linux-user", "system" ); foreach my $check (@tree_check) { diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/COMPONENTS.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)/.* sysemu - ~ (/qemu)?(/softmmu/.*|/accel/.*) + ~ (/qemu)?(/system/.*|/accel/.*) (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="$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 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; } -/* 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 } if seccomp.found() - tests += {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]} + tests += {'test-seccomp': ['../../system/qemu-seccomp.c', seccomp]} endif endif