From patchwork Mon Jan 28 00:13:07 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: 216084 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 AB6CD2C0092 for ; Mon, 28 Jan 2013 11:14:32 +1100 (EST) Received: from localhost ([::1]:41933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzcMo-0007lj-MF for incoming@patchwork.ozlabs.org; Sun, 27 Jan 2013 19:14:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzcLu-0005MD-Dr for qemu-devel@nongnu.org; Sun, 27 Jan 2013 19:13:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TzcLs-0003Jz-6l for qemu-devel@nongnu.org; Sun, 27 Jan 2013 19:13:34 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36173 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzcLs-0003Ju-0X for qemu-devel@nongnu.org; Sun, 27 Jan 2013 19:13:32 -0500 Received: from relay2.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 9564BA51BB; Mon, 28 Jan 2013 01:13:31 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2013 01:13:07 +0100 Message-Id: <1359331989-12528-5-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359331989-12528-1-git-send-email-afaerber@suse.de> References: <1359331989-12528-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?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH qom-cpu for-1.4 4/6] target-sh4: 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 it as unmigratable at device level. Signed-off-by: Andreas Färber --- target-sh4/Makefile.objs | 1 - target-sh4/cpu.c | 9 +++++++++ 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) delete mode 100644 target-sh4/machine.c diff --git a/target-sh4/machine.c b/target-sh4/machine.c deleted file mode 100644 index e69de29..0000000 diff --git a/target-sh4/Makefile.objs b/target-sh4/Makefile.objs index ca20f21..cb448a8 100644 --- a/target-sh4/Makefile.objs +++ b/target-sh4/Makefile.objs @@ -1,2 +1 @@ obj-y += translate.o op_helper.o helper.o cpu.o -obj-$(CONFIG_SOFTMMU) += machine.o diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index e4858a0..d283122 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "qemu-common.h" +#include "migration/vmstate.h" /* CPUClass::reset() */ @@ -63,13 +64,21 @@ static void superh_cpu_initfn(Object *obj) env->movcal_backup_tail = &(env->movcal_backup); } +static const VMStateDescription vmstate_sh_cpu = { + .name = "cpu", + .unmigratable = 1, +}; + static void superh_cpu_class_init(ObjectClass *oc, void *data) { + DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc); scc->parent_reset = cc->reset; cc->reset = superh_cpu_reset; + + dc->vmsd = &vmstate_sh_cpu; } static const TypeInfo superh_cpu_type_info = {