From patchwork Thu Sep 16 15:30:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 512962 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1337556jao; Thu, 16 Sep 2021 08:49:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf3zLLJ3DrKsMjMU4lS/DgX2a2zO56rfEHb0zRKApZ4jwu2skTxQa7j6hcoCVCF+09fmqs X-Received: by 2002:a0c:8064:: with SMTP id 91mr6116592qva.66.1631807359613; Thu, 16 Sep 2021 08:49:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631807359; cv=none; d=google.com; s=arc-20160816; b=dfb8o7gNEb0LcxmAYmbCXrG7Jqze/kQi0njUFWaXbf5P9qvEBsYm4fLlcmPwLdQI/r yXElA9Pe4kyNMARE5BukOwspYBewrgUPlsuPrpIDVAzLD0DLcQ4+b6TJ1Pk/qFbOmI7z ailI/EgKTQWoapV8obKSchn/hGNobCHpmlUG/mLKItYa1l6qjQEslTPEY0sBgg6Siui2 rh0MKz76mmYggtEkHsMqd7L7N0pXbJMW2ig64rX3ymyETKcC4FT5gKKSsHSL2rLfrjNz eW7ZUUxgJFnDApnvz7wrzUG1RPkgNCnG4okgv4uQAHl6eTJlacA8uYRGcRrz4yNGLXgj Ecew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=k4aQZT6JU4xlFPEa0wZGxOVEVSALilm6NEWz3U1AW2UaTda0GUEiZoh+v5ADB6DiaL tOrISylY2LGpUY14VIfaW4ZZpYJ12AZTPgFGVkxfgzzOKVrSKJI/RS0gSJ0d+q40hnt6 347YIjY6lhJbTY0uVXU2Ovbyi/o2UiAqQPuI/+E5JKxv8gv5EFjqfzHJCYvunpVi1BZ+ LtOodeSeOIxYqVAQvag6g/90Bo8lfAfbUngmkS36q5UszS67szEMSgTl+kMAqZNahp7F lX6XFFgEaneHKPin5mxZVy2e7Ea4VLbElltMqH5VRkYiArveD3d3QoR2B9rj5fhc4Acy 0EEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q2M6igR1; 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 kd25si2018407qvb.165.2021.09.16.08.49.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 08:49:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q2M6igR1; 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]:53452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtdX-0000qP-2z for patch@linaro.org; Thu, 16 Sep 2021 11:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0001Q0-HY for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:46 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:54928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0002Vo-H3 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: by mail-pj1-x1029.google.com with SMTP id i19so4804122pjv.4 for ; Thu, 16 Sep 2021 08:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=Q2M6igR1R6mGzSQo3coGw/qT5opTTCVsIUKm4TiseTLdufLRFPF0kLK9+F3aNcMXPc z8igq8Tz9bKMkXEdeFiotExifd9oywfb/q9v4fwsN1+6sCbcsTSBsmEEOsdz0Ul0R7Kl TAUftkB2eW9hpQXOSMqmJb5eSFL9uZfEwfkQGsFmvNk2fozZFpLDFb+WyHGoj+Q2sGXQ Y5uTlieXEUCT6tkhWbJbmjSiwgH8CDDpdaQO80pggpIMz2cpy785VmL5urusZ9s7HNXh aZrPtiwjG7iJzsa3weSGFlq5SnNmwP5QmYeccbMDkL1ThcdC8RnmB2d7Wyugbsd23YqG kDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=NHWVqd5JTUlC1dik0xuJx6OUgLXkfOUEPltqFQ9U04WKvq+57V3whb8MGpFq8Hsbny T7XkdzSFsbdTycSft9uLqoCbBi29FKWs9Dn056zy3jJNbvIg5ezck2g86DBa3orsAHly XFpoAyx/f46lpizURW1KndAln931RpwUdaF6/ttOKftGDCbxqaj4atg/E8sgHlv1VJ8Z tT2Fs4YDGXuaF+4yJ9sVp0Rt/MCQy9zNq9odiSyowTdVm1R7Eseb0TNU84KIjkYOzZ0g EJz5HoIRBEFBW05Pa3NHr3Uq/wEDcJ5GLXWk9lcILVOklXHPPC/h6SAoEjsdDq1NrET+ mgmw== X-Gm-Message-State: AOAM5331bNZSf9k1kXp0j6Dbrul6+GHdqlUfuIlBOyby7x5u/QIBeg+z HQ4l/ErBdu1qqIFPVMF+1Q0Ytssi4ivYtw== X-Received: by 2002:a17:90b:168a:: with SMTP id kv10mr15320695pjb.35.1631806236568; Thu, 16 Sep 2021 08:30:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/35] target/i386: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:05 -0700 Message-Id: <20210916153025.1944763-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-15-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b029f1bdf..36a1c5f3fd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6554,11 +6554,6 @@ int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request) return 0; } -static bool x86_cpu_has_work(CPUState *cs) -{ - return x86_cpu_pending_interrupt(cs, cs->interrupt_request) != 0; -} - static void x86_disas_set_info(CPUState *cs, disassemble_info *info) { X86CPU *cpu = X86_CPU(cs); @@ -6763,7 +6758,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->class_by_name = x86_cpu_class_by_name; cc->parse_features = x86_cpu_parse_featurestr; - cc->has_work = x86_cpu_has_work; cc->dump_state = x86_cpu_dump_state; cc->set_pc = x86_cpu_set_pc; cc->gdb_read_register = x86_cpu_gdb_read_register; diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 3ecfae34cb..aef050d089 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -55,6 +55,11 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, } #ifndef CONFIG_USER_ONLY +static bool x86_cpu_has_work(CPUState *cs) +{ + return x86_cpu_pending_interrupt(cs, cs->interrupt_request) != 0; +} + static bool x86_debug_check_breakpoint(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); @@ -63,7 +68,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs) /* RF disables all architectural breakpoints. */ return !(env->eflags & RF_MASK); } -#endif +#endif /* CONFIG_USER_ONLY */ #include "hw/core/tcg-cpu-ops.h" @@ -76,6 +81,7 @@ static const struct TCGCPUOps x86_tcg_ops = { #ifdef CONFIG_USER_ONLY .fake_user_interrupt = x86_cpu_do_interrupt, #else + .has_work = x86_cpu_has_work, .do_interrupt = x86_cpu_do_interrupt, .cpu_exec_interrupt = x86_cpu_exec_interrupt, .debug_excp_handler = breakpoint_handler,