From patchwork Fri Feb 1 00:44:34 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: 217323 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 6BDA42C0095 for ; Fri, 1 Feb 2013 12:34:23 +1100 (EST) Received: from localhost ([::1]:41268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U14lO-0003ah-Si for incoming@patchwork.ozlabs.org; Thu, 31 Jan 2013 19:45:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U14kf-0002Ao-PK for qemu-devel@nongnu.org; Thu, 31 Jan 2013 19:45:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U14kc-0004xk-Ug for qemu-devel@nongnu.org; Thu, 31 Jan 2013 19:45:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34419 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U14kc-0004xL-O0 for qemu-devel@nongnu.org; Thu, 31 Jan 2013 19:45:06 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 27988A3E1C; Fri, 1 Feb 2013 01:45:05 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 1 Feb 2013 01:44:34 +0100 Message-Id: <1359679480-32356-7-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359679480-32356-1-git-send-email-afaerber@suse.de> References: <1359679480-32356-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: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Subject: [Qemu-devel] [PATCH 06/12] target-m68k: Mark as unmigratable 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 It neither defined CPU_SAVE_VERSION nor implemented cpu_{save,load}(). Mark M68kCPU as unmigratable at device level. Signed-off-by: Andreas Färber Reviewed-by: Juan Quintela --- target-m68k/Makefile.objs | 1 - target-m68k/cpu.c | 8 ++++++++ 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) delete mode 100644 target-m68k/machine.c diff --git a/target-m68k/machine.c b/target-m68k/machine.c deleted file mode 100644 index e69de29..0000000 diff --git a/target-m68k/Makefile.objs b/target-m68k/Makefile.objs index 7eccfab..2e2b850 100644 --- a/target-m68k/Makefile.objs +++ b/target-m68k/Makefile.objs @@ -1,3 +1,2 @@ obj-y += m68k-semi.o obj-y += translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) += machine.o diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 5c78031..c911b8f 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "qemu-common.h" +#include "migration/vmstate.h" static void m68k_set_feature(CPUM68KState *env, int feature) @@ -143,15 +144,22 @@ static void m68k_cpu_initfn(Object *obj) cpu_exec_init(env); } +static const VMStateDescription vmstate_m68k_cpu = { + .name = "cpu", + .unmigratable = 1, +}; + static void m68k_cpu_class_init(ObjectClass *c, void *data) { M68kCPUClass *mcc = M68K_CPU_CLASS(c); CPUClass *cc = CPU_CLASS(c); + DeviceClass *dc = DEVICE_CLASS(c); mcc->parent_reset = cc->reset; cc->reset = m68k_cpu_reset; cc->class_by_name = m68k_cpu_class_by_name; + dc->vmsd = &vmstate_m68k_cpu; } static void register_cpu_type(const M68kCPUInfo *info)