From patchwork Mon Jan 25 11:27:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8107001 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 1CC379F859 for ; Mon, 25 Jan 2016 11:28:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8448A202F0 for ; Mon, 25 Jan 2016 11:28:23 +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 D77D8202EB for ; Mon, 25 Jan 2016 11:28:22 +0000 (UTC) Received: from localhost ([::1]:37448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNfJm-0005qW-8j for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Jan 2016 06:28:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNfJZ-0005hJ-0Q for qemu-devel@nongnu.org; Mon, 25 Jan 2016 06:28:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNfJY-0006y0-3X for qemu-devel@nongnu.org; Mon, 25 Jan 2016 06:28:08 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNfJX-0006wK-TA for qemu-devel@nongnu.org; Mon, 25 Jan 2016 06:28:08 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aNfJO-00089J-Iy; Mon, 25 Jan 2016 11:27:58 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2016 11:27:58 +0000 Message-Id: <1453721278-31300-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Subject: [Qemu-devel] [PATCH] cpu: Drop support for non-vmstate CPU migration 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 All of our target CPUs have now been converted from the old-style save/load function migration to use VMState structures instead. We can therefore drop the support for the old cpu_save/cpu_load functions from the core code. Signed-off-by: Peter Maydell --- exec.c | 6 ------ include/qemu-common.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/exec.c b/exec.c index 7115403..8daa915 100644 --- a/exec.c +++ b/exec.c @@ -662,12 +662,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);