From patchwork Tue Jul 4 11:12:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 783872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x21Zw6jlNz9s4q for ; Tue, 4 Jul 2017 21:13:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E6Duy5Fs"; dkim-atps=neutral Received: from localhost ([::1]:40464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLlm-0006k0-IC for incoming@patchwork.ozlabs.org; Tue, 04 Jul 2017 07:13:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLkv-0006YV-VC for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSLku-0001pw-Je for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:33 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSLku-0001pT-A2 for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:32 -0400 Received: by mail-wm0-x244.google.com with SMTP id p204so25630268wmg.1 for ; Tue, 04 Jul 2017 04:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9hJbnIceqewlURC3st+opMa+lJr+ZrNzZ8dWV4pva04=; b=E6Duy5FsEzk0qi+XgypYV1u/sSXO0vcFdZyhQtWoO02yP0FipIe0eiU2zkge5FbsrS YsO0O4UEMl6WkjNXgemMREgHcL5mBg6OACvWP5dZpNgY+AS3fe6BNS7jbjTQg+jslue/ RMoGi6UpIeLyvkqevd5aQMIT+Bgds4oDtzQTojYPsXj0Mq0H9clbq7s3ux2ZNPuVZ8g+ 6R7UDjYrjiiJHcZkhHLUF5uxYwDaGcA5X1WsYp5bi3cw/Uyy+HviyRrgRy0/yb4Bh+7X lyJ5prAhZ+zomsJMhF1di2zqhPnEKkynIKL+hAHeyVuCGJZomHJLmipb4+t0dk7mbKas n+Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9hJbnIceqewlURC3st+opMa+lJr+ZrNzZ8dWV4pva04=; b=LW0ovIPU6fJWC9CmefJzXmOMp4S6UUURGphYrMQTZ7fJIeJPVqNqxhH6FeeJaCzFFN sk4AWQLdov/ggVQkZcEaRUgtMxcpjuDChNcjA9Xkw+wDfv/c9mwKalom3iwqTX4j5U4m oA4n0ZuISs9DnpuMsQLlKdEi6Kul488belf3uakWQ3OX+ygef5bvfQOImxQJQQVYRCqe rCztVEcZNJepdRp37zK/DQJMSUiNTVTPmBvs366RLC/EPeHaAMlwarDxNSi2tAKduoqz nq3FULuly1Y+9LAhryWcZsw1hslmFrPm0npH4/HjlmVsCRf9vCNtKa4s5WH/iyfSfCo9 qjzQ== X-Gm-Message-State: AKS2vOwUP+9L9Fx2QwLOeNk1nWpWsfbtlppuf8SSBx1hJlMqgxQaQPk7 Unz3Rj2RR5XTwNFG4LM= X-Received: by 10.28.165.199 with SMTP id o190mr17431080wme.57.1499166751025; Tue, 04 Jul 2017 04:12:31 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y5sm13613870wrd.52.2017.07.04.04.12.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 04:12:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jul 2017 13:12:00 +0200 Message-Id: <1499166735-39360-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> References: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, a.rigo@virtualopensystems.com, anthony.xu@intel.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yang Zhong Move tcg_handle_interrupt() from translate-common.c to accel/tcg/tcg-all.c. Signed-off-by: Yang Zhong Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- accel/tcg/Makefile.objs | 2 +- accel/tcg/tcg-all.c | 32 +++++++++++++++++++++++++ accel/tcg/translate-common.c | 56 -------------------------------------------- qom/cpu.c | 2 ++ 4 files changed, 35 insertions(+), 57 deletions(-) delete mode 100644 accel/tcg/translate-common.c diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index f173cd5..70cd474 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -1,3 +1,3 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o -obj-y += cpu-exec.o cpu-exec-common.o translate-all.o translate-common.o +obj-y += cpu-exec.o cpu-exec-common.o translate-all.o diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index e327d90..c1ccad3 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -27,13 +27,45 @@ #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "qom/object.h" +#include "qemu-common.h" +#include "qom/cpu.h" +#include "sysemu/cpus.h" +#include "qemu/main-loop.h" unsigned long tcg_tb_size; static bool tcg_allowed = true; +#ifndef CONFIG_USER_ONLY +/* mask must never be zero, except for A20 change call */ +static void tcg_handle_interrupt(CPUState *cpu, int mask) +{ + int old_mask; + g_assert(qemu_mutex_iothread_locked()); + + old_mask = cpu->interrupt_request; + cpu->interrupt_request |= mask; + + /* + * If called from iothread context, wake the target cpu in + * case its halted. + */ + if (!qemu_cpu_is_self(cpu)) { + qemu_cpu_kick(cpu); + } else { + cpu->icount_decr.u16.high = -1; + if (use_icount && + !cpu->can_do_io + && (mask & ~old_mask) != 0) { + cpu_abort(cpu, "Raised interrupt while not in I/O function"); + } + } +} +#endif + static int tcg_init(MachineState *ms) { tcg_exec_init(tcg_tb_size * 1024 * 1024); + cpu_interrupt_handler = tcg_handle_interrupt; return 0; } diff --git a/accel/tcg/translate-common.c b/accel/tcg/translate-common.c deleted file mode 100644 index 40fe5a1..0000000 --- a/accel/tcg/translate-common.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Host code generation common components - * - * Copyright (c) 2015 Peter Crosthwaite - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "qom/cpu.h" -#include "sysemu/cpus.h" -#include "qemu/main-loop.h" - -uintptr_t qemu_real_host_page_size; -intptr_t qemu_real_host_page_mask; - -#ifndef CONFIG_USER_ONLY -/* mask must never be zero, except for A20 change call */ -static void tcg_handle_interrupt(CPUState *cpu, int mask) -{ - int old_mask; - g_assert(qemu_mutex_iothread_locked()); - - old_mask = cpu->interrupt_request; - cpu->interrupt_request |= mask; - - /* - * If called from iothread context, wake the target cpu in - * case its halted. - */ - if (!qemu_cpu_is_self(cpu)) { - qemu_cpu_kick(cpu); - } else { - cpu->icount_decr.u16.high = -1; - if (use_icount && - !cpu->can_do_io - && (mask & ~old_mask) != 0) { - cpu_abort(cpu, "Raised interrupt while not in I/O function"); - } - } -} - -CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt; -#endif diff --git a/qom/cpu.c b/qom/cpu.c index 585419b..1d7aa59 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -31,6 +31,8 @@ #include "hw/qdev-properties.h" #include "trace-root.h" +CPUInterruptHandler cpu_interrupt_handler; + bool cpu_exists(int64_t id) { CPUState *cpu;