From patchwork Thu Sep 22 09:26:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 115920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 84295B6F62 for ; Thu, 22 Sep 2011 19:26:02 +1000 (EST) Received: from localhost ([::1]:43837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6fXW-0003ae-2B for incoming@patchwork.ozlabs.org; Thu, 22 Sep 2011 05:25:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6fXL-0003ZN-CP for qemu-devel@nongnu.org; Thu, 22 Sep 2011 05:25:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6fXK-00078C-56 for qemu-devel@nongnu.org; Thu, 22 Sep 2011 05:25:43 -0400 Received: from mail-ew0-f48.google.com ([209.85.215.48]:55954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6fXJ-00077q-J1 for qemu-devel@nongnu.org; Thu, 22 Sep 2011 05:25:42 -0400 Received: by ewy20 with SMTP id 20so888370ewy.7 for ; Thu, 22 Sep 2011 02:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=S+WiQZCoemOrAMC2KY3xpRMzQ3vYTpiLjqnuRtJkvTM=; b=QXdN7Ghmg6emCmE4UGLSn9V45Rn7RWA7sc+JwmDVzLk3a7bk3zbzrFS1/83UTrrlrl a6eN5FiBvo41GaoR3wAiStL0YM5ge/Xv99oacxlaeE4Z8Va0zzV0rdOEqXVO1pD/NvDZ 3MQCZaE9WDOylcQ9XIWljSLKWRn9y9ZFUyoac= Received: by 10.213.6.199 with SMTP id a7mr1000163eba.109.1316683539988; Thu, 22 Sep 2011 02:25:39 -0700 (PDT) Received: from obol602.omnitel.it (rainbowwarrior.torservers.net. [77.247.181.164]) by mx.google.com with ESMTPS id q50sm22930633eef.9.2011.09.22.02.25.31 (version=SSLv3 cipher=OTHER); Thu, 22 Sep 2011 02:25:38 -0700 (PDT) From: Frediano Ziglio To: Alexander Graf , Anthony Liguori , Paul Brook Date: Thu, 22 Sep 2011 11:26:15 +0200 Message-Id: <1316683575-31577-1-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.48 Cc: Frediano Ziglio , Christoph Hellwig , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] core: remove qemu_service_io X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_service_io was mainly an alias to qemu_notify_event, currently used only by PPC for timer hack, so call qemu_notify_event directly. Signed-off-by: Frediano Ziglio --- arch_init.c | 5 ----- qemu-common.h | 3 --- qemu-tool.c | 4 ---- target-ppc/kvm_ppc.c | 2 +- 4 files changed, 1 insertions(+), 13 deletions(-) diff --git a/arch_init.c b/arch_init.c index 9a5a0e3..a6c69c7 100644 --- a/arch_init.c +++ b/arch_init.c @@ -459,11 +459,6 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) return 0; } -void qemu_service_io(void) -{ - qemu_notify_event(); -} - #ifdef HAS_AUDIO struct soundhw { const char *name; diff --git a/qemu-common.h b/qemu-common.h index 404c421..5e87bdf 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -276,9 +276,6 @@ void cpu_exec_init_all(void); void cpu_save(QEMUFile *f, void *opaque); int cpu_load(QEMUFile *f, void *opaque, int version_id); -/* Force QEMU to stop what it's doing and service IO */ -void qemu_service_io(void); - /* Force QEMU to process pending events */ void qemu_notify_event(void); diff --git a/qemu-tool.c b/qemu-tool.c index eb89fe0..e9f7fe1 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -29,10 +29,6 @@ struct QEMUBH void *opaque; }; -void qemu_service_io(void) -{ -} - Monitor *cur_mon; int monitor_cur_is_qmp(void) diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index 867dc1d..c031fcb 100644 --- a/target-ppc/kvm_ppc.c +++ b/target-ppc/kvm_ppc.c @@ -88,7 +88,7 @@ void kvmppc_fdt_update(void *fdt) static void kvmppc_timer_hack(void *opaque) { - qemu_service_io(); + qemu_notify_event(); qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate); }