From patchwork Fri Aug 1 05:27:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 375554 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 21BD71400E9 for ; Fri, 1 Aug 2014 15:35:58 +1000 (EST) Received: from localhost ([::1]:59945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5VT-0003qr-S8 for incoming@patchwork.ozlabs.org; Fri, 01 Aug 2014 01:35:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5OD-0007sd-A9 for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XD5O2-0003dn-4v for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:25 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:59402 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5O1-0003c0-UL for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:14 -0400 Received: from localhost.localdomain (laure.irqsave.net [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id 0A1CBC314B; Fri, 1 Aug 2014 07:28:12 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 1 Aug 2014 07:27:16 +0200 Message-Id: <1406870842-17988-19-git-send-email-benoit.canet@irqsave.net> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406870842-17988-1-git-send-email-benoit.canet@irqsave.net> References: <1406870842-17988-1-git-send-email-benoit.canet@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 80.12.84.125 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , Benoit Canet , mreitz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v1 18/24] monitor: Move qmp_rtc_reset_reinjection from monitor.c to monitor-system.c 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 Signed-off-by: Benoit Canet --- monitor-system.c | 7 +++++++ monitor.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monitor-system.c b/monitor-system.c index d5abf73..9bbf128 100644 --- a/monitor-system.c +++ b/monitor-system.c @@ -2513,3 +2513,10 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str) } } } + +#ifndef TARGET_I386 +void qmp_rtc_reset_reinjection(Error **errp) +{ + error_set(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection"); +} +#endif diff --git a/monitor.c b/monitor.c index 3133f62..a578e93 100644 --- a/monitor.c +++ b/monitor.c @@ -2950,10 +2950,3 @@ QemuOptsList qemu_mon_opts = { { /* end of list */ } }, }; - -#ifndef TARGET_I386 -void qmp_rtc_reset_reinjection(Error **errp) -{ - error_set(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection"); -} -#endif