From nobody Mon Nov 10 09:55:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556067525; cv=none; d=zoho.com; s=zohoarc; b=nNEBN7b1OM6vJs3xa2RoQzS/E5l7yvrV7ZvFJhrbJpS+DVv1ofR4PFBWKUwYPibrcvMBr/QgP52x/ysoe4L4cdCncp5eHm9dtgH16/aVMhwfF9V+yoM8xvEQv4rIl7EYv1gt0mgY85rfLOGS0sVCOyOczZ2yY+D7DgC6IQJVVYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556067525; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=h78Za+bT9mNxv8n9epuetznMFFZOK2eaM4M09e8Sars=; b=aDf/A7SMi8sS8G19ba6QDPHEVo8XhrMKdiOV/BSe/NZpkeBPLyRgnGzHHEyB0FWXp7YEJcacpROxbPSnkucC6zEsAz+KOnZ8ONUiY8oF39lOQ8hghRYHzRaHEKOVjWyKVMT8/hG+rlVClujBdm8Xlv/fOOuXVfiAVkPzxi0RkCc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15560675257531018.6636854262571; Tue, 23 Apr 2019 17:58:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:33628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6FF-0006Yw-TF for importer@patchew.org; Tue, 23 Apr 2019 20:58:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003Uz-Oy for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64V-0008Us-Au for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:36 -0400 Received: from mga18.intel.com ([134.134.136.126]:13718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64V-0008TP-2h for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:35 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:33 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:32 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265301" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:46:57 +0800 Message-Id: <20190424004700.12766-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 1/4] migration/savevm: remove duplicate check of migration_is_blocked X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Current call flow of save_snapshot is: save_snapshot migration_is_blocked qemu_savevm_state migration_is_blocked Since qemu_savevm_state is only called in save_snapshot, this means migration_is_blocked has been already checked. Signed-off-by: Wei Yang Reviewed-by: Daniel Henrique Barboza Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 92af2471cd..2eea604624 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1412,10 +1412,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **er= rp) return -EINVAL; } =20 - if (migration_is_blocked(errp)) { - return -EINVAL; - } - if (migrate_use_block()) { error_setg(errp, "Block migration and snapshots are incompatible"); return -EINVAL; --=20 2.19.1 From nobody Mon Nov 10 09:55:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556067454; cv=none; d=zoho.com; s=zohoarc; b=LoteVpXDAQKHmbolJIJOAmc0s077YB/xF7Vx38sKb1AY6voRmZNJPymcAf/a0RGs2LOJaKoW++/UtVZOY6DjJiKqcovQ8rs+tcl4xQDGZl7mmrW3EK1Z3XeWbKcaTSi20qUuze6rNSqdiwqClcKsFzBm15s4bAYhLVOz60vFGyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556067454; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=STn5U66z1gE6mNi4xhH/MzKc5N1KUmqnkNmlw7mwZ54=; b=OlDC3Ggg4y9lUgN9EsEOHFHAXX5j4Fl7oALzkdE830jGx1SyQrgbt+KaXKOMAHxAfpzan3EZ8XmROzVy2oJ+hJCP+6BvkhfHtVbHIG67I3l35m5w6C+smbR/Uhhy60ojc9YgaG39I0p2yyD1wCuktK8rXud+p0hwY1LFmP9sy0Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556067454066515.0201581139999; Tue, 23 Apr 2019 17:57:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:33620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6E7-0005y0-7T for importer@patchew.org; Tue, 23 Apr 2019 20:57:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003TN-MV for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64V-0008VE-Pd for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:36 -0400 Received: from mga18.intel.com ([134.134.136.126]:13718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64V-0008TP-Hn for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:35 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:35 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:34 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265308" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:46:58 +0800 Message-Id: <20190424004700.12766-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 2/4] migration/savevm: use migration_is_blocked to validate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" migration_is_blocked() is used in migrate_prepare() and save_snapshot(), this is more proper to use this instead of qemu_savevm_state_blocked() in qemu_loadvm_state(). Signed-off-by: Wei Yang --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 2eea604624..6c61056cde 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2406,7 +2406,7 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; =20 - if (qemu_savevm_state_blocked(&local_err)) { + if (migration_is_blocked(&local_err)) { error_report_err(local_err); return -EINVAL; } --=20 2.19.1 From nobody Mon Nov 10 09:55:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556067361; cv=none; d=zoho.com; s=zohoarc; b=H82x4y2VZy2RXmGQaIaQV9YJsmYMYmoZ6KyoskZf/UaQ3ibjHB7LglPzELX0azcRtt57JnWuv2fWuqQll9qAUpPB+WeWuMR0u737GCEP5A3FVSFXX7qubGtOWYKK9LBOum8bhPge80v2BWlCpGOpzt7wxArQ951c0l/Xlhm0lQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556067361; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ciEYsBSmssMgk60Ymd+Xu7yoMkogr0kIz2oW1l03axk=; b=i58Sg8tW87TilApWSXpIpU1j+KuBPXeWqfSUcApuwbK1uI0aKY4w9H0u82caT09cDEUt9AiFgNRYj/cK9KiDlKYOYsGX2hlmIObW7xJumYvB/3val0Ba0s0DNu19AyA4ug7v4Mi7/Itu5IllN9enzC7uqNoX2Fo9A/iD3s35SMc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556067361353678.3461235610476; Tue, 23 Apr 2019 17:56:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:33593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6CU-0004bV-Ha for importer@patchew.org; Tue, 23 Apr 2019 20:55:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003Pg-7F for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64X-00006E-WC for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:38 -0400 Received: from mga18.intel.com ([134.134.136.126]:13721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64X-00005J-OW for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:37 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:36 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:35 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265316" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:46:59 +0800 Message-Id: <20190424004700.12766-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 3/4] migration/savevm: load_header before load_setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In migration_thread() and qemu_savevm_state(), we savevm_state in following sequence: qemu_savevm_state_header(f); qemu_savevm_state_setup(f); Then it would be more proper to loadvm_state in the save sequence. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6c61056cde..a80ae83663 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2427,10 +2427,6 @@ int qemu_loadvm_state(QEMUFile *f) return -ENOTSUP; } =20 - if (qemu_loadvm_state_setup(f) !=3D 0) { - return -EINVAL; - } - if (migrate_get_current()->send_configuration) { if (qemu_get_byte(f) !=3D QEMU_VM_CONFIGURATION) { error_report("Configuration section missing"); @@ -2445,6 +2441,10 @@ int qemu_loadvm_state(QEMUFile *f) } } =20 + if (qemu_loadvm_state_setup(f) !=3D 0) { + return -EINVAL; + } + cpu_synchronize_all_pre_loadvm(); =20 ret =3D qemu_loadvm_state_main(f, mis); --=20 2.19.1 From nobody Mon Nov 10 09:55:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556067368; cv=none; d=zoho.com; s=zohoarc; b=R/QQth4mN9k23EbzlRxrz450noQmkP5Z5tLXqvYK9v+tpI+yP6FQrXTY+iP/JQyrraKpsYJ2VM7xvQ9hCmO0QPg/yUsWEJEXesniDoIqWvRXr6xIzBp9O3QFPRo9g17v0vVVs/3d7rLwJRh33LyJPpwiyC+Q+0R9WEnCIFC2UEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556067368; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RrUkcOQyoVCuMKJor+E2UrcJGu4q66/K4rnHDkfDJbQ=; b=RehhuPWDdf3hXHov5ioWDqdemjbKHU+9Q+19Vt2CnQ6UFrR4SrHtGpmCg6x1wcXsF8QRRjjm+5RsN5KjjlMU4yZB0Iru2YiQZjcN7tC2pJhgyegsyIsnM1XZiLjCPjgUoHOoSBEhcvBWa8IQB/UtpzzlvSok1Mfwt00MAa0WLII= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556067368819214.037290407206; Tue, 23 Apr 2019 17:56:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:33597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6CW-0004cX-NV for importer@patchew.org; Tue, 23 Apr 2019 20:55:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003Py-24 for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64Z-00007J-Cj for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:40 -0400 Received: from mga18.intel.com ([134.134.136.126]:13721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64Z-00005J-54 for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:39 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:38 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265323" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:47:00 +0800 Message-Id: <20190424004700.12766-5-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 4/4] migration/savevm: wrap into qemu_loadvm_state_header() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" On source side, we have qemu_savevm_state_header() to send related data, while on the receiving side those steps are scattered in qemu_loadvm_state(). This patch wrap those related steps into qemu_loadvm_state_header() to make it friendly to read. Signed-off-by: Wei Yang Reviewed-by: Daniel Henrique Barboza --- migration/savevm.c | 69 +++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index a80ae83663..64d23682c6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2256,6 +2256,43 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationI= ncomingState *mis) return 0; } =20 +static int qemu_loadvm_state_header(QEMUFile *f) +{ + unsigned int v; + int ret; + + v =3D qemu_get_be32(f); + if (v !=3D QEMU_VM_FILE_MAGIC) { + error_report("Not a migration stream"); + return -EINVAL; + } + + v =3D qemu_get_be32(f); + if (v =3D=3D QEMU_VM_FILE_VERSION_COMPAT) { + error_report("SaveVM v2 format is obsolete and don't work anymore"= ); + return -ENOTSUP; + } + if (v !=3D QEMU_VM_FILE_VERSION) { + error_report("Unsupported migration stream version"); + return -ENOTSUP; + } + + if (migrate_get_current()->send_configuration) { + if (qemu_get_byte(f) !=3D QEMU_VM_CONFIGURATION) { + error_report("Configuration section missing"); + qemu_loadvm_state_cleanup(); + return -EINVAL; + } + ret =3D vmstate_load_state(f, &vmstate_configuration, &savevm_stat= e, 0); + + if (ret) { + qemu_loadvm_state_cleanup(); + return ret; + } + } + return 0; +} + static int qemu_loadvm_state_setup(QEMUFile *f) { SaveStateEntry *se; @@ -2403,7 +2440,6 @@ int qemu_loadvm_state(QEMUFile *f) { MigrationIncomingState *mis =3D migration_incoming_get_current(); Error *local_err =3D NULL; - unsigned int v; int ret; =20 if (migration_is_blocked(&local_err)) { @@ -2411,34 +2447,9 @@ int qemu_loadvm_state(QEMUFile *f) return -EINVAL; } =20 - v =3D qemu_get_be32(f); - if (v !=3D QEMU_VM_FILE_MAGIC) { - error_report("Not a migration stream"); - return -EINVAL; - } - - v =3D qemu_get_be32(f); - if (v =3D=3D QEMU_VM_FILE_VERSION_COMPAT) { - error_report("SaveVM v2 format is obsolete and don't work anymore"= ); - return -ENOTSUP; - } - if (v !=3D QEMU_VM_FILE_VERSION) { - error_report("Unsupported migration stream version"); - return -ENOTSUP; - } - - if (migrate_get_current()->send_configuration) { - if (qemu_get_byte(f) !=3D QEMU_VM_CONFIGURATION) { - error_report("Configuration section missing"); - qemu_loadvm_state_cleanup(); - return -EINVAL; - } - ret =3D vmstate_load_state(f, &vmstate_configuration, &savevm_stat= e, 0); - - if (ret) { - qemu_loadvm_state_cleanup(); - return ret; - } + ret =3D qemu_loadvm_state_header(f); + if (ret) { + return ret; } =20 if (qemu_loadvm_state_setup(f) !=3D 0) { --=20 2.19.1