From patchwork Mon Feb 18 19:42:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 221472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 615572C0095 for ; Tue, 19 Feb 2013 07:21:41 +1100 (EST) Received: from localhost ([::1]:58008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7Wd4-0003fA-HL for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 14:43:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7WcG-0001sy-5V for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7WcE-0008T3-Gx for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:08 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46500 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7WcE-0008Sn-9z for qemu-devel@nongnu.org; Mon, 18 Feb 2013 14:43:06 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C7088A50DD; Mon, 18 Feb 2013 20:43:05 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 20:42:33 +0100 Message-Id: <1361216553-4549-9-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361216553-4549-1-git-send-email-afaerber@suse.de> References: <1361216553-4549-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC qom-cpu v2 8/8] cpu: Guard cpu_{save, load}() definitions 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 A few targets already managed to implement cpu_save() and cpu_load() without defining CPU_SAVE_VERSION that causes them to be registered. Guard the prototypes with CPU_SAVE_VERSION to avoid this happening again until all targets are converted to VMState or QIDL. Signed-off-by: Andreas Färber Reviewed-by: Juan Quintela --- include/qemu-common.h | 2 ++ 1 Datei geändert, 2 Zeilen hinzugefügt(+) diff --git a/include/qemu-common.h b/include/qemu-common.h index 80016ad..3a65083 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -280,8 +280,10 @@ bool tcg_enabled(void); void cpu_exec_init_all(void); /* CPU save/load. */ +#ifdef CPU_SAVE_VERSION void cpu_save(QEMUFile *f, void *opaque); int cpu_load(QEMUFile *f, void *opaque, int version_id); +#endif /* Unblock cpu */ void qemu_cpu_kick_self(void);