From patchwork Thu Feb 11 12:18:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 8279031 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 823279F6DA for ; Thu, 11 Feb 2016 12:37:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E671B20397 for ; Thu, 11 Feb 2016 12:37:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 861E2201FA for ; Thu, 11 Feb 2016 12:37:03 +0000 (UTC) Received: from localhost ([::1]:49396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTqUY-0000ao-Ky for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Feb 2016 07:37:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTqUN-0000aQ-0c for qemu-devel@nongnu.org; Thu, 11 Feb 2016 07:36:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTqUK-0002Ql-B8 for qemu-devel@nongnu.org; Thu, 11 Feb 2016 07:36:50 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:49514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTqUK-0002Qc-3G; Thu, 11 Feb 2016 07:36:48 -0500 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 90C8C4146D; Thu, 11 Feb 2016 15:36:45 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 82343AAA; Thu, 11 Feb 2016 15:19:06 +0300 (MSK) Received: (nullmailer pid 11179 invoked by uid 1000); Thu, 11 Feb 2016 12:19:04 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Thu, 11 Feb 2016 15:18:53 +0300 Message-Id: <945123a554c39b68f38cec87403de1f783a86906.1455192968.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Michael Tokarev Subject: [Qemu-devel] [PULL 04/14] cpu: cpu_save/cpu_load is no more 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Everything has been converted to vmstate. Signed-off-by: Paolo Bonzini Signed-off-by: Michael Tokarev --- exec.c | 6 ------ include/qemu-common.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/exec.c b/exec.c index 7d67c11..ca7f8df 100644 --- a/exec.c +++ b/exec.c @@ -661,12 +661,6 @@ void cpu_exec_init(CPUState *cpu, Error **errp) if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu); } -#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) - register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, - cpu_save, cpu_load, cpu->env_ptr); - assert(cc->vmsd == NULL); - assert(qdev_get_vmsd(DEVICE(cpu)) == NULL); -#endif if (cc->vmsd != NULL) { vmstate_register(NULL, cpu_index, cc->vmsd, cpu); } diff --git a/include/qemu-common.h b/include/qemu-common.h index 22b010c..f557be7 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -330,12 +330,6 @@ 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);