From patchwork Fri Mar 10 19:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661647 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033493wrb; Fri, 10 Mar 2023 11:54:21 -0800 (PST) X-Google-Smtp-Source: AK7set8ZjblAjbwLXT39sPzZ84rYFZYVWbbpVmNmuVqFQriO3ttUmnWVk7Lu+3bA6h5sJwYBNyqK X-Received: by 2002:a05:6214:c61:b0:56e:9ef7:e760 with SMTP id t1-20020a0562140c6100b0056e9ef7e760mr344869qvj.12.1678478061543; Fri, 10 Mar 2023 11:54:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478061; cv=none; d=google.com; s=arc-20160816; b=PUgmKyfcx1QPW8A9eQNpmZ70xr+itl+P3faZhcM6O/deHJXAEPG8QUnqouAFAdMQsG zfLrNXOJxOTFHHkqZL8d06xoIN57A6zIBdRl/RCLeNckNLDsVekY27gltLMB4N3TxmA8 dGvgQm25IYJv5TYVvzHNdAoC2LNGLZ5SRbmZNiC5t/n/nXxdb4nO2wuUtx6ex4Rp6ljh glgJM+aM8pgs86gIrd47NVIWVv/njXDlVKWWzCBRYhXaxT9FaFZN0N2vknVyvNrLhrKS ujqVfykJ1CSIlJzpC6TPdw+1zxNlDZlDCsW82QDmaZz7CoUefgsEqJUn55OEQid93IuN 4uog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VinaJbb8DVp1aqRzxC41hI4XOXtUHZDUYlixLfYKlTE=; b=Lw4jmlPT30w2nqTWfVstkF4/6Fmy0UaUaGuxiH586bXw0o2+Jeimi9vwTqNFX22o65 vAsoo/Ai6Hzjw8+p/j7DPOFWz4O/FrFMGuuJ8PWHKZl38VKaljLxBnKW0HSrE4mHj3T5 JgDWoasUogbLge6V6jvAMtbdXTCmGTZi4Upl0zbt+0I73A3tevJmlBddFOjM3lMfN9Ox YvdYg4zaBzFp7iGh5DJ0/ju5YXqhlTnENfRXpeEJh4p+zUq4FKF63Z3JVv+so2aQM8va QjyuUcBn5vtS36gLa6NoZCwzGk7lrkXcOfbG9T2ByF8fmFClBamm4YU2OOtUhIuzIIOy YL6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="QVgDh/oG"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l3-20020a0ce083000000b0053b4ca430bbsi337467qvk.406.2023.03.10.11.54.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="QVgDh/oG"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painU-0001Fc-BB; Fri, 10 Mar 2023 14:53:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painR-0001Eh-P9 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:57 -0500 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painQ-0004eO-3k for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:57 -0500 Received: by mail-pj1-x1035.google.com with SMTP id me6-20020a17090b17c600b0023816b0c7ceso10997829pjb.2 for ; Fri, 10 Mar 2023 11:52:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VinaJbb8DVp1aqRzxC41hI4XOXtUHZDUYlixLfYKlTE=; b=QVgDh/oG7rju73BZIwWWatnasdnyMMg2uy1Q0BGBudUyW8znYFapWoZ+BdGdxebsPo qrTQL4PQ2BrikqFXmpGDf+udozzflkgLBTlFs1OOac0AQbIaxt1uUhp3MS9/3/s42glQ MfnTDbTsHOBFhM409sHZkxABhu1ARjMxu2SUd6gjXHAaQ62UIep/+sP1iEOJPH8G6JYB MG3/tpNU7oqNLs6EW0zv3QlyYfUW9sQRvu7fjAXDXjVi7wZHNvDWV3I7oqTsAbo7IbU3 jd09Swhk6FIOcmcRrxGwQD9+nj1pW8MZjQg49DuPyios8hZbLFZ1fkBzr+bAqHJhkH6i 1hxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VinaJbb8DVp1aqRzxC41hI4XOXtUHZDUYlixLfYKlTE=; b=gMJccwcb8koSqmEYR/PvdJo886hxpITKxcMfhIzNv7b8Fxt2ca/rQAeMBybklBDKp1 0hnfMZ5yeCVnEVFy9mPv6O/eHgOby34waM22rzWp7NByXfRo73Ar1x3oyQU1EQKvwfqp KEtiYyeKbo5DJD8WhYulydo4vo4L9HtC3JS4HeHsCCgkHUsmUcp8ZF2u2/RzH4xHvgX5 GIAIuEfV/Y5XSqbJb/kbugXIrffz4wjLQcBDC0SuTuJx8RS4u3IiyZOzcVoldGwxGuj+ qwSNShceLSBci059podo/KGeXEd0iMFCiW6WuJ/9AawfhcJjg7BlpCZrLZbsJZ9tKhMj 1BFg== X-Gm-Message-State: AO0yUKW9gMg62ijh0XwreKlp/hErO/f4i8VhqpekDzkoIa0BTU0BfQvj 2w5z0u4rC9kJs9f31FugrD9iVYZdKf17UwEYf/0= X-Received: by 2002:a17:903:11c8:b0:19f:1bd9:505 with SMTP id q8-20020a17090311c800b0019f1bd90505mr1139716plh.36.1678477974401; Fri, 10 Mar 2023 11:52:54 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:54 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 1/7] tcg: Clear plugin_mem_cbs on TB exit Date: Fri, 10 Mar 2023 11:52:46 -0800 Message-Id: <20230310195252.210956-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Do this in cpu_tb_exec (normal exit) and cpu_loop_exit (exception), adjacent to where we reset can_do_io. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1381 Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec-common.c | 2 ++ accel/tcg/cpu-exec.c | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index c7bc8c6efa..176ea57281 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -65,6 +65,8 @@ void cpu_loop_exit(CPUState *cpu) { /* Undo the setting in cpu_tb_exec. */ cpu->can_do_io = 1; + /* Undo any setting in generated code. */ + qemu_plugin_disable_mem_helpers(cpu); siglongjmp(cpu->jmp_env, 1); } diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 56aaf58b9d..c815f2dbfd 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -459,6 +459,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit) qemu_thread_jit_execute(); ret = tcg_qemu_tb_exec(env, tb_ptr); cpu->can_do_io = 1; + qemu_plugin_disable_mem_helpers(cpu); /* * TODO: Delay swapping back to the read-write region of the TB * until we actually need to modify the TB. The read-only copy, @@ -526,7 +527,6 @@ static void cpu_exec_exit(CPUState *cpu) if (cc->tcg_ops->cpu_exec_exit) { cc->tcg_ops->cpu_exec_exit(cpu); } - QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); } void cpu_exec_step_atomic(CPUState *cpu) @@ -580,7 +580,6 @@ void cpu_exec_step_atomic(CPUState *cpu) qemu_mutex_unlock_iothread(); } assert_no_pages_locked(); - qemu_plugin_disable_mem_helpers(cpu); } /* @@ -1004,7 +1003,6 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit); - QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); /* Try to align the host and virtual clocks if the guest is in advance */ align_clocks(sc, cpu); @@ -1029,7 +1027,6 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc) if (qemu_mutex_iothread_locked()) { qemu_mutex_unlock_iothread(); } - qemu_plugin_disable_mem_helpers(cpu); assert_no_pages_locked(); } From patchwork Fri Mar 10 19:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661645 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033467wrb; Fri, 10 Mar 2023 11:54:17 -0800 (PST) X-Google-Smtp-Source: AK7set/IvRJOVu5I5A+pA0VmxJrYuJ9kpK/IJ/TGG/JvRHOKSLK8ciiGHhAWOoHYRcUWNLp74y1p X-Received: by 2002:ac8:5a49:0:b0:3b9:2c3:675a with SMTP id o9-20020ac85a49000000b003b902c3675amr53182778qta.62.1678478057650; Fri, 10 Mar 2023 11:54:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478057; cv=none; d=google.com; s=arc-20160816; b=GZpCA8gYux+Zv/fgpt3KcrrGIeezTuEoDjFbWpccERZ3qHXmZSAcFUJXtJ5PIqJGum 7Odn+2GbwE0fBgRfDS3+dYB0TupLo4XNlnkdkUYkyKSi/r2xlpJXMN7sLQxFK34xIUUZ 90djr3QaJ1sGk9QkfnJ8KrJ1hdZ2T7zUrNM6B9UD6YQL/k9QtJzZnWE6PSmBtAYru4bt LK8/ngwI76AeYZYs+Sk998OC4EyC5Lgu5vJga7bufpRaftDXJYtveUe8a4DRosryYxbA viQwBTCAC3nR95i+b9bIeYtQ+wcaXJhSlZHBKut5VYkjc/GjGtVozlhQnkCP00ibOKfT 6n6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PhWkYcOhVpipdIZZNXYjZ5hy9+cyWvQ0gdF0syaRWxw=; b=lfDlSHoYcQFsFj3s2M44it8piIZ4gNK2cYmcoD1Smt2fIwSrHfijLpJ27tssOI6kmA ve8c3tqnzboStNFBIGBkU0IHVXew9XBptr5pzBaEyBAR4DtNIdoPy7/aRJv2HvLaAc3R gm3zx6NK+7HjQOTAAyO8Q1OByf3QiWGP+6irJ5aSgMMKHDrtm2uMBVSmS61uxX6MnNpR eqyWx2Rf+yLn71xOWR11QvcPtdIZE3fg1eOpDZmkBQemJ7tWsZoNvoqV/JBw2zI2mUIU 2zTnNyuUAnzAYpPzBD92QYVjc0GfbpXDvIJwJGRnlbDhXIdzOkP0VHAdwKhUthvui7Tb jS2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lnyzWyf0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a13-20020a05622a064d00b003ba3bc3a8dasi512780qtb.145.2023.03.10.11.54.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lnyzWyf0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painU-0001G9-U6; Fri, 10 Mar 2023 14:53:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painS-0001Ev-OT for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:58 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painQ-0004eS-Cn for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:58 -0500 Received: by mail-pj1-x1032.google.com with SMTP id x20-20020a17090a8a9400b00233ba727724so8491767pjn.1 for ; Fri, 10 Mar 2023 11:52:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PhWkYcOhVpipdIZZNXYjZ5hy9+cyWvQ0gdF0syaRWxw=; b=lnyzWyf03lzy1Mk/YnEyHnZCY58862Xp61RSY7da1niP29A8jFz+0V8TYZbu6kU/T0 5RbWFWCT1IlUIj8KnKNdJL3XyL75WzCbeyUu0eVrA/Lwz5vqFmWiQPkYLBSmmajVx4Qs NZdcFQLoW8axwhTfbEVTRgpqIKjiyw4a8/iBcTVmUI10S3zJkLR2fx0Q+sHAGgzPk5X1 kNJruhOt3MYr3d/22CMgCYGJDZ/RKs3eImtgJhjz+1ueig+Uo1QUXWEHLVeLX71wcFOX ceXWLIB081FHzVKgtXm/0BQuPl1XfmbVlkQoL4Z8gruBjp6dW2JnLzdVVgZCx1EEpUGr xk+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PhWkYcOhVpipdIZZNXYjZ5hy9+cyWvQ0gdF0syaRWxw=; b=xi/7Q33qvOqNcWL7sqOZBhFuHlsef3IQRxJKtgS7woh0htU8+VnFgcX4030meVn2+3 v/wJWedEbgaBKW4EB5XL7oUMnxwJJWp6D2WbXc6gx8g4Cbe4uLQuo8n/LP5MBAZeAHwn g1H48OLzuLTRe/CK+xA7RFYRO91fxSig9OMjexkN/PiuW1SX35gppSc/P6v0SuU7PMOg y2o/HRHAU6FqBebN0emuddToSgDwt0jgnLmfwDPSM8Hc+MsRHbgfrE8GjJXVpqh/o9uS 5Hth4oWQ4SCR9Lj9JSuc9T8CHuB4K5nuHrZARV4jtY1urVKClP5hY58+0SaRE2fxRpB8 D5+g== X-Gm-Message-State: AO0yUKWD/7UE/dlb4tEQhb7k8/Ad6Bofs7M8eL5RYjWHqblnSE2aAzV0 ojH7JApG1KNd3t4keoUhoRgu4k6S2nAJvlAWhfE= X-Received: by 2002:a17:902:ce92:b0:19c:f8c5:d504 with SMTP id f18-20020a170902ce9200b0019cf8c5d504mr7814287plg.59.1678477975225; Fri, 10 Mar 2023 11:52:55 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:54 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 2/7] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb Date: Fri, 10 Mar 2023 11:52:47 -0800 Message-Id: <20230310195252.210956-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Now that we call qemu_plugin_disable_mem_helpers in cpu_tb_exec, we don't need to do this in generated code as well. Signed-off-by: Richard Henderson --- tcg/tcg-op.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 77658a88f0..cc8fdb0e46 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2813,7 +2813,6 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx) tcg_debug_assert(idx == TB_EXIT_REQUESTED); } - plugin_gen_disable_mem_helpers(); tcg_gen_op1i(INDEX_op_exit_tb, val); } From patchwork Fri Mar 10 19:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661649 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033693wrb; Fri, 10 Mar 2023 11:55:05 -0800 (PST) X-Google-Smtp-Source: AK7set/OsxoRDacJfZuv4a7444i6KkGRx8Q8lyg1pfr5SfSkiZwqprS38Yclqey2VFGIyMkrC2co X-Received: by 2002:a05:6214:dcd:b0:56c:376:3191 with SMTP id 13-20020a0562140dcd00b0056c03763191mr198504qvt.44.1678478105206; Fri, 10 Mar 2023 11:55:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478105; cv=none; d=google.com; s=arc-20160816; b=ckcQwKg8jY1xGP9V9Jn+GyvAE287NeCb7MZiJAGT8gH0SK771CKee8nurwnvuO3cgc 7DYJOFM+KKuiX0GFQ/cee8Lr828STOfkW197e8nEyer3s54gCUjRViVfMvEWvWhqQSwD X1zLcNLv7i4sVemeZk+PVkCbSn1+T5ZzN4Dq9Wgw0VjaTHUdV7S1uZ6dfQl0Z0hZDxVI 8WR02menBTlKkvmC9A6MHXoy7VHuQOO3/nbAWl3hvi4kQss8x+1GOwY1bqmNFh3CiqeW MTxaNRLrGaYppRD8bo0/LPkVkJPuSeE38C2oM7aiLDw9YmIL76M9ZFMo96M2e0otOFKd 26QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XJhvkoLDc/4Ng5JbPEdzxnJevo2RvOeeg5n87qn4/tg=; b=cNaqv+6/fFLGqnGxrAAQxTAHsIf5CsmsRCyNpoqnxxTxr3R/63lGk2+hRBXOlxdiC2 2fF0ETssM9xKGxUsySFcpmXso1gLNUAI0V9Ta6VNuGsjWfZ1BMNL44ITD3RuvoWsLNzJ RNwB4lgjK8HwiQhuCvzy+Q87LPZTkdw9YcMSHv741aTzOWZjublSIq6OqoBUXnC5mZu9 9JLM4UY4BhKhv3Ib/o+RK2OGZlNRSR2atSXVwnKs25NYcIegcKFcGHq30ju/3uk+VpHU D03iwdVA1levuzYKfRC2VUBtR5Nv+H6g2gUWYrorFT8DBRBtSjpC59LsGbg2B1RLaoog I30w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KwYjaAFt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay10-20020a05620a178a00b00706690f46besi436403qkb.710.2023.03.10.11.55.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:55:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KwYjaAFt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painV-0001GI-Ik; Fri, 10 Mar 2023 14:53:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painT-0001F2-04 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:59 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painR-0004ec-I6 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:52:58 -0500 Received: by mail-pl1-x632.google.com with SMTP id p6so6843319plf.0 for ; Fri, 10 Mar 2023 11:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XJhvkoLDc/4Ng5JbPEdzxnJevo2RvOeeg5n87qn4/tg=; b=KwYjaAFt0znM53McSuz0AxQHgNt5kJR27R1NhUPcRkYZ7PtRjVqRMEgUaYtb5VCtUo Vcn16SGaqaXcmsp3NwFwt6mnXv4tn/g5XHjssfxt6bNNkJarHzZFxsT/Xr8jXyRm/i8O v5U25w85BIQtOAPSBB7Bw3nmPd1bWpFW/NY8M+RPUnxMwG4fxsS1QbIryXJN+URY4n1Z 54J98Wp3kbyn3LEpwoyViqk0TaUe9sYeJJk9c7ehSrvav4Fc10PgMXy1FeUKFXEVvAq6 8FyPqCsSdlVrMSKFTQvoPKtOvaqlKkeCUaR9PX7et4If8DHyNHaDoeNEOoBDsbbQycsw O8WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XJhvkoLDc/4Ng5JbPEdzxnJevo2RvOeeg5n87qn4/tg=; b=jNKV9f7XD2cry5kcx4eb+T5y/KYULZfm5LG5R9Xq3I/D1D/3HTqXPJqHwQPm3bZ5DJ ljgO6gynsU5QQI3bETmlBIM+zvJFX3H+q4MUoUQBk1utoKqkjxor3dNgjYCLj9BbEGrV MgGA0YMjpLHT4Cx6pZbocthTU/FIborBU3rmteGLFRV9Y8tNQig1v+iOyuAIuXUyrTPp foKzHMxL3f9emgm6Ny/xtufYxnxLcZP14f0jDzDETb+ACjcJIfvHb9nBHjMWZ+gpYTy2 SuamkQ8mQsBJKVCclV6aDIuWGfC2iZQ/WnG7AuhqBxNz3wUhjDavLgwPFc1PGVTmIeMO H79g== X-Gm-Message-State: AO0yUKVEoRNi4g6ECI/y2Y8Hrvr5M3SLabqlspmy9gqlK0dAdHeqthXn OP/TYUSbQKyOYXH9pzDHpq1RC4jhxIBvgVnfDBA= X-Received: by 2002:a17:902:f64f:b0:19e:bc8e:6421 with SMTP id m15-20020a170902f64f00b0019ebc8e6421mr20097482plg.47.1678477976064; Fri, 10 Mar 2023 11:52:56 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 3/7] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT Date: Fri, 10 Mar 2023 11:52:48 -0800 Message-Id: <20230310195252.210956-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This macro is no longer used. Signed-off-by: Richard Henderson --- include/qemu/plugin.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index fb338ba576..e0ebedef84 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -59,8 +59,6 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i) #ifdef CONFIG_PLUGIN extern QemuOptsList qemu_plugin_opts; -#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond) - static inline void qemu_plugin_add_opts(void) { qemu_add_opts(&qemu_plugin_opts); @@ -252,8 +250,6 @@ void qemu_plugin_user_postfork(bool is_child); #else /* !CONFIG_PLUGIN */ -#define QEMU_PLUGIN_ASSERT(cond) - static inline void qemu_plugin_add_opts(void) { } From patchwork Fri Mar 10 19:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661644 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033458wrb; Fri, 10 Mar 2023 11:54:16 -0800 (PST) X-Google-Smtp-Source: AK7set/yeYDdD0VZVU+Nh3XTSirhPjhuY5Q/Pb4hCRZZolFemIX7N7ai7RCc0WV+CxyhvLBSu9zn X-Received: by 2002:a05:622a:14e:b0:3bc:ff12:e5e5 with SMTP id v14-20020a05622a014e00b003bcff12e5e5mr43349540qtw.17.1678478056490; Fri, 10 Mar 2023 11:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478056; cv=none; d=google.com; s=arc-20160816; b=yhv3M7bR17mfRQMf+UTlyM401FZQ6/AaAULNKbBhb26c/DELG9FSZosFe/jVWT0X2W 9IEyF/KHSGNFQACYgfxUqLumyIZHgDetCCWFp7aVHJiW2eAkrlaVRIe/9j5WcE1EGzxx KCduTUB6jXoxhzRrRNMo18VrEWgFgZSVUTgkMfA2X2Ni2aOcAMG/dZYwTGTUKLPOi9hk fqvGjhyusSVaJsxOvshJQWxdJqv/tfbXHGoerz3wXt14Z0PIk+bBPcrLIBS46r+Qh07z lNjEs/z3+xZjFIsOigQHyIkk08WOB5edbts5dpyF9lu8CxM2R25Qlt6EfvIen0UDRa0i Op/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PCVfpfWkb0dy6EcTres8gN6yf4ibNKsCmhMREXR7+eQ=; b=W6WJkKGrqtl6kmNuZMIySSU4NfGtEOg7c95gkHJoF9yObVTkD5wiRtstZStuZb6Y/B ZyFXvP14N5mGzGF0ytVR3E53Oqts5jlW6KkvDtfS3h7dserojsV3WM3ZpLIeHMEBY4Jx wr4QZ5fRH5SSZ3FLn0JfeX7zcpePAhVLgohfdyP3rs0ECfxAKGgxchwq70VY/2N2lXQv dYaSex2l9DkEyoVhEekeLt85w2U06wzwukJfsqxoL+2byXPkwvW5hiYxYQsNVy6TTr5H MdfQFvO4MB3S5nTtRp/DBqrhrE99m04h62UsavNE//8o7quiyboKd7h23ZoDP4zPztc6 BrXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jZ5Yglmd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 20-20020ac85754000000b003b9b25060d3si473981qtx.253.2023.03.10.11.54.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jZ5Yglmd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painX-0001H7-ST; Fri, 10 Mar 2023 14:53:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painU-0001G1-Mx for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:00 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painS-0004eh-7w for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:00 -0500 Received: by mail-pj1-x102a.google.com with SMTP id me6-20020a17090b17c600b0023816b0c7ceso10997931pjb.2 for ; Fri, 10 Mar 2023 11:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477977; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PCVfpfWkb0dy6EcTres8gN6yf4ibNKsCmhMREXR7+eQ=; b=jZ5YglmdHckafuqkOJjkWyuyK5jmu8V4T3bCYBEJgnDYzb6I6paUyfvdf15gXnP1FT 3raexHYjvUP93G18esKqaQ1JBp9K1Yqoa/hFQZcMaf9I8LtfRqKt3KqASI2TyTzfWv/n DwgQayKZrqPr9bYsjdUHUbLbsPRheFRguYpuSWEC06OGupKaqvZB984fS2GPYoFjL27a Xtp+vcbrtwnF1OkT0FPQ8wCQcbbV/hwh6PKykYuTRSsmrT9NNzxk5ixrBAMurl1+0vM5 Z9rMxjNWP8WK5oONezPiKmdczgxxhafiOrPMDZe6cLYya5elKDxkkdud0uiVQHenAk0z FuYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477977; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PCVfpfWkb0dy6EcTres8gN6yf4ibNKsCmhMREXR7+eQ=; b=cZguSgVuft3UGdUAEEHtD9zglqhxJHSPerGw+29ZHpIsMrxP4A/xR94nJaMXQxYEM2 tcDMFxWSUDaKXLYmIjj+yrX6Rt+8xC2ImXzmi7PJdhkqX4UqwiujFDXl0gJAblcM3Cb1 ux+bBIGilqMvAiOf03EdIOsP05VSoYQPcflbi6hNzDwm+TW48LTNC5t9tPMBBeoEy3oo HCEeKzKK+ZW39tvv3ZEZJ06VHP7c2cmYPwXugxfquQSG0MaTN8NBoN0I5lIcBsnF4/Jp T1KSaACZrnct30xfx+Ohl+0e1wLghMfsl+uT24c82zA7UWqtES31NM12ZZY1B8dDOIvZ RDkw== X-Gm-Message-State: AO0yUKVpe3fn59POwdhxI5g2vbTvIL9CsAYEysUZ4X1brc0A5aCFdCf+ bcxsNMA3FqHDAHcVDWUE/PlzOVdruQtRCEUfbsA= X-Received: by 2002:a17:902:c40d:b0:19d:1ffd:1485 with SMTP id k13-20020a170902c40d00b0019d1ffd1485mr32975102plk.66.1678477976838; Fri, 10 Mar 2023 11:52:56 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h Date: Fri, 10 Mar 2023 11:52:49 -0800 Message-Id: <20230310195252.210956-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This had been pulled in via qemu/plugin.h from hw/core/cpu.h, but that will be removed. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- accel/accel-softmmu.c | 2 +- block/monitor/block-hmp-cmds.c | 1 + dump/dump.c | 1 + dump/win_dump.c | 1 + hw/arm/collie.c | 2 ++ hw/arm/cubieboard.c | 1 + hw/arm/musicpal.c | 2 ++ hw/arm/npcm7xx_boards.c | 2 ++ hw/arm/nseries.c | 2 ++ hw/arm/omap_sx1.c | 2 ++ hw/arm/orangepi.c | 1 + hw/arm/palm.c | 2 ++ hw/core/machine-smp.c | 2 ++ hw/i386/sgx.c | 1 + hw/loongarch/acpi-build.c | 1 + hw/loongarch/virt.c | 2 ++ hw/m68k/next-cube.c | 1 + hw/m68k/q800.c | 1 + hw/m68k/virt.c | 1 + hw/openrisc/boot.c | 1 + hw/ppc/spapr_softmmu.c | 2 ++ hw/riscv/opentitan.c | 1 + hw/riscv/shakti_c.c | 1 + hw/riscv/virt-acpi-build.c | 1 + linux-user/elfload.c | 1 + target/i386/cpu.c | 1 + target/i386/host-cpu.c | 1 + target/s390x/cpu_models.c | 1 + target/s390x/diag.c | 2 ++ 29 files changed, 39 insertions(+), 1 deletion(-) diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c index f9cdafb148..9c804ba9e3 100644 --- a/accel/accel-softmmu.c +++ b/accel/accel-softmmu.c @@ -27,7 +27,7 @@ #include "qemu/accel.h" #include "hw/boards.h" #include "sysemu/cpus.h" - +#include "qemu/error-report.h" #include "accel-softmmu.h" int accel_init_machine(AccelState *accel, MachineState *ms) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 6aa5f1be0c..2846083546 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -48,6 +48,7 @@ #include "qemu/option.h" #include "qemu/sockets.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "monitor/hmp.h" diff --git a/dump/dump.c b/dump/dump.c index 544d5bce3a..1f1a6edcab 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -24,6 +24,7 @@ #include "qapi/qapi-commands-dump.h" #include "qapi/qapi-events-dump.h" #include "qapi/qmp/qerror.h" +#include "qemu/error-report.h" #include "qemu/main-loop.h" #include "hw/misc/vmcoreinfo.h" #include "migration/blocker.h" diff --git a/dump/win_dump.c b/dump/win_dump.c index 0152f7330a..b7bfaff379 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "sysemu/dump.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qapi/qmp/qerror.h" #include "exec/cpu-defs.h" #include "hw/core/cpu.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 9edff59370..a0ad1b8dc7 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -19,6 +19,8 @@ #include "exec/address-spaces.h" #include "cpu.h" #include "qom/object.h" +#include "qemu/error-report.h" + #define RAM_SIZE (512 * MiB) #define FLASH_SIZE (32 * MiB) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 71a7df1508..8c7fa91529 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/allwinner-a10.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 06d9add7c7..c9010b2ffb 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -37,6 +37,8 @@ #include "qemu/cutils.h" #include "qom/object.h" #include "hw/net/mv88w8618_eth.h" +#include "qemu/error-report.h" + #define MP_MISC_BASE 0x80002000 #define MP_MISC_SIZE 0x00001000 diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 9b31207a06..2aef579aac 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -30,6 +30,8 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/block-backend.h" +#include "qemu/error-report.h" + #define NPCM7XX_POWER_ON_STRAPS_DEFAULT ( \ NPCM7XX_PWRON_STRAP_SPI0F18 | \ diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index c9df063a08..9e49e9e177 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -45,6 +45,8 @@ #include "hw/loader.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/error-report.h" + /* Nokia N8x0 support */ struct n800_s { diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index e721292079..4bf1579f8c 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -37,6 +37,8 @@ #include "exec/address-spaces.h" #include "cpu.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" + /*****************************************************************************/ /* Siemens SX1 Cellphone V1 */ diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 3ace474870..10653361ed 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -21,6 +21,7 @@ #include "qemu/units.h" #include "exec/address-spaces.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 1457f10c83..17c11ac4ce 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -32,6 +32,8 @@ #include "cpu.h" #include "qemu/cutils.h" #include "qom/object.h" +#include "qemu/error-report.h" + static uint64_t static_read(void *opaque, hwaddr offset, unsigned size) { diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index c3dab007da..89fe0cda42 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -20,6 +20,8 @@ #include "qemu/osdep.h" #include "hw/boards.h" #include "qapi/error.h" +#include "qemu/error-report.h" + /* * Report information of a machine's supported CPU topology hierarchy. diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index db004d17a6..70305547d4 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -18,6 +18,7 @@ #include "monitor/monitor.h" #include "monitor/hmp-target.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qapi/qapi-commands-misc-target.h" #include "exec/address-spaces.h" #include "sysemu/hw_accel.h" diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index 6cb2472d33..8e3ce07367 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/bitmap.h" #include "hw/pci/pci.h" #include "hw/core/cpu.h" diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 38ef7cc49f..b702c3f51e 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -44,6 +44,8 @@ #include "sysemu/tpm.h" #include "sysemu/block-backend.h" #include "hw/block/flash.h" +#include "qemu/error-report.h" + static void virt_flash_create(LoongArchMachineState *lams) { diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e0d4a94f9d..ce8ee50b9e 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -24,6 +24,7 @@ #include "hw/block/fdc.h" #include "hw/qdev-properties.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "ui/console.h" #include "target/m68k/cpu.h" #include "migration/vmstate.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 9d52ca6613..b35ecafbc7 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -45,6 +45,7 @@ #include "hw/block/swim.h" #include "net/net.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "sysemu/qtest.h" #include "sysemu/runstate.h" #include "sysemu/reset.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 4cb5beef1a..754b9bdfcc 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -23,6 +23,7 @@ #include "bootinfo.h" #include "net/net.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "sysemu/qtest.h" #include "sysemu/runstate.h" #include "sysemu/reset.h" diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c index 007e80cd5a..55475aa6d6 100644 --- a/hw/openrisc/boot.c +++ b/hw/openrisc/boot.c @@ -15,6 +15,7 @@ #include "sysemu/device_tree.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" +#include "qemu/error-report.h" #include diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index 5170a33369..278666317e 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -1,12 +1,14 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/memalign.h" +#include "qemu/error-report.h" #include "cpu.h" #include "helper_regs.h" #include "hw/ppc/spapr.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h" + static inline bool valid_ptex(PowerPCCPU *cpu, target_ulong ptex) { /* diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index b06944d382..bc678766e7 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -22,6 +22,7 @@ #include "qemu/cutils.h" #include "hw/riscv/opentitan.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/boards.h" #include "hw/misc/unimp.h" #include "hw/riscv/boot.h" diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index e43cc9445c..12ea74b032 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -20,6 +20,7 @@ #include "hw/boards.h" #include "hw/riscv/shakti_c.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/intc/sifive_plic.h" #include "hw/intc/riscv_aclint.h" #include "sysemu/sysemu.h" diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 82da0a238c..7331248f59 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -29,6 +29,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "sysemu/reset.h" #include "migration/vmstate.h" #include "hw/riscv/virt.h" diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 5928c14dfc..8c794586c8 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -18,6 +18,7 @@ #include "qemu/units.h" #include "qemu/selfmap.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "target_signal.h" #include "accel/tcg/debuginfo.h" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index cab1e2a957..6576287e5b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -29,6 +29,7 @@ #include "kvm/kvm_i386.h" #include "sev.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qapi/qapi-visit-machine.h" #include "qapi/qmp/qerror.h" #include "standard-headers/asm-x86/kvm_para.h" diff --git a/target/i386/host-cpu.c b/target/i386/host-cpu.c index 10f8aba86e..92ecb7254b 100644 --- a/target/i386/host-cpu.c +++ b/target/i386/host-cpu.c @@ -11,6 +11,7 @@ #include "cpu.h" #include "host-cpu.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "sysemu/sysemu.h" /* Note: Only safe for use on x86(-64) hosts */ diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 065ec6d66c..457b5cb10c 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -17,6 +17,7 @@ #include "sysemu/kvm.h" #include "sysemu/tcg.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qapi/visitor.h" #include "qemu/module.h" #include "qemu/hw-version.h" diff --git a/target/s390x/diag.c b/target/s390x/diag.c index 76b01dcd68..e5f0df19e7 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -22,6 +22,8 @@ #include "hw/s390x/pv.h" #include "sysemu/kvm.h" #include "kvm/kvm_s390x.h" +#include "qemu/error-report.h" + int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3) { From patchwork Fri Mar 10 19:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661648 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033631wrb; Fri, 10 Mar 2023 11:54:51 -0800 (PST) X-Google-Smtp-Source: AK7set9RQbBy24Syx+eQjV1YtP4dEkXc1808/cV0uWN/lqDoCMQHpq1ieVquw2OEc4D7MiwvIjTF X-Received: by 2002:a05:622a:1898:b0:3c0:3c0b:abdc with SMTP id v24-20020a05622a189800b003c03c0babdcmr5159572qtc.28.1678478091712; Fri, 10 Mar 2023 11:54:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478091; cv=none; d=google.com; s=arc-20160816; b=UTBK6fvTLLtrSMviVnqh0u/Tz7WzbAQRBmX8fwREKWabhUw/Dg/E9KoHFm8x9RYOIl KGhjk72Ot42Ny/f0IC7JZEfNe/hp49Im9H0IqwQHdey3pg/TKpntcHGt+RfxFtlI/aD1 lbr/9iouJHC3X5O9YPwGChuII3/7AxP8Ki5A52aALE+vHorTxMPJClBDbAlWVH+FdXoN ZIkxwPZqrnfsR9Jyk00IEmEbn+1gHqBWAecoGoWqYktJ1DMEa1naSD6fHolEYekrKp/B IxOIpCigvoymM5yHV/F+whtLpjdRyIp6NSIQXfI5tKOCoBQ9px9gnii7PhbhyntIKlDB og6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Q1DnbR7KQTC+x6ysScZJbOrppJZcpcAPm9qgXNyJ5JE=; b=Ju756q/J/Fuz9S/s6iK5BEPgVj5z7CK4u6bg0r6soWOBeRjWuGe4jOEHyaibRIus0o XUvxdtz4CBF9PrkUfhLo7Jn7FqQeHvJc4Y8cEApmoodaPWxajHsUWQZxzlOPJIuRvZy7 CZx0hDjiHBv51hetviEHDH3nSBqojtOQHFMsRfN197qe69jAvKpW+3ogQz5U7GxCQImo WIRwBppi9MLii6vTmYHElM0WJuAWLkB9dpO7IqO8mFVS7tgJyZYpxPvtpB6UFDEL1Sas MB77NANQA6MyEAH5rIT91bT5gSpJNmQYd7vrBwhV1YTOAgoP/oR1HKUdPn2iU7Pdp0T7 2LHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lrq24zTU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m22-20020a05622a119600b003ab78a0b43asi522510qtk.14.2023.03.10.11.54.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lrq24zTU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painW-0001GQ-62; Fri, 10 Mar 2023 14:53:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painU-0001G0-MY for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:00 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painT-0004f4-2M for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:00 -0500 Received: by mail-pl1-x629.google.com with SMTP id x11so6765480pln.12 for ; Fri, 10 Mar 2023 11:52:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q1DnbR7KQTC+x6ysScZJbOrppJZcpcAPm9qgXNyJ5JE=; b=lrq24zTUOGU/rLGb1ndBs526zLC3QlVYI9QU1A7r5v/zgfwabH3TtBk/uekkBGFFIA Ic9Gl+D08gk4d3UDgOXekKv81wU3X8LFyNCHDwgGSv4lnQzSURAbWqwrsik6J4F0PA/R NTvQlwF8Xc++Ql5oZJlMqqYAuf7WdM77TJrjHLrXBRemSxTlg7dnpH66bPhFZhmZfWqS 42u4ZcMN4MprN8mM/xahqh9drsMu4ON6tt1YbtIJo5R5ZFUz9M3Ujvsz0niKimSTZ5kB db00LqbESHHiunai3h+T+VhFgCwJX7cr5IIcA2ZMit4/wP6L0Adi/jItAL/HNaLDkeCD JmoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q1DnbR7KQTC+x6ysScZJbOrppJZcpcAPm9qgXNyJ5JE=; b=QMB4mZwFl8EfdH4Ut4zrgshPQQF1DPGi8ueNaYAwkOpaCKf6/Sk+B3CTBbRegZkB/e 70UPim+LawGyqZm1mQdmvm98E67A0i0PjruKcPhxWjWnTrvq0O7IkfAN42vqZnxAh/85 3esYZLZasjpouEFfWjF1WrU+6v6bWE0gf/w5hiQ8t38QQkB64QMgQsP7qaXhhvumSdbb ELi/d679L+g6BJjaqgvWAqPgVk7cVDykrhj7oIM9J9vLRJzjWdOLuPrZe4iHHZl6Bhhk Qern/ejwkiaDtfFZHdFBMRP4dhnjZmt3GGZlcA0O7mYgMQs3B9h59ErnAh72Fteus7ku kFsQ== X-Gm-Message-State: AO0yUKXrLyTJWA6D8XMFCAWdMNZPislMnxQ8FdmqSi0kAEH+29j0bldu 4E7XQthVP1f1HdRITSobhetWqZtoazhiuZDkN3s= X-Received: by 2002:a17:902:cf0e:b0:19e:2495:20e0 with SMTP id i14-20020a170902cf0e00b0019e249520e0mr2645011plg.21.1678477977728; Fri, 10 Mar 2023 11:52:57 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 5/7] *: Add missing includes of qemu/plugin.h Date: Fri, 10 Mar 2023 11:52:50 -0800 Message-Id: <20230310195252.210956-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This had been pulled in from hw/core/cpu.h, but that will be removed. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- accel/tcg/cpu-exec-common.c | 1 + cpu.c | 1 + linux-user/exit.c | 1 + linux-user/syscall.c | 1 + 4 files changed, 4 insertions(+) diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index 176ea57281..e7962c9348 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -21,6 +21,7 @@ #include "sysemu/cpus.h" #include "sysemu/tcg.h" #include "exec/exec-all.h" +#include "qemu/plugin.h" bool tcg_allowed; diff --git a/cpu.c b/cpu.c index 567b23af46..849bac062c 100644 --- a/cpu.c +++ b/cpu.c @@ -42,6 +42,7 @@ #include "hw/core/accel-cpu.h" #include "trace/trace-root.h" #include "qemu/accel.h" +#include "qemu/plugin.h" uintptr_t qemu_host_page_size; intptr_t qemu_host_page_mask; diff --git a/linux-user/exit.c b/linux-user/exit.c index fd49d76f45..3017d28a3c 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -21,6 +21,7 @@ #include "gdbstub/syscalls.h" #include "qemu.h" #include "user-internals.h" +#include "qemu/plugin.h" #ifdef CONFIG_GPROF #include #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a6c426d73c..38f3f5f784 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -22,6 +22,7 @@ #include "qemu/path.h" #include "qemu/memfd.h" #include "qemu/queue.h" +#include "qemu/plugin.h" #include #include #include From patchwork Fri Mar 10 19:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661646 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033478wrb; Fri, 10 Mar 2023 11:54:19 -0800 (PST) X-Google-Smtp-Source: AK7set/dnXuQl5UJ4LV0/F7BN515cNEXBjLAskD/f7vlAlZFs7cbqRs4rkO48YN4amIrX1Sa9OTA X-Received: by 2002:a05:622a:1113:b0:3bf:c0fb:53a2 with SMTP id e19-20020a05622a111300b003bfc0fb53a2mr15487800qty.48.1678478059466; Fri, 10 Mar 2023 11:54:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478059; cv=none; d=google.com; s=arc-20160816; b=l3cqCSMnoaZQHIOXFKdtEAl5neUiHLqrmVonRiadj+I6EzmPQaaF6Vt52xXS3wUcEC kZQdCqQ20F88LVIbzlWXcLcqWL2NQkRT9KGd5WE1auJtaXCFFjteamugqffrUoiOwW+1 fuOSlDLEdH0HKo27yTK1P6OJdENNqCy5LhBUJdndUMtKGZ73G9hk40g7a/4+9JgzBq8I zNZgS0aQQOyIjdAIU7r7GYGY+mMDRBxJTMVREL+qRjz8pl1H0wXTIVVkErpDuDj/dmVL wqznpgl119STD4x1ILY+zkfQNtGclbpi+iS4xx5e4hVXUPv0OSQXMtElofmTPzVPDNJe sv/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T5bbx8sg/Anm+07Z29jSPoGQLySawFafuCtWNzz/H14=; b=c2MIACTsWG5tvcn5qN+fy8yjMDrSlE/NL0tQXWW7LRuuLs3C78Jfu4GD2q/v6ZiapQ u3cgcbSa78NzDDQqEoqQWYyclmZttXsKBYcG4RVoTkPZxxNggElf2LUG03RMRjRwmpxV CCfiCXbYhTMIqnhus5yKw8p/djSM3jm2Q2r4I0LHPa0Qqw+YuM/8VyMdvlsU7xO4+A/r 0SvH2CO8YrBkgAzpY02TeJT0mCyHKPQNarMVrYp5A44leX0LYfu5+VoQQT2cVADmtuDH S2CO4WPivNolezPgV3vaxyYOwuFSH+FM7S8ImCCnwsQN/Idn/SzxJzbdbCd/qO4v7cyG NQoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cWJQDoMy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 125-20020a370883000000b0070528bfdf68si440938qki.280.2023.03.10.11.54.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cWJQDoMy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painY-0001HM-59; Fri, 10 Mar 2023 14:53:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painV-0001GJ-Rc for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:01 -0500 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painU-0004fZ-5n for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:01 -0500 Received: by mail-pj1-x102e.google.com with SMTP id p3-20020a17090ad30300b0023a1cd5065fso6222761pju.0 for ; Fri, 10 Mar 2023 11:52:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477979; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T5bbx8sg/Anm+07Z29jSPoGQLySawFafuCtWNzz/H14=; b=cWJQDoMyjUWqWTPZReKRO0DZCX2VzSlsrzFVF3CHUF3xks7vKk0ORhv+BUtxaKD5jm ttA0HA3hGTk6IoB7WqTFggagE+ApdE9I1MsL4yXHWfzFi5Obje8KIhZX2injtICv4Wr7 e4diO2jQmLcPR42jNcG16qm1DlWx/JKiWFYQ4NrkygBTgbPkZ/yXsZCw2WUs87xccitJ Sc4S8LkqZP4wgrbWvgjLj3YfBPG9K8mlyaajqdVGdKOfZAfnR3rnG00RHEUTX3agxkyl TIZxD1Il/pzh5rH0BSLGgdVAi0NZqXEie4UWWp85gXFaqBOZF4MtLRzduA1iEmOuEA9v UVAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477979; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T5bbx8sg/Anm+07Z29jSPoGQLySawFafuCtWNzz/H14=; b=kaLJg1FVAWtYj4UgGnwPMQbYUUYyig1fxrbUIS9a+9OzHQTZ+HIqYojV0teCXctqnc avJcWSzDkXXomzMRswQVqh2wyX3poUGTKFlw62nzN1VGoMPcHjxvieSTc2I7GTFPY8jV BcukujywnkB/1WWE9Dj8vAhH1vOSekJIEpT2MLOyB+X8rj1ykruwztmRohHDYtzx40TI i/Iu63ehT1PRDbfR3cAdo0pNwJwOAVgcwVZaahmPI8/MoxcFdNybVyGPfUvUMZfkl883 m2NTgp6CfGmutgsgGpeaMFAu1BdvnJvQLcqu4lj3J/h/6CCMBlwFcoVGyf0+++LHi/K9 y8nQ== X-Gm-Message-State: AO0yUKXwInFvplppprYPllnwhn2ZSmtQGzEkw67YZ+3KBDjgglwqox+A LvpVMt0hunHCj1e7NkTWJ6WfxS7A18HTzjrGBgQ= X-Received: by 2002:a17:902:da90:b0:19c:e405:4446 with SMTP id j16-20020a170902da9000b0019ce4054446mr31551859plx.30.1678477978841; Fri, 10 Mar 2023 11:52:58 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 6/7] include/qemu: Split out plugin-event.h Date: Fri, 10 Mar 2023 11:52:51 -0800 Message-Id: <20230310195252.210956-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The usage in hw/core/cpu.h only requires QEMU_PLUGIN_EV_MAX. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- include/hw/core/cpu.h | 2 +- include/qemu/plugin-event.h | 26 ++++++++++++++++++++++++++ include/qemu/plugin.h | 17 +---------------- 3 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 include/qemu/plugin-event.h diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 75689bff02..821e937020 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -30,7 +30,7 @@ #include "qemu/rcu_queue.h" #include "qemu/queue.h" #include "qemu/thread.h" -#include "qemu/plugin.h" +#include "qemu/plugin-event.h" #include "qom/object.h" typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size, diff --git a/include/qemu/plugin-event.h b/include/qemu/plugin-event.h new file mode 100644 index 0000000000..7056d8427b --- /dev/null +++ b/include/qemu/plugin-event.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017, Emilio G. Cota + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_PLUGIN_EVENT_H +#define QEMU_PLUGIN_EVENT_H + +/* + * Events that plugins can subscribe to. + */ +enum qemu_plugin_event { + QEMU_PLUGIN_EV_VCPU_INIT, + QEMU_PLUGIN_EV_VCPU_EXIT, + QEMU_PLUGIN_EV_VCPU_TB_TRANS, + QEMU_PLUGIN_EV_VCPU_IDLE, + QEMU_PLUGIN_EV_VCPU_RESUME, + QEMU_PLUGIN_EV_VCPU_SYSCALL, + QEMU_PLUGIN_EV_VCPU_SYSCALL_RET, + QEMU_PLUGIN_EV_FLUSH, + QEMU_PLUGIN_EV_ATEXIT, + QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */ +}; + +#endif /* QEMU_PLUGIN_EVENT_H */ diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index e0ebedef84..6bf4bce188 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -12,24 +12,9 @@ #include "qemu/error-report.h" #include "qemu/queue.h" #include "qemu/option.h" +#include "qemu/plugin-event.h" #include "exec/memopidx.h" -/* - * Events that plugins can subscribe to. - */ -enum qemu_plugin_event { - QEMU_PLUGIN_EV_VCPU_INIT, - QEMU_PLUGIN_EV_VCPU_EXIT, - QEMU_PLUGIN_EV_VCPU_TB_TRANS, - QEMU_PLUGIN_EV_VCPU_IDLE, - QEMU_PLUGIN_EV_VCPU_RESUME, - QEMU_PLUGIN_EV_VCPU_SYSCALL, - QEMU_PLUGIN_EV_VCPU_SYSCALL_RET, - QEMU_PLUGIN_EV_FLUSH, - QEMU_PLUGIN_EV_ATEXIT, - QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */ -}; - /* * Option parsing/processing. * Note that we can load an arbitrary number of plugins. From patchwork Fri Mar 10 19:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 661642 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1033454wrb; Fri, 10 Mar 2023 11:54:16 -0800 (PST) X-Google-Smtp-Source: AK7set+uuvIVUbJkh07NG3fVBGqTctbzy0/j72ojgt8tfDWNTBkilfs8JzDRJ3+PFvhoF6GuscTn X-Received: by 2002:ad4:5c44:0:b0:567:fe96:85a5 with SMTP id a4-20020ad45c44000000b00567fe9685a5mr382354qva.22.1678478056252; Fri, 10 Mar 2023 11:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678478056; cv=none; d=google.com; s=arc-20160816; b=tzygwAp0R1hhf1BrUto31mMVzHcqoQAXihDy4uQl3SPTZCpfQ15Je/T71gfkwEGFaZ askR75t+ZfsL8TdWbkNwrNfOs9i8evsn42IDIaug/XvNYLpwYZmhWeDTTVn7UmG3UVVE gH4EuJFCiv79951jFbMXw8qlGTpwQMCcP/fWz5sAOX9ay3sfjdYSaJ0PSgwKtLHgQ1g4 fhF3ZKNzwjpr5LX2Oq65GHC8Q/7FYpLmhOcp/0dfSaRGLQkD4Rmw6poubsoDCy2cSt47 Uw7/7l9BXYK21FIJbPLmfZOlWxYCtcIQpuZu1jAPqXo4/Tuja2xF4sPBbd5aez48DqqB kLXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZI3yEJ2Lc21he8le+fWeyTzXmLbDRb40vBMQaTo2uKo=; b=HiTcvY5vcV6xqOuVHZHcTnVaWlW/9/1WLUozjt1ZTDQDHAaG02lIT3rLRh5udYX2S1 HqYC8qEoRsE7HEFIz4FE7s2XtOvFsE9yqQt7JpWVpHr65tQAiE8YiTZQuLfX+3KKHVd7 2JQ3Ux0wXzmBSp5ok09Fso1sm6/ItciiqR1G2U/Mf9IBxlud/+m7mXHunLMgMyhKUkdY 6Gk3AMK6zdJrevYGyzyJaADLLsmf4q7WFAxQrlp8oPWEy6BaDZvx0sRqAYQ58Xkesh9Z PmAAOAqRkqTYGo4KUEUQ1HAV9H+YtPL05+IkHWTJD5B0ruQYEQ5OEzLxtXm3WPkY5GVv 6foQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O07Hx36O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p7-20020a05622a048700b003ba23f7415asi501639qtx.187.2023.03.10.11.54.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2023 11:54:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O07Hx36O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1painZ-0001Hj-Oj; Fri, 10 Mar 2023 14:53:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1painW-0001Go-QR for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:02 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1painV-0004fr-9S for qemu-devel@nongnu.org; Fri, 10 Mar 2023 14:53:02 -0500 Received: by mail-pl1-x633.google.com with SMTP id a2so6799044plm.4 for ; Fri, 10 Mar 2023 11:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678477980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZI3yEJ2Lc21he8le+fWeyTzXmLbDRb40vBMQaTo2uKo=; b=O07Hx36OIOASh009kICTNTm+IvGKtb/wdB8UCZ+Hu/5G55YMmswXKI9IiWS/GyX2LM vJp5yY56HaNDQ+v4Z0EHoYbkh6519Eq5ZJX4KxH7lpSs0f2UjgsgEBfE4pmZzdafc0VA otw+x3tspp3LTNUMhxOyHl2wb9aNXM23f7BBssEpljBQY/spjUiPpFgtfKxkvRNAmFEm yvLlzX9pQrukULz7p9w9ZyTXK7VrYTT6dE7UD8QpMM/FZx77vYP4GsnhXRh/0q9l2iOO UByQ4YWVyr5Lax4r4rX7jvacAon7D1H5ggrUMDtvws4l/JSeI0dQYOjg0ET0r+ucvqNE 523w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678477980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZI3yEJ2Lc21he8le+fWeyTzXmLbDRb40vBMQaTo2uKo=; b=lafWilVW3WeDbaxxwOhaOjDhs75Dh4/BcfF42S6cbB20OfGrZHfXSUu90Hn1hNhoQd Hr5cxAutrMb26MuHA14Wc6lsQ86SaYwNJffE95YdLg72NJyRuC1oziUYmB5EaYCR6YJK M8f1x883nDqxE1+p3RPbghZyWLo5BSYtHrU8NZN9BeIfNB3e4fZbQzqQbxZpE1gmo+7W hlmxu+SXgEOD+JNjI0a5235v5rvcI61xZOVIUKVBl5tlirb5ElczlJztkqEjZcB0mpXZ vSK+b04SfObBDVEc18HHNq1vVVadvUxvijz3CHa7ixMZeiDlsBUMKh2eTU1Xco1ZuDgX 5yfQ== X-Gm-Message-State: AO0yUKXHjrNPjZIOx80FbD2K3e9xcnDSZ90RbOy8tXBZeOmgP75auS+x FoCw3IrwUugBbaD8rvGHvy9ufb8X4aOltPOtZhk= X-Received: by 2002:a17:902:ce90:b0:19a:9434:af30 with SMTP id f16-20020a170902ce9000b0019a9434af30mr30396630plg.18.1678477979763; Fri, 10 Mar 2023 11:52:59 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:cc1c:ced1:1ec5:bd62]) by smtp.gmail.com with ESMTPSA id l1-20020a170903244100b001991d6c6c64sm351465pls.185.2023.03.10.11.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 11:52:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: cota@braap.org, alex.bennee@linaro.org Subject: [PATCH v2 7/7] include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers Date: Fri, 10 Mar 2023 11:52:52 -0800 Message-Id: <20230310195252.210956-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310195252.210956-1-richard.henderson@linaro.org> References: <20230310195252.210956-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Now that we've broken the include loop with cpu.h, we can bring this inline. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- include/qemu/plugin.h | 6 +++++- plugins/core.c | 11 ----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 6bf4bce188..bc0781cab8 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -14,6 +14,7 @@ #include "qemu/option.h" #include "qemu/plugin-event.h" #include "exec/memopidx.h" +#include "hw/core/cpu.h" /* * Option parsing/processing. @@ -204,7 +205,10 @@ void qemu_plugin_atexit_cb(void); void qemu_plugin_add_dyn_cb_arr(GArray *arr); -void qemu_plugin_disable_mem_helpers(CPUState *cpu); +static inline void qemu_plugin_disable_mem_helpers(CPUState *cpu) +{ + cpu->plugin_mem_cbs = NULL; +} /** * qemu_plugin_user_exit(): clean-up callbacks before calling exit callbacks diff --git a/plugins/core.c b/plugins/core.c index 04632886b9..9912f2cfdb 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -553,17 +553,6 @@ void qemu_plugin_user_postfork(bool is_child) } } - -/* - * Call this function after longjmp'ing to the main loop. It's possible that the - * last instruction of a TB might have used helpers, and therefore the - * "disable" instruction will never execute because it ended up as dead code. - */ -void qemu_plugin_disable_mem_helpers(CPUState *cpu) -{ - cpu->plugin_mem_cbs = NULL; -} - static bool plugin_dyn_cb_arr_cmp(const void *ap, const void *bp) { return ap == bp;