From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56A7BC433EF for ; Mon, 20 Sep 2021 21:51:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 137106121D for ; Mon, 20 Sep 2021 21:51:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 137106121D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSRBk-0003PA-9D for qemu-devel@archiver.kernel.org; Mon, 20 Sep 2021 17:51:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSR6K-0003TX-Bb for qemu-devel@nongnu.org; Mon, 20 Sep 2021 17:45:24 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSR6I-0001tM-Qw for qemu-devel@nongnu.org; Mon, 20 Sep 2021 17:45:24 -0400 Received: by mail-wr1-x430.google.com with SMTP id t7so314180wrw.13 for ; Mon, 20 Sep 2021 14:45:22 -0700 (PDT) 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=xA2Qs5A8kdrstJ0M2RueeVwtCE7JAIn7H4+fKLqTQLg=; b=HyiXFPUofu0hyaR03SRT7hHtaIsHV81Brl+6tFlqSo9BLYvyXCghkOES+TPlpFKtHS r8YhYE762T/3FHInykUzC5F2BS5JiYvjWHw8W2eOBf34gzAyTSeJB13EkIeDPbnGKHaQ lwSfEN+jOIFaXp0VWGcMjgUrw3N0R4NhHg7NPzfljsJ2S4sx0DExm8hjRkk0dqsBP+0e Z8zVzKOaSyUi4So9CbhuXbqFa+1a1M4yThOka8M93e/RgRJVZQ+27UbPmLmWXkL1bRCx QjEzyGvwNswbs20QBPB24JiZKsC7Bd0jVCyhjKY/O+KWcK9ymvBe9rrm1m6yMkrn4DOV oEgQ== 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=xA2Qs5A8kdrstJ0M2RueeVwtCE7JAIn7H4+fKLqTQLg=; b=2qVRurwFEkkRh5/Iyo8JAyrz8bYAGvJj5YCZAz1duSAq4QdB72x1ruzxS/jnI+pY3L GPf3mLDUQ91W08CqSSpMbGl5MzpMlivrnCfv5frrr51+2QdrHbqmTN0eJUnnXk5kf4WU 6j2myWI4bQrbHndZY2udfM0gpPOayPmkx1gSn6ZBpccKCRElAZO+OZBzXs14qUSAeG6C evAYVq/pXHOHl+SOLYlZATVRZUHLeZVMISGJBPIRN/BWHMVbJyx69Z9xsg/IJQTcO+Zz EbQpy+FJPYlpb9Bc7bqB4H/8UxZWQEumtIWL3LABIGTIaAfWEq8xOt+VgsMpUszXthtc ApsQ== X-Gm-Message-State: AOAM5336iEMHANcL7lpFnuMBRBajl5H4+JJ5ubpQcpvGW6/3zZ6720oS ck/D4J82ZQCPLVSOVkka2/TauTG/Axs= X-Google-Smtp-Source: ABdhPJzHooTMuOlKidkNAcJ0q7UpY6tbSCsVvn669AIkNs/X3LYaEn78O1Dhsp3cXryhPG+QPXWMLg== X-Received: by 2002:a5d:64e6:: with SMTP id g6mr15434822wri.151.1632174321282; Mon, 20 Sep 2021 14:45:21 -0700 (PDT) Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n26sm688230wmi.43.2021.09.20.14.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 07/31] accel/whpx: Implement AccelOpsClass::has_work() Date: Mon, 20 Sep 2021 23:44:23 +0200 Message-Id: <20210920214447.2998623-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Implement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index b22804c4193..98b4049aba7 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -41,7 +41,6 @@ #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h" @@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } return true; diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c index 6bc47c53098..1f9c6d52c27 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } +static bool whpx_cpu_has_work(CPUState *cpu) +{ + return whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = whpx_cpu_synchronize_post_init; ops->synchronize_state = whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm = whpx_cpu_synchronize_pre_loadvm; + ops->has_work = whpx_cpu_has_work; } static const TypeInfo whpx_accel_ops_type = { -- 2.31.1