From patchwork Tue May 25 08:36:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 53517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C4697B7D2E for ; Tue, 25 May 2010 19:13:53 +1000 (EST) Received: from localhost ([127.0.0.1]:42701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGqCq-0001JW-Fw for incoming@patchwork.ozlabs.org; Tue, 25 May 2010 05:13:48 -0400 Received: from [140.186.70.92] (port=48388 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGpgj-0003Cn-GO for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGpgW-0003df-LM for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:34 -0400 Received: from sh.osrg.net ([192.16.179.4]:51667) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGpgV-0003aj-Sr for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:24 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4P8eJAu010283; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id E44A03E0308; Tue, 25 May 2010 17:40:17 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Tue, 25 May 2010 17:36:58 +0900 Message-Id: <1274776624-16435-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 33 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:19 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, mtosatti@redhat.com, avi@redhat.com, Yoshiaki Tamura , ohmura.kei@lab.ntt.co.jp Subject: [Qemu-devel] [RFC PATCH 17/23] Skip assert() when event_tap_state weren't EVENT_TAP_OFF. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Skip assert(!cpu_single_env) in resume_all_threads() when event_tap_state weren't EVENT_TAP_OFF. Signed-off-by: Yoshiaki Tamura --- qemu-kvm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 1414f49..e28bf59 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -18,6 +18,7 @@ #include "compatfd.h" #include "gdbstub.h" #include "monitor.h" +#include "event-tap.h" #include "qemu-kvm.h" #include "libkvm.h" @@ -1770,7 +1771,8 @@ static void resume_all_threads(void) { CPUState *penv = first_cpu; - assert(!cpu_single_env); + if (event_tap_get_state() == EVENT_TAP_OFF) + assert(!cpu_single_env); while (penv) { penv->stop = 0;