From patchwork Mon Jun 15 13:23:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 30321 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5FDOPrn028570 for ; Mon, 15 Jun 2009 13:24:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760932AbZFONXX (ORCPT ); Mon, 15 Jun 2009 09:23:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758890AbZFONXX (ORCPT ); Mon, 15 Jun 2009 09:23:23 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44164 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760890AbZFONXR (ORCPT ); Mon, 15 Jun 2009 09:23:17 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5FDNKuX026672 for ; Mon, 15 Jun 2009 09:23:20 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5FDNJFE009565; Mon, 15 Jun 2009 09:23:20 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5FDNIVj025640; Mon, 15 Jun 2009 09:23:19 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 7CF1818D481; Mon, 15 Jun 2009 16:23:17 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH 8/8] env->exit_request is not used by kvm. Date: Mon, 15 Jun 2009 16:23:17 +0300 Message-Id: <1245072197-7538-9-git-send-email-gleb@redhat.com> In-Reply-To: <1245072197-7538-1-git-send-email-gleb@redhat.com> References: <1245072197-7538-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Remove its use from kvm code. Signed-off-by: Gleb Natapov --- qemu-kvm-x86.c | 3 +-- qemu-kvm.c | 3 --- vl.c | 1 - 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 6865385..5460136 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -634,8 +634,7 @@ void kvm_arch_post_kvm_run(void *opaque, CPUState *env) int kvm_arch_has_work(CPUState *env) { - if (env->exit_request || - ((env->interrupt_request & CPU_INTERRUPT_HARD) && + if (((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || (env->interrupt_request & CPU_INTERRUPT_NMI)) return 1; diff --git a/qemu-kvm.c b/qemu-kvm.c index 2930a1d..bbdb03a 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -168,8 +168,6 @@ static int kvm_pre_run(void *opaque, void *data) kvm_arch_pre_kvm_run(opaque, env); - if (env->exit_request) - return 1; pthread_mutex_unlock(&qemu_mutex); return 0; } @@ -441,7 +439,6 @@ static int kvm_main_loop_cpu(CPUState *env) } if (!env->halted || kvm_irqchip_in_kernel(kvm_context)) kvm_cpu_exec(env); - env->exit_request = 0; kvm_main_loop_wait(env, 0); } pthread_mutex_unlock(&qemu_mutex); diff --git a/vl.c b/vl.c index 845ed54..c08299c 100644 --- a/vl.c +++ b/vl.c @@ -3724,7 +3724,6 @@ void qemu_system_reset_request(void) } if (cpu_single_env) { qemu_kvm_cpu_stop(cpu_single_env); - cpu_exit(cpu_single_env); } qemu_notify_event(); }