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: 102103 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P8ejXo029827 for ; Tue, 25 May 2010 08:40:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756318Ab0EYIkm (ORCPT ); Tue, 25 May 2010 04:40:42 -0400 Received: from sh.osrg.net ([192.16.179.4]:34879 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756247Ab0EYIkj (ORCPT ); Tue, 25 May 2010 04:40:39 -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 Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 17/23] Skip assert() when event_tap_state weren't EVENT_TAP_OFF. 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: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 25 May 2010 08:40:45 +0000 (UTC) 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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;