From patchwork Thu Feb 3 19:17:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A4AEC433EF for ; Thu, 3 Feb 2022 20:12:19 +0000 (UTC) Received: from localhost ([::1]:49398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiSo-0000AD-38 for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:12:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhcm-000248-5O for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:32 -0500 Received: from [2607:f8b0:4864:20::1035] (port=40531 helo=mail-pj1-x1035.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhck-0002F7-7a for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:31 -0500 Received: by mail-pj1-x1035.google.com with SMTP id z10-20020a17090acb0a00b001b520826011so10930751pjt.5 for ; Thu, 03 Feb 2022 11:18:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=53ArPqORfrQgTzup1/6eK038xsx8Kl+Z0nexhJe9lsI=; b=Ev+gm4j8DOXSHtjR7yTfaSt8iWLMqAIiTVnc8J3nGxgL+CCkWl9jqdPWjTPKOhfYLy q0uIWX/elxgjlQKxV9HJ8EBfXVUxhEawdwRQmqo7XCSX3ny27ZwkvmCDNjb/EUsTdeza a3VsxJHeO6yyCHnhv+PLC+lm7093vtL868fxyuWrye2DAQIBXOjnKlNxLGvUZpMNabsN Fi9SQ7jqupIAnIzoEO/CkDpv8WylsNhalqxN6ImSA3OMUu6UiwB9soGN++P/h24UkTnR rS7UexZ3l4p4gjVjxnluEv7dmgEru+I9rIKrGx9cYi/PuCXt29k/5lsqi7FXfwnhoXbR Pnpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=53ArPqORfrQgTzup1/6eK038xsx8Kl+Z0nexhJe9lsI=; b=alcZMWW7KP6iIK3SDQE2F2sAXMsP5dcFhjGMP295O2ufRSM6/GpZhxzYwzQRlk1DMN YMvcvFASUi7UtUdXUAeiHmLbM+BggYgpJiBs65XjidcH06+Np1WxHhNnZ0Jk7B8LOOlU LTH+Pv9kInet1G73fLY1wQLsAaDObyLq561CKMCbpbjju84Bt1raIstWtrWDlL60VaEj S+H1lVSZOSgjDPckf6h8TkoWFynyT3Q+r4IJNOMHgRgpl+OnOkjJdBiyX5o7fvbEAMD9 GfdB6+nbnEs8FZu+UCUC53P/2Z7Na/TxD6JvA3nCrjPQxWTuFXvqLx25caSLToEnCX3M mIJw== X-Gm-Message-State: AOAM531UwoSuy9wXEgtPhfrY7fvUJxJcd4ECgvcRVMWx6GFI64IMY9ly s+PMg20GslUCj2axgY4BQQMG6aQXW3I= X-Google-Smtp-Source: ABdhPJwRMcJxLaQqyaucqyDZZGN3/TBcZdpLEfIKUaS1QugEep8h/4nAg9n8hBInF6YGWBzmilrZbQ== X-Received: by 2002:a17:902:d044:: with SMTP id l4mr37586531pll.5.1643915908750; Thu, 03 Feb 2022 11:18:28 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id u18sm31076562pfi.185.2022.02.03.11.18.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:18:28 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/21] accel: Restrict sysemu stubs to system emulation Date: Thu, 3 Feb 2022 20:17:54 +0100 Message-Id: <20220203191814.45023-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1035 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- accel/stubs/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 12dd1539af..0249b9258f 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,4 +1,7 @@ -specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) -specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +sysemu_stubs_ss = ss.source_set() +sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) +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')) + +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss) From patchwork Thu Feb 3 19:17:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D650EC433EF for ; Thu, 3 Feb 2022 19:52:38 +0000 (UTC) Received: from localhost ([::1]:49068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFi9l-0005Ha-HE for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 14:52:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhd9-0002Qs-9x for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:56 -0500 Received: from [2607:f8b0:4864:20::42a] (port=46017 helo=mail-pf1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhd5-0002Fk-TF for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:54 -0500 Received: by mail-pf1-x42a.google.com with SMTP id c194so3002642pfb.12 for ; Thu, 03 Feb 2022 11:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bq6XFRx7wAa9rcjDBKgvoofz6huJBBnqUxVQ/7FlcqA=; b=lsEDy39xHR1L333S8S+oroJtWLoT6PnlNqit8b2WLjvbN/rMyu4E6fAW8Ss/67XdoE zqlhnAvRYZvhxTByXoj//Di5+u+q1TuOQk23SnhH0G143K2Z4wotcRGAudurw7wBWuj6 BOW8iMbh1b1fl3xL1z0yy3cJbnhKZxixqn5d55Tyber05/t7325mBsIFSm4fBpON82RP mMQ3MsSnVrP3o3z6B02l6k8Uplaw0oahrVrSDnooC1iZrwbk38z+2vcmFNIkzKgv0hvv qWTtWzZfm7LVrw9PgNA2kNxRvFQBIraKWgrgYG+dYZP4TBLb82MXUloLfJnD1KJwgE1G 1Zpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bq6XFRx7wAa9rcjDBKgvoofz6huJBBnqUxVQ/7FlcqA=; b=CQKB8XICtheEc0s1fM0oamPxPEIxcc008mHtX4Aznbz1+4uh5ddm4AVBdLcZF5Rcgk cBHo+JAhd9ao8OBlnQ5Zm9e3DIGjPmppO2v7Ex7DMhDkluEmG+Uf3xM72+eWxCpjAf/i 5G0ooNKsuGGc0/+2yp4vuId6EymbdNTvaYCm17g5N7fKjB8fugsfvKJFuDUhpCX5iHQu 3KEXBVACnBLvNiDiHPScXBNARfycT1m431ot33oxqVZ+/F1YcC+rwbGnmTtOGIYHw4kk Xguh1ADczlRnCSuY56xUsMlEMYaPqYbXB/CJdc5fZX7Sm1MLf0QhY7uli0E/vEBnQSe3 LRcw== X-Gm-Message-State: AOAM532Gqyv9kuKUx/Uq95InRYEPuUSvoD2WM/fwff51ResyKz0pJ+nj LJVTtZVWUTLHsbbkp3rqIosQ/kPXuFE= X-Google-Smtp-Source: ABdhPJwwzjla+bGBOgYHjBb4QCDzaphovDxFeYkzXsb4D/S0OwWXNRxuMru3dhdxalusr8Gs3oqhDg== X-Received: by 2002:a65:4985:: with SMTP id r5mr29467662pgs.299.1643915916625; Thu, 03 Feb 2022 11:18:36 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id z27sm20913347pgk.78.2022.02.03.11.18.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:18:36 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/21] accel/meson: Only build hw virtualization with system emulation Date: Thu, 3 Feb 2022 20:17:55 +0100 Message-Id: <20220203191814.45023-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- accel/meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/accel/meson.build b/accel/meson.build index dfd808d2c8..b9a963cf80 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -2,12 +2,14 @@ specific_ss.add(files('accel-common.c')) softmmu_ss.add(files('accel-softmmu.c')) user_ss.add(files('accel-user.c')) -subdir('hvf') -subdir('qtest') -subdir('kvm') subdir('tcg') -subdir('xen') -subdir('stubs') +if have_system + subdir('hvf') + subdir('qtest') + subdir('kvm') + subdir('xen') + subdir('stubs') +endif dummy_ss = ss.source_set() dummy_ss.add(files( From patchwork Thu Feb 3 19:17:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6E56C433EF for ; Thu, 3 Feb 2022 20:14:53 +0000 (UTC) Received: from localhost ([::1]:57986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiVI-0006Jm-Ki for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:14:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdB-0002Ts-TF for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:58 -0500 Received: from [2607:f8b0:4864:20::42d] (port=44569 helo=mail-pf1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhd7-0002G6-AZ for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:57 -0500 Received: by mail-pf1-x42d.google.com with SMTP id n32so3015080pfv.11 for ; Thu, 03 Feb 2022 11:18:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=65MPlr88/4m7n+vhG97F5TEU2DofKSKb0ifYE1MH9O8=; b=Ndi3yJ23312H+t9HdhxgecchRpwBE+0XTUpdqjj6TsfI1zSkBDnXsZuErwuAbN+7sM WA061GBoUZYT2sl/p7QhqY7ePi7yjwCW9I+OCXn3iCFxyVRcf6d0xgSA4zdavqErOvy6 DShzsE2qXPuHIsdAypNq37a+QMDM4n+R4X7X0mgXQFEEhE4Ln8Hfv+y4lwtxalKeMFyA YMGD4vOGvxk/3A9JwSV83CX1ofCMR5mmSp2tkS+WWSl1lm13/jaGsFSqNUjR2cd4sJjt hDVopWWGA+lDQB+kUiMqDQSkVi8m/Sqoph8W50MS5U1CYmcFRwvdSskyOir6P6Mz80x2 OyvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=65MPlr88/4m7n+vhG97F5TEU2DofKSKb0ifYE1MH9O8=; b=DA9lgErErUL+PnDeb2uWTWfVWiLjaJ4u9fCstyMT2f9jFnQ2jUD2ON4q5lQYFvCE3Q NqUCSh7c7e36+VYdNgqkbm8R52lukFOVFTGw+KZ9abNB1zrPVFXUFU8PxQOoyox8Fz2H Q5Ey4SC8K+kahUuHsQ8lQBmU6cLQCRCMd1mWt/xOhtFw8REix9zzNCp9nspfPH4MerD3 1jdSjIvrXTPAyxTkhwwLRAOx4I2j5402lCWCYeQ3wXRf30f7VXssoRdj4yJLBATzVK8+ mxz6u9wr1G+HUcmfERDCUVlXyMe2tWs3ZQ/bcysrS/OXXfiVziHTZ7+dSeVyM7jIB8ed guBA== X-Gm-Message-State: AOAM532xz3kpDsvKZFX3QLa4VESut2xZsOLZw0bONKKHYyn6g+YasaGc k1LLAJLfWTuXPSIqZ11CNC/MUH/2q1M= X-Google-Smtp-Source: ABdhPJw8T06zCMvC1vo5DozqDS4jrJmvOO1YkZyVWzhy0odMiU/h4zTUt1LhYWTpSCzfI8AvFAZoEQ== X-Received: by 2002:a63:9044:: with SMTP id a65mr28971068pge.325.1643915924682; Thu, 03 Feb 2022 11:18:44 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id ms14sm10803143pjb.15.2022.02.03.11.18.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:18:44 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 03/21] exec: Declare vaddr as a generic target-agnostic type Date: Thu, 3 Feb 2022 20:17:56 +0100 Message-Id: <20220203191814.45023-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Move vaddr type declaration to the generic "exec/cpu-common.h" header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/exec/cpu-common.h | 12 ++++++++++++ include/hw/core/cpu.h | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index de5f444b19..cd1d7328a1 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -7,6 +7,18 @@ #include "exec/hwaddr.h" #endif +/** + * vaddr: + * Type wide enough to contain any #target_ulong virtual address. + */ +typedef uint64_t vaddr; +#define VADDR_PRId PRId64 +#define VADDR_PRIu PRIu64 +#define VADDR_PRIo PRIo64 +#define VADDR_PRIx PRIx64 +#define VADDR_PRIX PRIX64 +#define VADDR_MAX UINT64_MAX + /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long. */ diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 76ab3b851c..3f2b681281 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -22,6 +22,7 @@ #include "hw/qdev-core.h" #include "disas/dis-asm.h" +#include "exec/cpu-common.h" #include "exec/hwaddr.h" #include "exec/memattrs.h" #include "qapi/qapi-types-run-state.h" @@ -35,18 +36,6 @@ typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size, void *opaque); -/** - * vaddr: - * Type wide enough to contain any #target_ulong virtual address. - */ -typedef uint64_t vaddr; -#define VADDR_PRId PRId64 -#define VADDR_PRIu PRIu64 -#define VADDR_PRIo PRIo64 -#define VADDR_PRIx PRIx64 -#define VADDR_PRIX PRIX64 -#define VADDR_MAX UINT64_MAX - /** * SECTION:cpu * @section_id: QEMU-cpu From patchwork Thu Feb 3 19:17:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31585C433F5 for ; Thu, 3 Feb 2022 20:19:54 +0000 (UTC) Received: from localhost ([::1]:38016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFia9-0003nR-3z for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:19:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdD-0002V7-46 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:00 -0500 Received: from [2607:f8b0:4864:20::429] (port=35754 helo=mail-pf1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhd9-0002GZ-2O for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:18:58 -0500 Received: by mail-pf1-x429.google.com with SMTP id u130so3045004pfc.2 for ; Thu, 03 Feb 2022 11:18:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LsqGvoyqmwuTPIrN92Qpu4WyG+EeFiS9GMqWxSgmO+0=; b=AINpcIjDM6agi9xrAnPhet5oMWQnZZ/7W06Biq9dCxc/t7BPOlEITjpaoBvHylJq6D IaG+XXFyoA0fJD1QT7JEwIFXb7namrbWnmxzQB4ZAZDcOU0wnCzx40wQ4DIvEaM1KcAE vj1LGZRDeDxi+UGkv/2A0a5ufhz8lE5VTqgGtNzM0W7GZMkBClj96PUc4M1AN2X/2NrW RnGWqi1ZSOiVe0oMXuw7HGjoVMrOe9vmBQuPaYDRElQN0NKNlV+amIqfoif0gJVGpkHN 96vZyR+qnx4uKAc8Ohda9ztQG9EJszzHn4oWppQE0u6DiuwIKvDm0HEsGTWAu0l2CtNe iIOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LsqGvoyqmwuTPIrN92Qpu4WyG+EeFiS9GMqWxSgmO+0=; b=gTTv54qKD4hCKUHeT5pzbTTQLoVmInjLPBLIzFLLaSKNOqLGTC1/PI6KrvpASgH8n2 nemqO10cPXdX+UQeRgqvDl8thXaTcRPLocu+n0Tyxu8rctoXjvcIk+TyFpcEZRGr2nXg ICfdoiJt2Dd2taZLeEeW/U/stg9ACRk4OELdQCudieR36O2FCJDoJVnufp4QVJeVr5uc vzyf12hAswPEf2KazVPXzC08QmAMRj7JFDT6GnTlT6W19qLWr5v+o2MUrcrWib3Myhxm 3mDKZ5iUehbj7r0/YLkXyNze1n2bDVrsMqXg9m6lEpg7EulX/Md3ntRH5RJXpY+4oIgr UDGA== X-Gm-Message-State: AOAM532ai2pvW95Wmv3HpAtx+TorswvAebACVvH/Fldf7NKxeg0D4vkS Dbp2lgTwxZTqqHhKjsBBeeStc5DgKks= X-Google-Smtp-Source: ABdhPJxktAGNBh6h8qb2neVXMW2fJurbL1eVXSG/sL0QHqtXjaJpWe3+jMzXOJ/6Z+dVxUz69kGR8g== X-Received: by 2002:a62:1715:: with SMTP id 21mr35052181pfx.59.1643915932705; Thu, 03 Feb 2022 11:18:52 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id lp8sm12136270pjb.14.2022.02.03.11.18.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:18:52 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 04/21] exec: Make cpu_memory_rw_debug() target agnostic Date: Thu, 3 Feb 2022 20:17:57 +0100 Message-Id: <20220203191814.45023-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::429 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x429.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= cpu_memory_rw_debug() is declared in "exec/cpu-all.h" which contains target-specific declarations. To be able to use it from target agnostic source, move the declaration to the generic "exec/cpu-common.h" header. Replace the target-specific 'target_ulong' type by 'vaddr' which better reflects the argument type, and is target agnostic. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- cpu.c | 6 +++--- include/exec/cpu-all.h | 4 ---- include/exec/cpu-common.h | 4 ++++ softmmu/cpus.c | 2 +- softmmu/physmem.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cpu.c b/cpu.c index 016bf06a1a..97d42b6b2a 100644 --- a/cpu.c +++ b/cpu.c @@ -395,11 +395,11 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) /* physical memory access (slow version, mainly for debug) */ #if defined(CONFIG_USER_ONLY) -int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - void *ptr, target_ulong len, bool is_write) +int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, + void *ptr, size_t len, bool is_write) { int flags; - target_ulong l, page; + vaddr l, page; void * p; uint8_t *buf = ptr; diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 84caf5c3d9..c0f0fab28a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -433,10 +433,6 @@ int cpu_exec(CPUState *cpu); void tcg_exec_realizefn(CPUState *cpu, Error **errp); void tcg_exec_unrealizefn(CPUState *cpu); -/* Returns: 0 on success, -1 on error */ -int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - void *ptr, target_ulong len, bool is_write); - /** * cpu_set_cpustate_pointers(cpu) * @cpu: The cpu object diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index cd1d7328a1..8031ebc680 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -128,6 +128,10 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length); #endif +/* Returns: 0 on success, -1 on error */ +int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, + void *ptr, size_t len, bool is_write); + /* vl.c */ extern int singlestep; diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 23bca46b07..7f15106dd9 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -32,7 +32,7 @@ #include "qapi/qmp/qerror.h" #include "exec/gdbstub.h" #include "sysemu/hw_accel.h" -#include "exec/exec-all.h" +#include "exec/cpu-common.h" #include "qemu/thread.h" #include "qemu/plugin.h" #include "sysemu/cpus.h" diff --git a/softmmu/physmem.c b/softmmu/physmem.c index dddf70edf5..eb4b3bcae7 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3435,11 +3435,11 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr, #include "memory_ldst.c.inc" /* virtual memory access for debug (includes writing to ROM) */ -int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, - void *ptr, target_ulong len, bool is_write) +int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, + void *ptr, size_t len, bool is_write) { hwaddr phys_addr; - target_ulong l, page; + vaddr l, page; uint8_t *buf = ptr; cpu_synchronize_state(cpu); From patchwork Thu Feb 3 19:17:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734622 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EEE07C433EF for ; Thu, 3 Feb 2022 20:24:40 +0000 (UTC) Received: from localhost ([::1]:46182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiel-0001N4-V6 for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:24:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdH-0002ZX-JA for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:03 -0500 Received: from [2607:f8b0:4864:20::62c] (port=40462 helo=mail-pl1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdG-0002Ht-3j for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:03 -0500 Received: by mail-pl1-x62c.google.com with SMTP id y17so3015403plg.7 for ; Thu, 03 Feb 2022 11:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mBdNO2Bwz83I7abD0UcZVgndIJgAStlAegpjuFngrIQ=; b=fYdqDFs+bvz0pH6otd4MKrtJjhSHTJNSdc+khFSjq6G2BuY8Y0oHXG7BU7pHkqHraQ /hs0RnnG2iduT1Ug/9FeMDHlBD3w/bw1OZPjkqM0tL1lUEegpPjGJab3rptTCz4pl/rg rTZNMtaGATuBI4/bWY728ifcDLRhGXzPJz/6V1wd3QORaayp7zs7FFeTdTtQZXeZ0bAc QRIIywVDbESUicnMM8MDIaeZ6h66dR3vWtt26QHLkp9+wv3F6Jv+5Tboxq35si67COeB 3Dj5yq+MWRqqyBxx+oVev22+rYNVoTFXQcV94ecVMmj66syHE4uQBJLTiTOerhBPh5WQ Y43A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mBdNO2Bwz83I7abD0UcZVgndIJgAStlAegpjuFngrIQ=; b=1op9iX+lwTAptQxhua+OQZHenT7JP0NZT8rj19Bwvf8+k5C3ynHrAHH6q1p6dkTmfb SdmKDgF6LPwArhf/bG4PY3PRJvN0K3dn0VMAhmSdJCsrkIijCN2F/fUM07NgedKclYAU 09kJBgDRWBgqbker2k35DG6qW5c0CUqPFDq0oykd7V6BhsKgvTZT4JnSLyNy9UAib6vf wOh9hYMV7C/tMSufIAJVSwylfFZeZVLsbiueumSPIRqRANZbeNSTNUFA8G3XvETSn1NQ 3CcN1DabEdWTXVmKTNhIpC2ElAxLUwOIrf8E9atR5Fa+ZSLxnYmdnt87J7dZjpKVqUF2 DWmg== X-Gm-Message-State: AOAM533X0xEFz7sLJjHe1ZwQNK0bHYAGfjY4geMiAYTuhNJ74rsb39f4 55gUp/Gn0A+dS37JM/1zf+F7Nu3QT/c= X-Google-Smtp-Source: ABdhPJzlrsrckaRzZ5wRTufAeBJqfKOA/C0u4lpudI/SJRnkTKCobfwlCC/FsVYuhdmQfra6epzazw== X-Received: by 2002:a17:902:8a97:: with SMTP id p23mr37361090plo.26.1643915940633; Thu, 03 Feb 2022 11:19:00 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id o1sm32201008pfu.88.2022.02.03.11.18.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:00 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/21] sysemu/memory_mapping: Become target-agnostic Date: Thu, 3 Feb 2022 20:17:58 +0100 Message-Id: <20220203191814.45023-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= target_ulong is target-specific, while vaddr isn't. Remove the unnecessary "exec/cpu-defs.h" target-speficic header from "memory_mapping.h" and use the target-agnostic "hw/core/cpu.h" locally in memory_mapping.c. Remove "exec/memory.h" since MemoryRegion is forward-declared in "qemu/typedefs.h". Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/sysemu/memory_mapping.h | 5 ++--- softmmu/memory_mapping.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h index 4b20f1a639..3bbeb1bcb4 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,8 +15,7 @@ #define MEMORY_MAPPING_H #include "qemu/queue.h" -#include "exec/cpu-defs.h" -#include "exec/memory.h" +#include "exec/cpu-common.h" typedef struct GuestPhysBlock { /* visible to guest, reflects PCI hole, etc */ @@ -43,7 +42,7 @@ typedef struct GuestPhysBlockList { /* The physical and virtual address in the memory mapping are contiguous. */ typedef struct MemoryMapping { hwaddr phys_addr; - target_ulong virt_addr; + vaddr virt_addr; ram_addr_t length; QTAILQ_ENTRY(MemoryMapping) next; } MemoryMapping; diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c index a62eaa49cc..8320165ea2 100644 --- a/softmmu/memory_mapping.c +++ b/softmmu/memory_mapping.c @@ -17,6 +17,7 @@ #include "sysemu/memory_mapping.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "hw/core/cpu.h" //#define DEBUG_GUEST_PHYS_REGION_ADD From patchwork Thu Feb 3 19:17:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734592 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E8BFC433EF for ; Thu, 3 Feb 2022 19:55:58 +0000 (UTC) Received: from localhost ([::1]:55050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiCu-00010Q-0u for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 14:55:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdn-0002mi-0n for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:39 -0500 Received: from [2607:f8b0:4864:20::1030] (port=39867 helo=mail-pj1-x1030.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdc-0002Ij-9k for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:31 -0500 Received: by mail-pj1-x1030.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so10927270pjj.4 for ; Thu, 03 Feb 2022 11:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z6e7j9kocYjBLI6/AQ6OQvrdS8sBKMYiEoeoj10G7EU=; b=SZ3h1HkyvjIdgZQwN0feMbHhdyrQ4naVFetVXliqqiTQwnZdbnqC49PK0jqq4BhoaE xbOwIBjmficHf6ZTuwT17vn5wKFNjc+0fKmx+H7J6QePKnSwQYsUomEwYwGoBcitfHqe 3fRTsOCo7GAlpo7IfPWEVfKiNopRYZZAIxmw2U/K2f+/2OgGa5Q0URoA8cZhEo/qPl9M yvgVDmufgLjke9YCnCvejRWun3w4CbBbXVwu0+zMNr38ZI7Xy3eFxeGPlxkSSFsS3gVi cRftprmKyCtSNNWyI/62eOvEQwvODrZ93r07t3WNd7mkRU2/8ajEnWX2ee8cqJggqiS9 jPgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z6e7j9kocYjBLI6/AQ6OQvrdS8sBKMYiEoeoj10G7EU=; b=p1Xa9xmS117qiCPWLnqn4wWHESAPU9NO1AXcNA5gGbthXgrK+m8OJR4v/FqemQCdS1 i+nwOVmndrmVHeqOaHF7Fri2c98ZFE0epNrI6OhXW7EixIy0hUlEQNlFjO93T/U7vChM tTLK85Zub1LSUTIyjFzZFJHxfQgjPp+jGZF75rGUMJHB5IXXSywHXvX00MQQpOvLXgL4 QzAEAwMXjbuVpuFMHgs/OBY39CzjN2BV45XO68VVa3sbr8VVNc1lgMjTxK4VAZINngqX MFelIlaRan+F5rp7CjpOrx0twV4WCME1AC78MzDG3HNSiYP0x8FQ456UOKj7nCbVdNH7 kKQQ== X-Gm-Message-State: AOAM530zfvkZiIqna/tbi+zqjRh1+rNHP6eZss0c5F3uXFawyBb/63nY 2zZcnBgmJrBUS8JUxDd2zhlMXCPSaPE= X-Google-Smtp-Source: ABdhPJy1s6nr/rHDzuoSsUKx07qTdsQ7senKxo6zp8ktTGvRThwkUxJCoCokM3ShGmIJkIbjAS75aw== X-Received: by 2002:a17:90b:1c8d:: with SMTP id oo13mr602473pjb.244.1643915948582; Thu, 03 Feb 2022 11:19:08 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id nk11sm10777880pjb.55.2022.02.03.11.19.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:08 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 06/21] sysemu/kvm: Make kvm_on_sigbus() / kvm_on_sigbus_vcpu() target agnostic Date: Thu, 3 Feb 2022 20:17:59 +0100 Message-Id: <20220203191814.45023-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1030 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1030.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= kvm_on_sigbus() and kvm_on_sigbus_vcpu() prototypes don't have to be target specific. Remove this limitation to be able to build softmmu/cpus.c once for all targets. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/sysemu/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 6eb39a088b..a5bec96fb0 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -249,6 +249,9 @@ int kvm_has_intx_set_mask(void); bool kvm_arm_supports_user_irq(void); +int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); +int kvm_on_sigbus(int code, void *addr); + #ifdef NEED_CPU_H #include "cpu.h" @@ -261,9 +264,6 @@ int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr, void kvm_remove_all_breakpoints(CPUState *cpu); int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); -int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); -int kvm_on_sigbus(int code, void *addr); - /* internal API */ int kvm_ioctl(KVMState *s, int type, ...); From patchwork Thu Feb 3 19:18:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F94BC433EF for ; Thu, 3 Feb 2022 19:57:01 +0000 (UTC) Received: from localhost ([::1]:57466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiE0-0002ht-42 for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 14:57:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdn-0002mh-0H for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:39 -0500 Received: from [2607:f8b0:4864:20::42a] (port=35758 helo=mail-pf1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdh-0002JB-Rd for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:31 -0500 Received: by mail-pf1-x42a.google.com with SMTP id u130so3045990pfc.2 for ; Thu, 03 Feb 2022 11:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mgPtfvqDsNTLRxTRPmFW79qViytxlXTk2nJLw5OxqU0=; b=jQQ5Vq9nDwNLDsgsH07rc2BoJlXkByXv9HRkqAgoCfrSYjym9VCWm9Bhn7GKdmEuwi tCWKheUJUwSk8vpLhD4ZBWw/Es0KbuyG/d1aAx0XR1i4WAxAdtYFSxZ2tkqEP/xs02Ic TpuG4oezTVxAxxhdEA0i5qMm12tk/ATBKMU2Fz/bmHLyApwHuko5yPrWEQXc8683m3pc 7IQIi6l+H3UGGtWWPlwgxZGOFeDQGdpKs3yEx08tzOTPbVjmAPiiRgzNiI7jI+9tm5ye 4kErVIPBqAtXCqt+51SLkYlkc8qdeDOv6iFiJC4NrmrHh+4E4ylwJfWrwZSWvGq+agMb XRxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mgPtfvqDsNTLRxTRPmFW79qViytxlXTk2nJLw5OxqU0=; b=0r4OM6EFBrg1oqaBfSuwfcmSHnnvOIrHmHvIuObrZO3rfUPy6q/l4YiS/f9CRtmHYy nIzguT/OAElPINwL0o67rJNAlcu30u1ZqDMoJnniMFHhzeUmkSlKwQNZa12lFCd4H6JV xnu/qurR64PUqmuKfuD2CIEJsv0auVXSm7NlGt79wS/xs2LsJ8Ef1p/WP5UM/7DD2XuK ytfPMTVwzW6s999rydmRzfSNUhTZLSJA5Xd2rGk2PVRv0V43OP+w3QceyjH6iertNgk3 zX4ow2fRLBn8Rvydo2WjsrugXGEdlFhG+Ka37ctVGL5fcHywAujsT6Q/XpWPJCt0qla9 +JzQ== X-Gm-Message-State: AOAM530Dy4N27AezCOnfEXD2CZzlDVrV60r63E4SzjHS3eQokFzitT5z Mq7hj/pTHKSk9VBOH4jBmobM3/8ORjs= X-Google-Smtp-Source: ABdhPJy2hVJahscY9apD9PgC5tnrBUn03MKSIyCe8Epno2ZfiMY0lwtrBD1UxeQOBe7VeZkOUoDq9g== X-Received: by 2002:aa7:9838:: with SMTP id q24mr35863865pfl.76.1643915956866; Thu, 03 Feb 2022 11:19:16 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id my18sm8106103pjb.0.2022.02.03.11.19.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:16 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/21] accel/kvm: Simplify user-mode #ifdef'ry Date: Thu, 3 Feb 2022 20:18:00 +0100 Message-Id: <20220203191814.45023-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Now than we only build this stub with system emulation, remove the user-mode #ifdef'ry. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- accel/stubs/kvm-stub.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 5319573e00..7e0fb884b9 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -12,10 +12,7 @@ #include "qemu/osdep.h" #include "sysemu/kvm.h" - -#ifndef CONFIG_USER_ONLY #include "hw/pci/msi.h" -#endif KVMState *kvm_state; bool kvm_kernel_irqchip; @@ -80,7 +77,6 @@ int kvm_on_sigbus(int code, void *addr) return 1; } -#ifndef CONFIG_USER_ONLY int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) { return -ENOSYS; @@ -152,4 +148,3 @@ bool kvm_dirty_ring_enabled(void) { return false; } -#endif From patchwork Thu Feb 3 19:18:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 409CCC433EF for ; Thu, 3 Feb 2022 20:06:53 +0000 (UTC) Received: from localhost ([::1]:38042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiNY-0000qE-2l for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:06:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdn-0002mj-1y for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:39 -0500 Received: from [2607:f8b0:4864:20::634] (port=45772 helo=mail-pl1-x634.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdh-0002KP-UZ for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:32 -0500 Received: by mail-pl1-x634.google.com with SMTP id s6so2999493plg.12 for ; Thu, 03 Feb 2022 11:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pxosyp14whWtXiAs8rnIXM8WUYsnAS8eqq/iDTkcN1U=; b=UHBPhUqBPD9XxEcEtuJxjNqMu84HFTex0aPTeoiEM8AVNC4euDbKxb1cBLLFJo3AO1 7h0R5A849qiwBI5nSvsmEMYxhFMjqOQGuhZczEVH7cxveKNYrwDVlWILmtl57U+MNN+i go/1/pAlMkq2dq8BuHu5r+A4KIzkwLeml8hVbq0XByYM9xFvQkL46WLLa8eERRcd5RM/ LPXw4AsGaYg7ymNNbtbAtnEa/o0xX0RREKFBJPlvFrJoXUJo3SnEKr7kJhvS0lGvJ1lf teq4naC5vJl1BxhsaB625Ht1iDbTN1RBMJN4MTSqOoX818Q+1mwapstSUczHEp0Q81f0 NB5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pxosyp14whWtXiAs8rnIXM8WUYsnAS8eqq/iDTkcN1U=; b=h1Ez2PKN/lqzR0iHSxqNKZ5DFyIQAumfFX2rJSJQ4XoS9TGq2Mufd8cKuvbcMimKBt YZ6jTU2T5k//eDA2X44TT8bojauUhpAFNJPWouvwUQtysqCBzvy+giXAnviQXAeBxjTD 2RbE6+O7T/7AhulziA8ZNLdEW22U4JDHIxqngnJ1x8NjiapIrKe0+XwIaK0cN6HuVghf zW0sesLxA33vU6/nQRNZT5BFB6j4nFBOYB9mXE9uBvabIoRorVhskmOY6mgwe1/nPVz+ 1NOTZNqU9BSGd3R26Y10mwoxDCuh4cxeQerR6eWv5CihgQiEEg5V8c3tP82DfAZmYqdN uRIA== X-Gm-Message-State: AOAM532Nnauwtv/6z4Gc6nFRa4RAM8PX64uGSnrEWyZPQ88uKdPCH3st aBjFAgAUJblLDsB+KobO/V9JaL3WxEk= X-Google-Smtp-Source: ABdhPJz3egYP/+i2x6o59ZbcGgDCsTR3ncjgR0P4PIumXRp6O9/Kd/FNds0M9s7IlXkbzHJzk/vKRw== X-Received: by 2002:a17:902:b407:: with SMTP id x7mr36729330plr.99.1643915964728; Thu, 03 Feb 2022 11:19:24 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id f5sm17659266pfc.0.2022.02.03.11.19.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:24 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 08/21] accel/hax: Introduce CONFIG_HAX_IS_POSSIBLE Date: Thu, 3 Feb 2022 20:18:01 +0100 Message-Id: <20220203191814.45023-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::634 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Mirror "sysemu/kvm.h" #ifdef'ry to define CONFIG_HAX_IS_POSSIBLE, expose hax_allowed to hax_enabled() macro. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/stubs/hax-stub.c | 2 ++ include/sysemu/hax.h | 18 ++++++++++++------ target/i386/hax/hax-all.c | 7 +------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c index 49077f88e3..2fe31aaa9a 100644 --- a/accel/stubs/hax-stub.c +++ b/accel/stubs/hax-stub.c @@ -16,6 +16,8 @@ #include "qemu/osdep.h" #include "sysemu/hax.h" +bool hax_allowed; + int hax_sync_vcpus(void) { return 0; diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 247f0661d1..bf8f99a824 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -25,17 +25,23 @@ int hax_sync_vcpus(void); #ifdef NEED_CPU_H +# ifdef CONFIG_HAX +# define CONFIG_HAX_IS_POSSIBLE +# endif +#else /* !NEED_CPU_H */ +# define CONFIG_HAX_IS_POSSIBLE +#endif -#ifdef CONFIG_HAX +#ifdef CONFIG_HAX_IS_POSSIBLE -int hax_enabled(void); +extern bool hax_allowed; -#else /* CONFIG_HAX */ +#define hax_enabled() (hax_allowed) -#define hax_enabled() (0) +#else /* !CONFIG_HAX_IS_POSSIBLE */ -#endif /* CONFIG_HAX */ +#define hax_enabled() (0) -#endif /* NEED_CPU_H */ +#endif /* CONFIG_HAX_IS_POSSIBLE */ #endif /* QEMU_HAX_H */ diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c index bf65ed6fa9..ccdcb6afab 100644 --- a/target/i386/hax/hax-all.c +++ b/target/i386/hax/hax-all.c @@ -49,18 +49,13 @@ const uint32_t hax_cur_version = 0x4; /* API v4: unmapping and MMIO moves */ /* Minimum HAX kernel version */ const uint32_t hax_min_version = 0x4; /* API v4: supports unmapping */ -static bool hax_allowed; +bool hax_allowed; struct hax_state hax_global; static void hax_vcpu_sync_state(CPUArchState *env, int modified); static int hax_arch_get_registers(CPUArchState *env); -int hax_enabled(void) -{ - return hax_allowed; -} - int valid_hax_tunnel_size(uint16_t size) { return size >= sizeof(struct hax_tunnel); From patchwork Thu Feb 3 19:18:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4593C433F5 for ; Thu, 3 Feb 2022 20:01:47 +0000 (UTC) Received: from localhost ([::1]:35250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiIb-0007Ac-QW for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:01:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdo-0002ml-OO for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:39 -0500 Received: from [2607:f8b0:4864:20::436] (port=37589 helo=mail-pf1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdm-0002L1-QB for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:36 -0500 Received: by mail-pf1-x436.google.com with SMTP id y5so2101623pfe.4 for ; Thu, 03 Feb 2022 11:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TT5ERS0mtyXmsWNPPryOjx250kFAPf8XEK5Py5HGmAc=; b=qH+WEmJEfd6TyEmBB5FpDlLRQM6tfwR3iM/f/ZrbBgg/C9vvSGNnJMwpn/XBLSArkV O61ao5syA0aJM5/OLwnPqaXqJQ6IeIVZ0JJ4SS3Qf/XRgAQPq1rYwvEA0HCvdsCwSewL 9prtDJe+IZqaWYDaqYZWInvdAcA6T2Ef4JcuEwBAtKylVPKsTavbp5hRlyDsxXTHAdT1 suI9TKRq2mCA85qdW8zFSqAQgI21zjl+3BoXVuWiD2UB+ELpU2mvGwUGHVx4GragfGhM ogYqU9yES9/ACcTh8LKqxrlfrd3l0pLKxcrCAA0GOTBLYuOmLiVX4oH7lD+5zTzah4Mo Jlcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TT5ERS0mtyXmsWNPPryOjx250kFAPf8XEK5Py5HGmAc=; b=hSy8FQ/zVkYfcwN1aiE5G/oxLlWbwwQKUr5d1JvTNUsNHFVn1mY43BQKJcVACivshA aqjMCujWcX0yy+UW/vLqOWfucNv/9aXF2Z/g73tzTyi7HUO+KAqrvaSyZ91HppO7mEgd dCNVv4W8r6cDv0Bp2W1x4iZbQ9pTxxnZlmE7WK7Hesv7KCHfQvC9ViywUi68nLk09qhE a8AOm/VcssLbFM6Bw/0ltxfdVBfl0K9KeOh5rWoarP9PlrK1S5E9hbJFssfqSLmrqCOS tChO3MlTulHnsSoxJRGRc4EUhm9zat07B/Tvocw/g5p8pvKsecyq09OHMO92e5/wuJmW Rkzg== X-Gm-Message-State: AOAM532GeJDNGMNx/qn0czKW6uHclqdUUdxAGtkcdV1cpg4i/nxDUjSk ilMzpmlffnGhwKA0ktV3VwnwO4JDIxU= X-Google-Smtp-Source: ABdhPJzVU10vzb2GDQ3+P906LvUVLYHZC0Ct5qHNDhfWQKvNE9lTNTyjIfiUnsXBWxvCiPIpjRjsvQ== X-Received: by 2002:a63:e418:: with SMTP id a24mr29176869pgi.169.1643915972516; Thu, 03 Feb 2022 11:19:32 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y2sm8211221pgf.33.2022.02.03.11.19.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:32 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/21] softmmu/cpus: Code movement Date: Thu, 3 Feb 2022 20:18:02 +0100 Message-Id: <20220203191814.45023-10-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::436 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x436.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= We want cpu_thread_is_idle() to use cpus_accel, so declare this variable earlier. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- softmmu/cpus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 7f15106dd9..538e1714af 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -66,6 +66,11 @@ static QemuMutex qemu_global_mutex; +/* + * The chosen accelerator is supposed to register this. + */ +static const AccelOpsClass *cpus_accel; + bool cpu_is_stopped(CPUState *cpu) { return cpu->stopped || !runstate_is_running(); @@ -126,11 +131,6 @@ void hw_error(const char *fmt, ...) abort(); } -/* - * The chosen accelerator is supposed to register this. - */ -static const AccelOpsClass *cpus_accel; - void cpu_synchronize_all_states(void) { CPUState *cpu; From patchwork Thu Feb 3 19:18:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734627 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73502C433F5 for ; Thu, 3 Feb 2022 20:29:45 +0000 (UTC) Received: from localhost ([::1]:55024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFijg-0007mi-4J for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:29:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhdx-0002oL-6L for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:48 -0500 Received: from [2607:f8b0:4864:20::635] (port=33557 helo=mail-pl1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhdt-0002Lh-MB for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:44 -0500 Received: by mail-pl1-x635.google.com with SMTP id k17so3070221plk.0 for ; Thu, 03 Feb 2022 11:19:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OP3gk9K7a8Pz001jBStUTT8iwVglXVTgu2b+bzBeNgA=; b=j5SXp1Vcfluv8Lx9R4ZKKA8KUxKUiKmFREJNDvVO5Qk/UzC+LYDqzq2jfFciNST5BU YZ4AxjLM+GsT1y173TXdTrwkBQp9R4iac9lgRF6xV3ok2a4geiixQisMFnd88fipx1pe 2ArY8fNk3HOsF9RNGQ22syal9Njr2wnBwD85qwRoHNfsW9xSBBTxAjyrYk+4iQz3TLVJ pKS6p62ZiQ12O2L655bjzzyqSpADhAZVGT4Tq2lM1iIzTdGOQ3Jdk/I7ag3BokcDu+7t f3aMvfMzQw5HBIVE9NGeXDITxBMQH5dpT0P/m8RfCSu6nnwUcKt0tcj+CsZYb4nvGo4z TwAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OP3gk9K7a8Pz001jBStUTT8iwVglXVTgu2b+bzBeNgA=; b=5VYFu+oCeXa3XUDXzcbUqZZhDA0jYOAPEvUxHJT4XwJgADuFueE6NvoKKM5TduE9Ol YWbc2VKHh3wI2ttdPkMaUSFc/xBFY6SNjx8LqiCqWGb6FHaQnO/6Ums//vL6Q6+zAwEN p1Vap4lVMM4NIOqRLGncfsPlDdFo7K8407ZSfxxaYSV2mdHNDIN1UOfgTOrZwNWYoCAe VZjHexpERBlaqC+SCaOKPHV3I1wV/XcyQgwU7HMD38XOROBlvl5eriiGMpwLeXvJSbyR YfAaFKA7I+rcrWD/wsrsmA/1XzOruHfVyLB6iTjrLFWzhxabcg7rFoZ8ly9L6H0Y+4FT Q0XQ== X-Gm-Message-State: AOAM531qsYb5IS9lgnxFUJPTRSOC+CipPG547eVpMHJZf+9SbpeSStof X/wvsP7tg8+Uzd8VPiACtj3MS2YuSuQ= X-Google-Smtp-Source: ABdhPJxuO/6xsBz7jwDEGoXBTX9e7MDR88HZ6dDEX00OlrSaZqDyOQ34GvDIbdPbhRI76+krzNFeWw== X-Received: by 2002:a17:902:bd0a:: with SMTP id p10mr37478777pls.159.1643915980357; Thu, 03 Feb 2022 11:19:40 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id q2sm32228274pgt.47.2022.02.03.11.19.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:40 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 10/21] accel: Introduce AccelOpsClass::cpu_thread_is_idle() Date: Thu, 3 Feb 2022 20:18:03 +0100 Message-Id: <20220203191814.45023-11-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::635 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Add cpu_thread_is_idle() to AccelOps, and implement it for the KVM / WHPX accelerators. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/kvm/kvm-accel-ops.c | 6 ++++++ include/sysemu/accel-ops.h | 1 + softmmu/cpus.c | 6 ++++-- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 7516c67a3f..95b7b08020 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -74,11 +74,17 @@ static void kvm_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } +static bool kvm_vcpu_thread_is_idle(CPUState *cpu) +{ + return !kvm_halt_in_kernel(); +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); ops->create_vcpu_thread = kvm_start_vcpu_thread; + ops->cpu_thread_is_idle = kvm_vcpu_thread_is_idle; ops->synchronize_post_reset = kvm_cpu_synchronize_post_reset; ops->synchronize_post_init = kvm_cpu_synchronize_post_init; ops->synchronize_state = kvm_cpu_synchronize_state; diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 032f6979d7..50c72540c7 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -30,6 +30,7 @@ struct AccelOpsClass { void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); + bool (*cpu_thread_is_idle)(CPUState *cpu); void (*synchronize_post_reset)(CPUState *cpu); void (*synchronize_post_init)(CPUState *cpu); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 538e1714af..5b0bcb8c65 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -94,10 +94,12 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - kvm_halt_in_kernel() || whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } + if (cpus_accel->cpu_thread_is_idle) { + return cpus_accel->cpu_thread_is_idle(cpu); + } return true; } diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c index 6bc47c5309..1d30e4e2ed 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,12 +83,18 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } +static bool whpx_vcpu_thread_is_idle(CPUState *cpu) +{ + return !whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); ops->create_vcpu_thread = whpx_start_vcpu_thread; ops->kick_vcpu_thread = whpx_kick_vcpu_thread; + ops->cpu_thread_is_idle = whpx_vcpu_thread_is_idle; ops->synchronize_post_reset = whpx_cpu_synchronize_post_reset; ops->synchronize_post_init = whpx_cpu_synchronize_post_init; From patchwork Thu Feb 3 19:18:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8FD2FC433EF for ; Thu, 3 Feb 2022 20:34:15 +0000 (UTC) Received: from localhost ([::1]:35076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFio1-0005B3-V5 for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:34:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhe4-0002q1-9O for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:52 -0500 Received: from [2607:f8b0:4864:20::42c] (port=44575 helo=mail-pf1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhe1-0002MS-Mp for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:51 -0500 Received: by mail-pf1-x42c.google.com with SMTP id n32so3017719pfv.11 for ; Thu, 03 Feb 2022 11:19:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=axRz0bpqXV6JMghxTUBPeiCtqNr2FiS0tX0ZbEy+MqU=; b=JQY/qC1jf7YSCBU0LGWhHHk51+qzV4fSLhaoivSEcwRHX5jhxCnuKppUkH8VBJrOPZ dPQ0H6lYx2ghmQYKydMdCb9/mzsgCL28rp396tXj2i58hGkGo394i9zHmtjDW9gVdrkz ydTKO42fp+zFaDwjwTmAXpNfs6iF2nP5WYeSt0NiKf5HK+gLyvGrvbtKFdv0k3rMX39Z gk/nFwlY22QPRZeWFsQw2Bk8tVeSUMgNOR8XPo1Ttza7NwgIHwN5/OC+21FI5KR0RBeO a5v/5FaZVxlweQe+5DAEQup4cYd52/qxcZI8T5Mg4K4cX3H0nRu6WnPIt6VvcTnAMhOg q4LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=axRz0bpqXV6JMghxTUBPeiCtqNr2FiS0tX0ZbEy+MqU=; b=NXAY3bZD3dwrHrbBg9XGr5lqAeqzOJnDIJv1lAjxvDCfp0BXZpFs3hoR/90yo2m7ZD PhPtaTolmHk5HYGqOyc703szClZyxWVcFsF68Z0L+VsSR5r4VC4zoSc5Hh92SCTSOzwZ GV16+C0/RV8TV9DcbK/1P12Yr5Ly6rG+0VQUYM6mW0cLkmxPlpqja5ev5PR6lD+SROet dqhTPlZOBFWQL9Noeyh2vtAjpCPqScAATRA+FtG9gnKMiNMLx0cq5zD3u6EgdhrYMbEu Y86/WoHGI5isc1QC6n1kh7A0o5jGHpJ5nBwMUd+Y/drAih78EzUd71f7X0PAu+bQjwDg nujA== X-Gm-Message-State: AOAM531OsqLczAJWA9d4KrB9LPLFNinwRrUJ45xHqghsL8DS7LJTnJwS N4fQvdxjdU5928sb/C42XQraZKRkMk4= X-Google-Smtp-Source: ABdhPJw/Qke57A8bUWndcrg++Ts1eyO52MnHbjTlS8MPl1m8emtS6QIDY2Fwkn0fwDhcjU3TV7pZDg== X-Received: by 2002:a63:f709:: with SMTP id x9mr29335262pgh.428.1643915988161; Thu, 03 Feb 2022 11:19:48 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id c17sm32065905pfv.68.2022.02.03.11.19.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:47 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 11/21] accel: Introduce AccelOpsClass::cpus_are_resettable() Date: Thu, 3 Feb 2022 20:18:04 +0100 Message-Id: <20220203191814.45023-12-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::42c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Add cpus_are_resettable() to AccelOps, and implement it for the KVM accelerator. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/kvm/kvm-accel-ops.c | 6 ++++++ include/sysemu/accel-ops.h | 2 ++ include/sysemu/hw_accel.h | 5 ----- softmmu/cpus.c | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 95b7b08020..cd4d4a06a7 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -79,12 +79,18 @@ static bool kvm_vcpu_thread_is_idle(CPUState *cpu) return !kvm_halt_in_kernel(); } +static bool kvm_cpus_are_resettable(void) +{ + return kvm_enabled() ? kvm_cpu_check_are_resettable() : true; +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); ops->create_vcpu_thread = kvm_start_vcpu_thread; ops->cpu_thread_is_idle = kvm_vcpu_thread_is_idle; + ops->cpus_are_resettable = kvm_cpus_are_resettable; ops->synchronize_post_reset = kvm_cpu_synchronize_post_reset; ops->synchronize_post_init = kvm_cpu_synchronize_post_init; ops->synchronize_state = kvm_cpu_synchronize_state; diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 50c72540c7..6013c9444c 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -28,6 +28,8 @@ struct AccelOpsClass { /* initialization function called when accel is chosen */ void (*ops_init)(AccelOpsClass *ops); + bool (*cpus_are_resettable)(void); + void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); bool (*cpu_thread_is_idle)(CPUState *cpu); diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h index 01b5ebf442..22903a55f7 100644 --- a/include/sysemu/hw_accel.h +++ b/include/sysemu/hw_accel.h @@ -23,9 +23,4 @@ void cpu_synchronize_post_reset(CPUState *cpu); void cpu_synchronize_post_init(CPUState *cpu); void cpu_synchronize_pre_loadvm(CPUState *cpu); -static inline bool cpu_check_are_resettable(void) -{ - return kvm_enabled() ? kvm_cpu_check_are_resettable() : true; -} - #endif /* QEMU_HW_ACCEL_H */ diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 5b0bcb8c65..79e7d7a608 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -199,7 +199,10 @@ void cpu_synchronize_pre_loadvm(CPUState *cpu) bool cpus_are_resettable(void) { - return cpu_check_are_resettable(); + if (cpus_accel->cpus_are_resettable) { + return cpus_accel->cpus_are_resettable(); + } + return true; } int64_t cpus_get_virtual_clock(void) From patchwork Thu Feb 3 19:18:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734608 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 76655C433F5 for ; Thu, 3 Feb 2022 20:08:49 +0000 (UTC) Received: from localhost ([::1]:43964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiPQ-00050H-Bv for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:08:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFheB-0002t1-2s for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:00 -0500 Received: from [2607:f8b0:4864:20::629] (port=36495 helo=mail-pl1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhe9-0002Mr-CP for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:19:58 -0500 Received: by mail-pl1-x629.google.com with SMTP id x3so3038098pll.3 for ; Thu, 03 Feb 2022 11:19:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DQdof7VmG4fP9HneeQI67zQ6Mp9xoMA/D8cCJfYkxBk=; b=hCy5k1c8AfpBE3r6hslGNIMfIWuOL37Lof+ogIHiqysKDSP79lIXOl3rl94+xmmJ+W j+Fiv/L5UZ8QHVKY1nF7SlGhKHNwA8vTAbjW9P5buphek1xKojl689d3/7RrSAM+sZKg 0ksBSbDG9w3BIRfMl/NVeuA4/ZhXffdX1HnrO7G56wcyXrdskyQ+iidh0i9UFlf3laZY SRnPvt0mVSxprwdjEvoUHymAn67v9GpAla3mPTDj7Ij2qWoDAfNuc0E0LTQsuYsbgpao 9+tZJBj97tepWcEYwFMwobaw5VvPg15uZFWLUR+K916FMrPtBhh8iG+acVellgLkK9Iu npfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DQdof7VmG4fP9HneeQI67zQ6Mp9xoMA/D8cCJfYkxBk=; b=enXXIQyMvizUutwMA6HIFqREmNVN4jaciSdAwtbIR+7id9wcZD1IotthyUsZRkcMbe OM8ReJzHiTr1MJP0yO0eMnmTMAYq0ix/5mbhdGflqfBOV68NsJxUBk4cPrVHfnPooWNU +Ngqi7zhynBTDbS5213C0TsBcr/l8TNqtpHjzfaP6H3D+8LxuGi97vjXFgmGcrYlNcsQ azFk3sCAh4xW6foXkZxHfqXsi8m7Eu4q7aGcTNAm6i7OY7/dz7SUdn2rZraY5EvOKR65 6OVMRSsSCM8Ox9hnnNQyn+1l3qCIROSG+imQLg/Hto1w/ib8tutcJ7BbasKvfaGCgwIx RexQ== X-Gm-Message-State: AOAM532/L/ARLTdYpT+797zGJYxRg2rXZ9vcdebXx7H2jGNdzM/+4m7s 1wsXRPA+AoRYG3bToOMcP3jhkDGEpQA= X-Google-Smtp-Source: ABdhPJx94xQ/8eZKVsYSzsHGAll+uSZ5w3Wzxcp9iAeeCzVfAEzKDJ+nNvE7ktPVUb2eQ/sUoJG/2w== X-Received: by 2002:a17:902:9a06:: with SMTP id v6mr19833326plp.109.1643915996055; Thu, 03 Feb 2022 11:19:56 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id s10sm17849172pfu.186.2022.02.03.11.19.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:19:55 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 12/21] softmmu/globals: Remove unused 'hw/i386/*' headers Date: Thu, 3 Feb 2022 20:18:05 +0100 Message-Id: <20220203191814.45023-13-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::629 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- softmmu/globals.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/softmmu/globals.c b/softmmu/globals.c index 7d0fc81183..3ebd718e35 100644 --- a/softmmu/globals.c +++ b/softmmu/globals.c @@ -25,8 +25,6 @@ #include "qemu/osdep.h" #include "exec/cpu-common.h" #include "hw/display/vga.h" -#include "hw/i386/pc.h" -#include "hw/i386/x86.h" #include "hw/loader.h" #include "hw/xen/xen.h" #include "net/net.h" From patchwork Thu Feb 3 19:18:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96557C4321E for ; Thu, 3 Feb 2022 20:38:25 +0000 (UTC) Received: from localhost ([::1]:43634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFis4-0002hY-Gp for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:38:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFheP-0002wm-Ic for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:14 -0500 Received: from [2607:f8b0:4864:20::434] (port=42993 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFheJ-0002YU-7f for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:13 -0500 Received: by mail-pf1-x434.google.com with SMTP id i65so3017702pfc.9 for ; Thu, 03 Feb 2022 11:20:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LTnoR1/7ie7sT/Lak77TlJ7qUxuvOUu3DpitIJDnHP8=; b=JHFZ4hGZHuhRDa6FP/+X2WKRc7jYvDjI8GaUtV/zcCGur9lax2cjeqJ05DG2Qmd4lt xI+uxuC6tuCLBR8lEM9h+oqPHVk8N78WeTfz+xzdpyyApV3HslN0bBg/9+FB9xwVHKy+ rSW5RCUUPujc47PjQXMoalaQwfvWGPqOa41+EizP613FLH3TzEgqJ5Ne3bSr+SWv2EwZ wlZvY2lJKcr5wXYjRjZUqy3k9rDek5wqFL8932yNlOSPg/1DvHAG9QTo2GypVEb2WQ/d nJA75QblksDb/P1AEs4Gli4pUhYMbARSYkJkWUlEMXsJqmNo+FcWwGl30YveSvPNtfYq SATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LTnoR1/7ie7sT/Lak77TlJ7qUxuvOUu3DpitIJDnHP8=; b=EtJuPVpAJ+JANfzzbTJW2Vlfsw/lEoIog9KNjw/I3ds0PURkQyo0aHXQnoF/ZqGBER 8l8cl04VdHbNxXWu3fLqUxKocs1NpcU/aPS3fFxZXHKPfBkfrFMQw18kzVMC7bQk5p/o +0l1ZsR1/NRwsTTc3NtBVR/0mKi+CgD/tOx7J8DIUUB9/RnIiHa1VqXzL8lH2FvKpsrQ XzkG9P0O6v9nURej5pcTecNbF0NZg3+rOB/fN5dBioRsA8bqTZppcbD3kAw+gw4Oqin4 YNuQtg1WU7/6125sd9jd2f8EHH5moDZnY3gNxGBKWXcBtmRBeaKyUgw2qBs+mFSIDbiV BCLA== X-Gm-Message-State: AOAM531S9C1Q73S9LaY2mDO5lmBl800zbyLHVxA0IcTQcO1NXAgZlmsH yflIWsupcuvwe1K3pZXS5IxujK6DKzY= X-Google-Smtp-Source: ABdhPJz9ucAurLbbLOoldzljJ2p1ROBeESc5bHj7ym0OejeOaeIK0syVXnpgMOEWFMDcFHEG2YqfbA== X-Received: by 2002:a63:2a92:: with SMTP id q140mr29357328pgq.379.1643916003793; Thu, 03 Feb 2022 11:20:03 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id 10sm29615630pfm.56.2022.02.03.11.20.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:03 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 13/21] softmmu/runstate: Clean headers Date: Thu, 3 Feb 2022 20:18:06 +0100 Message-Id: <20220203191814.45023-14-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Add the missing 'qemu/log.h' header and remove the unused 'exec/exec-all.h' one. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- softmmu/runstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/runstate.c b/softmmu/runstate.c index 10d9b7365a..3cb2758b33 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -30,7 +30,6 @@ #include "crypto/cipher.h" #include "crypto/init.h" #include "exec/cpu-common.h" -#include "exec/exec-all.h" #include "exec/gdbstub.h" #include "hw/boards.h" #include "migration/misc.h" @@ -44,6 +43,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/job.h" +#include "qemu/log.h" #include "qemu/module.h" #include "qemu/plugin.h" #include "qemu/sockets.h" From patchwork Thu Feb 3 19:18:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AF933C433EF for ; Thu, 3 Feb 2022 20:09:44 +0000 (UTC) Received: from localhost ([::1]:46406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiQJ-0006eI-Oc for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:09:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFheS-00030K-PO for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:19 -0500 Received: from [2607:f8b0:4864:20::635] (port=43676 helo=mail-pl1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFheP-0002ZP-AH for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:15 -0500 Received: by mail-pl1-x635.google.com with SMTP id d1so3007172plh.10 for ; Thu, 03 Feb 2022 11:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xRNuVWjHnz4AEmzf2/W8Pgl1VXuC167dQIcX38lV+CU=; b=IbzhXVZ63aqvpBQ4mJC1+6basybn8bDjyAcJeK2q0otu1hlhYPqh9XQdMW1gNlPQTn qgAmmvMc2Ez36XS8s+sFdZm/lQSmWqU+eeSbN1b8GBNZ0FeXt5G+JuizYk9TVNn7q6ES iDeUC+wgskV01ItVS3ROPjDDU2rOs/Yio5/mbdX4NhFWTYCrWi+JW4ItIfNAQ5rC8gFy 8Wnoapw8KrqeC5q7o4l06XcwIkkFFtfzxXhmyarCTIueZV6KV6o+ez3ICwyOSv0nifLA 3NuC4C69trkRa9okbv4E0kVct93g0xuKE4Lmjp5FOprY0hRAQZbf7K69qJP8bHmvXXoU 7LyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xRNuVWjHnz4AEmzf2/W8Pgl1VXuC167dQIcX38lV+CU=; b=N05r+kRbxlXnp4SPV9UkX5zdZtKAqkcMpB5et0pA4Cku7Ncs1Y27PIaIG3IYYstFrY /jleSWNJa5t7f63S9Lalzux6dgvOFUiP1Q66Ow6Xv3yzFATIvhuCrbXeZf3VETRZ9Kim +EMxs1njzwF6igsPSVRYKpfJVYCCwJE+dmkkcu5bCyIr8KHvzzlrfpHXg0dNHkZawVim fIHQOCuJsn1UwYw3dPP3/sNzHLkUIydOv9/UmN2d5MUDYXL/KRB3kR/aPxP8iBd2ai4j fPFIn7CG/ubD+iuid23VwM+f2IUq98ygni3R6fzBi858VNPJC203R6irbKxPSu9pbi+g u8Ng== X-Gm-Message-State: AOAM533GdQN942rWVKsem3LqG2xBQOWi/JCLpE6b/hzZBwhGiKcq/Cmu QyTAGpCrVX8ARZKWr0RmoATy5ayLW3A= X-Google-Smtp-Source: ABdhPJwVAhOmJBmAMpAEyFMvqi8mSu6dLqxPLQLu6swh5JdmNfZE3gPtWDV2FZZRlNSJFTswiS3N0Q== X-Received: by 2002:a17:90b:1898:: with SMTP id mn24mr15524129pjb.123.1643916011811; Thu, 03 Feb 2022 11:20:11 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id q16sm29876917pfu.194.2022.02.03.11.20.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:11 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 14/21] softmmu/physmem: Remove unnecessary include Date: Thu, 3 Feb 2022 20:18:07 +0100 Message-Id: <20220203191814.45023-15-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::635 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- softmmu/physmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index eb4b3bcae7..09951c0996 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -60,7 +60,6 @@ #include "exec/memory-internal.h" #include "exec/ram_addr.h" -#include "exec/log.h" #include "qemu/pmem.h" From patchwork Thu Feb 3 19:18:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3721C433F5 for ; Thu, 3 Feb 2022 20:14:11 +0000 (UTC) Received: from localhost ([::1]:54700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiUd-00045T-0i for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:14:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhee-00033Y-VG for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:31 -0500 Received: from [2607:f8b0:4864:20::1036] (port=43622 helo=mail-pj1-x1036.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFheb-0002am-MY for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:28 -0500 Received: by mail-pj1-x1036.google.com with SMTP id v15-20020a17090a4ecf00b001b82db48754so3964687pjl.2 for ; Thu, 03 Feb 2022 11:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AxlvwR4cZ7Av4E1LS2zUiBGxdy4OasZvxMlUKIvuHwA=; b=dHqtvO29cGT4zaRKOv+P0rJIcKsGc++t3nkaCyR9f71eAJk9cBtite6fB4eVoBI/1k 4/uxMzUdz99H50B9LnxzDeDhd+CZKfbJCUh9jY037Ry42uPsttcpRAor5ZLlol1jirfN /k0oiL9tNLKwrMbPRUso2l0h5hNzVD/vG+tkfg6p9+XI0JYOzO1rfqj5MFtZmiI2ueVY O5sweKavom0yubpIKumsSjs+4b6N9Nwnufl/2GNzvNIg+0CfWp7lKL9OFQl0qbtcmGSa 8twZuoB0R6Q4BIi5Yx0QIX6eAIKNXH5I2kFOwSVni8JjTO2FPNkvmNUlxnNeH9z52Pqz FStA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AxlvwR4cZ7Av4E1LS2zUiBGxdy4OasZvxMlUKIvuHwA=; b=gbqWjOwXXO3JIAXABpQFWlXo8IO4dYPxq1o+rVw9ziflETtWXh8uKUiPRnXNg5V9bS 6vW1bNc7GJTtuO+p3wLQNnBuBVOWqMMN6QgKCxFJOvbS4+LdnXh/cYlnJIYo7WaXG1Qo ODuaim0hwt+XfxndEZcHIz1iFVTOt1fn7s7p24uzbWXNnaT35uC6Ct4/KieK6YYLDdVt Q4rJ0HNLxELyQu0I+irW8vRiNpuWm0Pn/HlppFNcsZgHTANgS8ZcOL9upDek+fxXCfEl tcYQFqLF10QSSPu1Rrfs2kH0dgcoJBm7dW9cqHsJvSELLP8cVxMkaX9Olqiq4qEpxxmC t5fg== X-Gm-Message-State: AOAM532eHMt9VD3dy991KovoaZT8xBVXYuB7M5NWAqEv67W6fNPVn4AR qI77P54fFZwHqx4TqGHFmZC9L8R/ZVk= X-Google-Smtp-Source: ABdhPJx0OOdrZb96r1BWHi1AUvNXwEU55iEt/joEyvHwzl6EKZH7lvzANDjj67cSTdK3da03cZ79Lg== X-Received: by 2002:a17:902:c702:: with SMTP id p2mr36519916plp.140.1643916019601; Thu, 03 Feb 2022 11:20:19 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id rj1sm10987257pjb.49.2022.02.03.11.20.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:19 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 15/21] softmmu/cpu-timers: Remove unused 'exec/exec-all.h' header Date: Thu, 3 Feb 2022 20:18:08 +0100 Message-Id: <20220203191814.45023-16-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1036 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1036.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- softmmu/cpu-timers.c | 1 - 1 file changed, 1 deletion(-) diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c index 34ddfa02f1..204d946a17 100644 --- a/softmmu/cpu-timers.c +++ b/softmmu/cpu-timers.c @@ -28,7 +28,6 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "exec/exec-all.h" #include "sysemu/cpus.h" #include "qemu/main-loop.h" #include "qemu/option.h" From patchwork Thu Feb 3 19:18:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 931C3C433EF for ; Thu, 3 Feb 2022 19:56:16 +0000 (UTC) Received: from localhost ([::1]:55698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiDH-0001Qi-6o for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 14:56:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhek-000349-DZ for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:36 -0500 Received: from [2607:f8b0:4864:20::102a] (port=56055 helo=mail-pj1-x102a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFheg-0002cc-9P for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:32 -0500 Received: by mail-pj1-x102a.google.com with SMTP id d5so3330217pjk.5 for ; Thu, 03 Feb 2022 11:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hXuL5YKIALD9IBgRuEj91y6p+IaDzTghFwjHaE32qFw=; b=DeINhqlKP7iygqbYhir8vdgZuTz+ESlw43t9rFS61fr05BSzBGUl6BrDaT8q/jxj6R Z//hVpcz+wFUu2kjC4YlDMqFVV7NR3bTyR0Q8xOj4vOnovNJ2A0Ef+79s2CoefgGb6p9 sCb/Xxx2ExQ0sq7WvVhixNWFtbMlkjPG/AY6D9D/vg40yDwSj0YaK5tMaDKzSfU+EQVa 0XKe8YQMxXF3RFBl+ICZrncEGAqG5TH4wgA7Z6dJuQJWTx/BG0MPg7+UezpgRjWPr9+b UGUpR/K1JYw8WG4td8ZMsMOXssaIsyfkzRYcmDxw6jq/lFyB7gMDqmEG0S09DGi3LyUP lqFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hXuL5YKIALD9IBgRuEj91y6p+IaDzTghFwjHaE32qFw=; b=Voa0ZjSKtX1atHW4Xp76O2xHQFWzdLCf8WUwqQVmBxe9dSREQg2II61q1EqITww9/r lCfNxO+lTAsGZdbeNFueNUjaCX4t1Zp8jDp5oRQhfgQOjrdNK1O5TOje91jm7pER7BHV Glr7l7Uk5c+VqFYv23y2NvEDOMClRHgq6nob1L3MAD09zOKtBxWxXDDfSvbU6OUsRQox 1Rlz6AThfwsPQLC/vDPfL+I4OiAgrd4iQdcIRCho3WWq0mmoLCWpvBfCSQvqVJYugLus k9h/sSxwQCYmFiySjZLzyj5uf0/ZI12hPhmaBSAFC5Vxy/7xwuPhgk87wYYC4ZD2qXLu Ikng== X-Gm-Message-State: AOAM530btr0D6sX9puCGAa6/19g+1HFC0ffSpq5hZ9/GyJ1ULbPWXfoJ hwEUw4MYBs1YitMxCh6tJlo4UCz+co0= X-Google-Smtp-Source: ABdhPJwh5xUuinjAtLf8GVxxPX9YmhwaLWzoGpLW1BR59xmUxg773gH0yRPJ2dgDPy8tM5rl95uTHQ== X-Received: by 2002:a17:902:ea09:: with SMTP id s9mr37297981plg.120.1643916027383; Thu, 03 Feb 2022 11:20:27 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id q21sm31329890pfu.104.2022.02.03.11.20.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:27 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 16/21] misc: Remove unnecessary "sysemu/cpu-timers.h" include Date: Thu, 3 Feb 2022 20:18:09 +0100 Message-Id: <20220203191814.45023-17-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/qtest/qtest.c | 1 - target/alpha/translate.c | 1 - tests/unit/ptimer-test-stubs.c | 1 - 3 files changed, 3 deletions(-) diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d5..f6056ac836 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -20,7 +20,6 @@ #include "qemu/accel.h" #include "sysemu/qtest.h" #include "sysemu/cpus.h" -#include "sysemu/cpu-timers.h" #include "qemu/guest-random.h" #include "qemu/main-loop.h" #include "hw/core/cpu.h" diff --git a/target/alpha/translate.c b/target/alpha/translate.c index ca78a0faed..66768ab47a 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "sysemu/cpus.h" -#include "sysemu/cpu-timers.h" #include "disas/disas.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c index 2a3ef58799..f5e75a96b6 100644 --- a/tests/unit/ptimer-test-stubs.c +++ b/tests/unit/ptimer-test-stubs.c @@ -12,7 +12,6 @@ #include "qemu/main-loop.h" #include "sysemu/replay.h" #include "migration/vmstate.h" -#include "sysemu/cpu-timers.h" #include "ptimer-test.h" From patchwork Thu Feb 3 19:18:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B275C433EF for ; Thu, 3 Feb 2022 20:02:45 +0000 (UTC) Received: from localhost ([::1]:36036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiJY-0007pB-GZ for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:02:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhet-000358-7H for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:06 -0500 Received: from [2607:f8b0:4864:20::102d] (port=46901 helo=mail-pj1-x102d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhep-0002d5-2i for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:40 -0500 Received: by mail-pj1-x102d.google.com with SMTP id oa14-20020a17090b1bce00b001b61aed4a03so3934160pjb.5 for ; Thu, 03 Feb 2022 11:20:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DAhWgX1CCDQgRZUZ9Tcvj63seo9f1XrB5as1gD0Wfjg=; b=OKWJWtg24ECQfs+zTcXNJLWT6vmAZnkH5v8TourcbFgPx3VZtbyrMdiL6K3KNiQcZv WHp9Jzq0WJMMuTi9PVgyFcPnFMhxX/J2EswoK6npggtcRUmFFgGNS3UNyfovCRnyn5w0 8ziv1sWe4GsBCUB0f14mQL0AYW5v3NZ8+BxxnS3VZxDFIXle/nUF/Eu8AdBwFeWKWcOP AP9+wnjjqnuRXBWkkrrXPAGEkFeSKheKy+DztyPNYV5Qu+rMmISQAqewVqbgqAzYCOcg s9SWHO6fF0HihyCR63MPST6jWUM7Yn8P1NcXpyt+/SHLN0VubpVyW74orcrnpV6vJfiq AODw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DAhWgX1CCDQgRZUZ9Tcvj63seo9f1XrB5as1gD0Wfjg=; b=vaUu6GHsPvzXcdLLGFkgbw7JyaQr6IneSMP13tR7T0vs4L02JI2FIdVd+d3hZ+w9Yr nQ3kSg32d6k8t0ScuiB3QqTqoIxuTjtBhUONS+A5r3CqwgLzgSm2zLkg5I4mzb0DnkDR +OVqO1HnRCa/fPzbUUG+1DGfetgZkmk1gxRKGwxZ1UAI1RcrOn2rrtHZuLSDhnrEcfaq msz/pb9TxCFRheaqvhB7bdW78iXLnZi3CywJBGVUawj/8Pc8V0jihBv21Og9ZsNxx+yi IxLLdrLEz2bALm+S+0RUkIXLydExKHqROxqVgbqblcCQFctbLqW3NtYa6kkL1LehRDUD 3MDw== X-Gm-Message-State: AOAM533cu1VCoIVmArPzNvD/RMICKRirzWgZ34/jJ4OF1AFabr8jdAmb KvhTBKpZAdTX7u1lH4TqFPTaVeHs704= X-Google-Smtp-Source: ABdhPJzVVcj9vEfoGMK5BmTXH3ZMfXV5bQpjBXELIkDsvRmBSACC7i9/CDA3mwtDVmc3FGJm2Sc+jQ== X-Received: by 2002:a17:902:e5cb:: with SMTP id u11mr36293152plf.146.1643916035243; Thu, 03 Feb 2022 11:20:35 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id z17sm14822200pgf.91.2022.02.03.11.20.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:34 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 17/21] misc: Add missing "sysemu/cpu-timers.h" include Date: Thu, 3 Feb 2022 20:18:10 +0100 Message-Id: <20220203191814.45023-18-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/tcg/tcg-accel-ops-icount.c | 1 + accel/tcg/tcg-accel-ops-mttcg.c | 1 + accel/tcg/tcg-accel-ops-rr.c | 1 + accel/tcg/tcg-accel-ops.c | 1 + include/exec/exec-all.h | 1 - target/riscv/csr.c | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c index ea42d1d51b..bdaf2c943b 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "sysemu/tcg.h" #include "sysemu/replay.h" +#include "sysemu/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c index 29632bd4c0..dc421c8fd7 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "sysemu/tcg.h" #include "sysemu/replay.h" +#include "sysemu/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/notify.h" #include "qemu/guest-random.h" diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index bf59f53dbc..a805fb6bdd 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "sysemu/tcg.h" #include "sysemu/replay.h" +#include "sysemu/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/notify.h" #include "qemu/guest-random.h" diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1a8e8390bd..ea7dcad674 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -29,6 +29,7 @@ #include "qemu-common.h" #include "sysemu/tcg.h" #include "sysemu/replay.h" +#include "sysemu/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 35d8e93976..87df70fa8f 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -24,7 +24,6 @@ #ifdef CONFIG_TCG #include "exec/cpu_ldst.h" #endif -#include "sysemu/cpu-timers.h" /* allow to see translation results - the slowdown should be negligible, so we leave it */ #define DEBUG_DISAS diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e5f9d4ef93..a4db40769b 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" +#include "sysemu/cpu-timers.h" /* CSR function table public API */ void riscv_get_csr_ops(int csrno, riscv_csr_operations *ops) From patchwork Thu Feb 3 19:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54DA9C433EF for ; Thu, 3 Feb 2022 20:13:48 +0000 (UTC) Received: from localhost ([::1]:52646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiUF-0002eQ-6q for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:13:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhf3-00035N-GN for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:13 -0500 Received: from [2607:f8b0:4864:20::62e] (port=45773 helo=mail-pl1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhf1-0002dO-Cn for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:52 -0500 Received: by mail-pl1-x62e.google.com with SMTP id s6so3003285plg.12 for ; Thu, 03 Feb 2022 11:20:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z4B30BDBN8zTHKXNizOw6js0bo6ETgyInEfiIbfWw7I=; b=fFrbpDgtK1wE3hmCkgvzm9XHpb6Bu4N+IbySkeMzgN4rJwaPl07hglNPDCfVp6F7NE JvO4buvLqyB9twW3EtTQsVNxovSM2/bVVEHnEbMyM8xm65ZF2w0q6JTgOr4mp9ucH17B nInWgaEr2HxhpJeAv6KcFxTU9UAthOxZ6EDbSjO+eCZVnz7C4KHyWQ3dDzEXABtDlPJj lEhOFa2kBW3sJjd+sTt4/m8JZc99oZ28MUuA541W3rpfH+OfagAtm6/Idh1nYUM8CtP6 iTrOM12d3kgYMY0EyWqnHBItfP2Eyydg9+ML9wX9KzKcrzmxXrUpkA+iXRIFTHSxqzkJ XF4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z4B30BDBN8zTHKXNizOw6js0bo6ETgyInEfiIbfWw7I=; b=WHWTCR64UNTRA8af0t72A91NeJH2OgO/7hloIP5Ns7oeHLphZBoevA3EL06wW8d29u DcMEcg+s3JAOpcPvg0VOLg1yRbWWsTsVkvhJp+srj0QgzZIFImDlcaxskp1RQmgvOwYz ZtWUPclqeiBufU8lIamIFXw6MrQxh5Xa7ymJv3vGQba1PIXXe3sPDCPO19kKCet+wya+ Z8T7USn4geZgGgGj76wcTn6Wlwc/OGRI3M+PRJrdYCRBkrfNYP+wwV0x8C7Avue/oDy7 tK3crTs7MasJtl7ZQp5TyeGPj7S0EiG4qcdpZUYPzyTO/SgIFstRhwCKWPseigIUO1ia q/oA== X-Gm-Message-State: AOAM532ELbGcSyeV+LzwkqkEsQdEEwE4/tqTBmeJG95WNizojrrqn3LH RCTRFEO/MxE2oIeyRloZTRKmWCJ7fCs= X-Google-Smtp-Source: ABdhPJztIP6+ZZyp8t1n112S+GIvMfXfocbDsXOyC/CdlfPUjOnsgXk3SR+lyuwpPAwbv/sV1yP7rA== X-Received: by 2002:a17:902:b213:: with SMTP id t19mr36185352plr.65.1643916043144; Thu, 03 Feb 2022 11:20:43 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id j18sm31340481pfj.13.2022.02.03.11.20.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:42 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 18/21] exec/gdbstub: Make gdb_exit() / gdb_set_stop_cpu() target agnostic Date: Thu, 3 Feb 2022 20:18:11 +0100 Message-Id: <20220203191814.45023-19-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= gdb_exit() and gdb_set_stop_cpu() prototypes don't have to be target specific. Remove this limitation to be able to build softmmu/cpus.c and softmmu/runstate.c once for all targets. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/exec/gdbstub.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index a024a0350d..84b1f2ff2a 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -45,17 +45,6 @@ void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...); */ void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list va); int use_gdb_syscalls(void); -void gdb_set_stop_cpu(CPUState *cpu); - -/** - * gdb_exit: exit gdb session, reporting inferior status - * @code: exit code reported - * - * This closes the session and sends a final packet to GDB reporting - * the exit status of the program. It also cleans up any connections - * detritus before returning. - */ -void gdb_exit(int code); #ifdef CONFIG_USER_ONLY /** @@ -177,6 +166,18 @@ static inline uint8_t * gdb_get_reg_ptr(GByteArray *buf, int len) */ int gdbserver_start(const char *port_or_device); +/** + * gdb_exit: exit gdb session, reporting inferior status + * @code: exit code reported + * + * This closes the session and sends a final packet to GDB reporting + * the exit status of the program. It also cleans up any connections + * detritus before returning. + */ +void gdb_exit(int code); + +void gdb_set_stop_cpu(CPUState *cpu); + /** * gdb_has_xml: * This is an ugly hack to cope with both new and old gdb. From patchwork Thu Feb 3 19:18:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D5FCC433FE for ; Thu, 3 Feb 2022 20:09:22 +0000 (UTC) Received: from localhost ([::1]:44742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiPx-0005W7-6A for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:09:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhf4-00035P-Kl for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:13 -0500 Received: from [2607:f8b0:4864:20::102a] (port=44714 helo=mail-pj1-x102a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhf2-0002dq-Am for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:20:54 -0500 Received: by mail-pj1-x102a.google.com with SMTP id y5-20020a17090aca8500b001b8127e3d3aso3941507pjt.3 for ; Thu, 03 Feb 2022 11:20:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=985euxmFHnl3qICip4SKX2brlsgOFAR3iQs3qGSRI3M=; b=nDrzIi5DPDj2kdzN2d4WkF6Yz05dB7VTKkAw9NhfWih1+Q6FzZ5kMHpOwgTnh9tC7K qWgocaWSeiU2BxqrKc5TCkD/resGbvO1u7DyW4U3WFkFELmkUdci7Dwsf1WUDwsuMqBa ezjQc2FDqvT/wlGAaC+EJjhnXCu/wS5iT1FIPjTcAFm1bqbtz9i6jDQvA6G1T5S1TLtk iSSFF8KPr5CG/2ocwCxRR3toBpReIzb0aQbYFr87ZCAzyHW7PcLs6JWY42eZVjE0ShTI Q1lu4TIiui1GhSn8n8LFDbe6iK7mM7FCA6t74U7PwBbddmpzAbmwXQW2WaEBTKiRlHi7 qLhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=985euxmFHnl3qICip4SKX2brlsgOFAR3iQs3qGSRI3M=; b=N/5ZhLpKTLjbpVKJB4k4rtcUeCCnEZX9Ula/R9+sIzxExRsbVKidYb1RQP/kOVsgSv kyfZjWgYYzGRsEa7gR49xOgJ4lF0/qmowYf0obvieXbJ9AO0dk5c79GYE/Um+CBhy6rN dzTQgSy0y8Ekyez0aJIpKAMySBmWlPmkt+C5507nuW/xWqOrLDU7je4c1Tw2bD4ahxQT zxqR0OThXIv5sSoRPBm7qa2/ULAjEg2oPuyx7O+Qd6djrrKXg9P7+2QJDKMB8/kJvHU3 wNBnBwOHQBwlvWtrRqFUjuWprLZr5bJLAAms2cuPvdeuxC87Tp2YZ7unUxrM4CdyshSk 6FYA== X-Gm-Message-State: AOAM532EgYYCDai+YL7KIAepsA4xy80Rb3a2IUYN09YZ9kLr0+q+xs8x EEYeW+DRqaUVUW22TqaKLzxXdU4UpUw= X-Google-Smtp-Source: ABdhPJxfWUDcdsiKG+Z3iNiEoGHD8hHanp/oDptq2apXtYfPbas23+Pmlhw0P7YvzVfNlh6JoDV6fg== X-Received: by 2002:a17:902:a418:: with SMTP id p24mr11286948plq.171.1643916051059; Thu, 03 Feb 2022 11:20:51 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y15sm30262731pfi.87.2022.02.03.11.20.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:50 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 19/21] exec/cpu: Make address_space_init/reloading_memory_map target agnostic Date: Thu, 3 Feb 2022 20:18:12 +0100 Message-Id: <20220203191814.45023-20-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= cpu_address_space_init() and cpu_reloading_memory_map() are target-agnostic, but are declared in "exec/exec-all.h" which contains target-specific declarations. Any target-agnostic source including "exec/exec-all.h" becomes target-specific and we have to compile it N times for the N targets built. In order to avoid that, move the declarations to "exec/cpu-common.h" which only contains target-agnostic declarations. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/exec/cpu-common.h | 23 +++++++++++++++++++++++ include/exec/exec-all.h | 25 ------------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 8031ebc680..7f7b5943c7 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -90,6 +90,28 @@ void qemu_ram_unset_migratable(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); +/** + * cpu_address_space_init: + * @cpu: CPU to add this address space to + * @asidx: integer index of this address space + * @prefix: prefix to be used as name of address space + * @mr: the root memory region of address space + * + * Add the specified address space to the CPU's cpu_ases list. + * The address space added with @asidx 0 is the one used for the + * convenience pointer cpu->as. + * The target-specific code which registers ASes is responsible + * for defining what semantics address space 0, 1, 2, etc have. + * + * Before the first call to this function, the caller must set + * cpu->num_ases to the total number of address spaces it needs + * to support. + * + * Note that with KVM only one address space is supported. + */ +void cpu_address_space_init(CPUState *cpu, int asidx, + const char *prefix, MemoryRegion *mr); + void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write); static inline void cpu_physical_memory_read(hwaddr addr, @@ -102,6 +124,7 @@ static inline void cpu_physical_memory_write(hwaddr addr, { cpu_physical_memory_rw(addr, (void *)buf, len, true); } +void cpu_reloading_memory_map(void); void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen, bool is_write); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 87df70fa8f..199fd49e5d 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -82,31 +82,6 @@ static inline bool cpu_loop_exit_requested(CPUState *cpu) return (int32_t)qatomic_read(&cpu_neg(cpu)->icount_decr.u32) < 0; } -#if !defined(CONFIG_USER_ONLY) -void cpu_reloading_memory_map(void); -/** - * cpu_address_space_init: - * @cpu: CPU to add this address space to - * @asidx: integer index of this address space - * @prefix: prefix to be used as name of address space - * @mr: the root memory region of address space - * - * Add the specified address space to the CPU's cpu_ases list. - * The address space added with @asidx 0 is the one used for the - * convenience pointer cpu->as. - * The target-specific code which registers ASes is responsible - * for defining what semantics address space 0, 1, 2, etc have. - * - * Before the first call to this function, the caller must set - * cpu->num_ases to the total number of address spaces it needs - * to support. - * - * Note that with KVM only one address space is supported. - */ -void cpu_address_space_init(CPUState *cpu, int asidx, - const char *prefix, MemoryRegion *mr); -#endif - #if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) /* cputlb.c */ /** From patchwork Thu Feb 3 19:18:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734614 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2759EC433EF for ; Thu, 3 Feb 2022 20:13:58 +0000 (UTC) Received: from localhost ([::1]:53262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiUP-00036W-3i for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:13:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhg4-0003JM-87 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:58 -0500 Received: from [2607:f8b0:4864:20::1033] (port=45719 helo=mail-pj1-x1033.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhfO-0002gd-2c for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:38 -0500 Received: by mail-pj1-x1033.google.com with SMTP id g15-20020a17090a67cf00b001b7d5b6bedaso3935420pjm.4 for ; Thu, 03 Feb 2022 11:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=msH7qg69hCRTFoTF2Q5gZeU9fIFrOr0593v5UHiptQg=; b=Gv83Npq66QIBvlqIVVM4outynwaVPa79Cc98c5B34pAvbUZBEg58bk8nEh0oUD2Ceq 9Te7q4uEjxV2tn4nfG5MEqXJa5J2ofjyK60/uU+M9t1kKsea+tAmtl9QWhdtLo85Mg7V +3bMYMKNgyJz5aQlM5IgxWDW9WZnQHMph3BtMl07mskBrgUdUAZndAyBhx+tutr2033H USs7qYjeuxmZD/cgFlvg3zU1Aihxj+NwgBg6EH4NPeW4716rRAtuEBOZElnRUAGL4Yuh ASuFIZHVg6HtnyBL/UyZ0drRw6Ol2q/4bN2f2lUd9gHj85ziDhElLwzFQYfWx1Oyc6DP kMJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=msH7qg69hCRTFoTF2Q5gZeU9fIFrOr0593v5UHiptQg=; b=XniidTwaPjFFBmrc48DEp8edtfkf2d2qXIGYSNlPTNFuvsY2zkK4ad9+XXq9d7lI9s x1go7dOPSqHad+Dg+KYlYF4UtCYgve4QU4lPnu0qvGOFkAffw5rinGlBbUSQnEAsN0uE HObzGbPddzBOAc4nGKU0lpIo9eVbuk7D3G6ckm3NBSRnBinx6C66Ln9Hm60RUCTcXJpJ SURqogaNicmdIy197rJe+nU8okKOXHT3YsnbhsM4dwkwqpPOhIk8kKEHUSEuOhFSnRCJ j/nHkgEhAVtRL4FkRXSAF2T22emF5PQGWBKb7VMTFgUSC24VYQzM7ocgD3D5UYEf2yXt wuQQ== X-Gm-Message-State: AOAM530e/O5DdTBCWA9yAhEZY1S/KvjUMJknxJiU92ENZVI/SmoSe5v3 AENdGpspykYWiSac8CJkfwst+kKrcqY= X-Google-Smtp-Source: ABdhPJxdh68txC3Y4IBrDhLkSmxE6TgVO6FT9aSiAoftQCzb1+3GgJkOEd2ReSoyBUfCodYEXszQ7A== X-Received: by 2002:a17:902:d4ce:: with SMTP id o14mr37545383plg.39.1643916059493; Thu, 03 Feb 2022 11:20:59 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id l26sm37134129pgm.73.2022.02.03.11.20.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:20:59 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 20/21] softmmu: Add qemu_init_arch_modules() Date: Thu, 3 Feb 2022 20:18:13 +0100 Message-Id: <20220203191814.45023-21-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1033 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1033.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= module_allow_arch() is the single target-specific call in the whole vl.c file. Move the module initialization out to arch_init.c, that way we'll be able to build vl.o once for all targets (the next commit). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/sysemu/arch_init.h | 2 ++ softmmu/arch_init.c | 9 +++++++++ softmmu/vl.c | 5 +---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 70c579560a..79c2591425 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -28,4 +28,6 @@ enum { extern const uint32_t arch_type; +void qemu_init_arch_modules(void); + #endif diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c index 8919405c7b..79716f959b 100644 --- a/softmmu/arch_init.c +++ b/softmmu/arch_init.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "sysemu/arch_init.h" #ifdef TARGET_SPARC @@ -39,3 +40,11 @@ int graphic_depth = 32; #endif const uint32_t arch_type = QEMU_ARCH; + +void qemu_init_arch_modules(void) +{ +#ifdef CONFIG_MODULES + module_init_info(qemu_modinfo); + module_allow_arch(TARGET_NAME); +#endif +} diff --git a/softmmu/vl.c b/softmmu/vl.c index 5e1b35ba48..08ff97f4e0 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2814,10 +2814,7 @@ void qemu_init(int argc, char **argv, char **envp) error_init(argv[0]); qemu_init_exec_dir(argv[0]); -#ifdef CONFIG_MODULES - module_init_info(qemu_modinfo); - module_allow_arch(TARGET_NAME); -#endif + qemu_init_arch_modules(); qemu_init_subsystems(); From patchwork Thu Feb 3 19:18:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12734618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01868C433EF for ; Thu, 3 Feb 2022 20:18:32 +0000 (UTC) Received: from localhost ([::1]:35092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFiYp-0001fF-GQ for qemu-devel@archiver.kernel.org; Thu, 03 Feb 2022 15:18:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFhg4-0003JN-Ao for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:58 -0500 Received: from [2607:f8b0:4864:20::532] (port=33678 helo=mail-pg1-x532.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFhfk-0002k0-KU for qemu-devel@nongnu.org; Thu, 03 Feb 2022 14:21:39 -0500 Received: by mail-pg1-x532.google.com with SMTP id 77so256053pgc.0 for ; Thu, 03 Feb 2022 11:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ipZZmmEYAV0Faklno+YLR1/AxWA537FIQ9fu6VgkBm0=; b=h1oo6mdfNdxBcnxp8s0U7AZWf8DlTU1gCYU6+p5recskShI9IRf8u7b6JiRBYUzvPq KWRaZKqZgaTEyHC7rwGXOpsU8vXNUb0H1z9b34GnYvRhBzOeuYcfOUqFD5rG16T9Exlb eXeD2iDdcrbqzXht1nIFLdaMcTfMgwVk4J+8EFXzqx4wElBikJgC8yPc/sZzycHfgBoK n+i9jkynBEqb1QVktroDYwhEFb0hB5AF7IBHkg+cmJ+mpmX5YXJEIhsYt8gDaVLd9tZ0 RErJZGeVxpiul64Up6eFq8+ajMtDB6ZwiOFDpcTg7FWmjIBICD9HrEhI+KRIcszQH61j mSKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ipZZmmEYAV0Faklno+YLR1/AxWA537FIQ9fu6VgkBm0=; b=RYpjsPNZ8vuRTdRSbqjWAUKRVYg+HELcSg9z5owlKnYVjrLd1WKISQQ+JLPXfCQhS/ GO2EXWSdUsfiVSn6+B53OVnZPFCVWP4V6kY80sRsGvuhtgt8yKe9UQzOm/GWUzDqmwVo /Ty8by57l103hO4P4JJWgpIBPNKjCLw5C/21KSD3GnS+l6OtrwxaDdDmqROkaalt5mjX nr02XN1fnzdk+3+evDgBvS8Jnmbkosa/yZYGnYc+JfRJ5bztqmtaShc/CCJ4YrUZ5Q1m L9DqORTvz6DB6fdFCqPoiiXQFQJDrgQ9Hk4HyYKFYn1aEJ+8Acwdewzmfpzggel1qVfG 9Wng== X-Gm-Message-State: AOAM533+jSAehChp9ZTN1SJ4JhlnTVOnm3FcoSjJl8+VKJ5B0E5N/Jxg gncCY+EB6vF0sLSbId9928g4htPLwsw= X-Google-Smtp-Source: ABdhPJzGfqDzehZP/xyncgAMkOzBM3jzFli/zXCGdKGMOzu2zbhNG0mhur/NVJIVr4/BaCyf4ROTeA== X-Received: by 2002:a63:5226:: with SMTP id g38mr29466845pgb.620.1643916067435; Thu, 03 Feb 2022 11:21:07 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id e14sm30140830pfv.219.2022.02.03.11.21.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Feb 2022 11:21:07 -0800 (PST) To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 21/21] softmmu: Build target-agnostic objects once Date: Thu, 3 Feb 2022 20:18:14 +0100 Message-Id: <20220203191814.45023-22-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203191814.45023-1-f4bug@amsat.org> References: <20220203191814.45023-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::532 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pg1-x532.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Various softmmu objects aren't target specific. Move them to the generic softmmu source set. For our 31 softmmu targets, this is in total 330 objects less to build! Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- softmmu/meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/softmmu/meson.build b/softmmu/meson.build index d8e03018ab..d2badf203b 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,20 +1,9 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'arch_init.c', - 'balloon.c', - 'cpus.c', - 'cpu-throttle.c', - 'datadir.c', - 'globals.c', - 'physmem.c', 'ioport.c', - 'rtc.c', - 'runstate.c', 'memory.c', - 'memory_mapping.c', + 'physmem.c', 'qtest.c', - 'vl.c', - 'cpu-timers.c', - 'runstate-action.c', )]) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( @@ -22,9 +11,20 @@ specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( )]) softmmu_ss.add(files( + 'balloon.c', 'bootdevice.c', + 'cpus.c', + 'cpu-throttle.c', + 'cpu-timers.c', + 'datadir.c', 'dma-helpers.c', + 'globals.c', + 'memory_mapping.c', 'qdev-monitor.c', + 'rtc.c', + 'runstate-action.c', + 'runstate.c', + 'vl.c', ), sdl, libpmem, libdaxctl) softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))