From nobody Mon May 6 06:34:40 2024 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=1562681511; cv=none; d=zoho.com; s=zohoarc; b=JigP2X47LklUTlhjwG/MxbE6VXHJGxJvd0VhvvKH6yurjffcAvOJ/AV4wyXIh5EqaGY3wDG8dbOaExqDazv56CCGusdRD/Vzbq2iRATLu8kyBNS9uy7nZWG8wcJECZokx+OyStRgJ6t15ZMMzWmsGC2RuiKIZk3jH9odWgXxc3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562681511; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=CaWfm0Bf9GYeOdpKg9cWoRa+zA2y/oeQQOy1YUIyG+I=; b=B3O2+Z9sKmMhRWf0FGLXs8i706VIKSz8b3R57TkvDZ16V34IqLXjjKYnwtE+w/rdHEUM7PCM64EnFeDXVxN0K2OLPyOR+gBShgjMMu5vUW79VT35aWCLCFridR6G7D8v9AYRSprAaJYtcRuQx01CaUNFPlgYcKWFgBwlaXWJneU= 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 1562681510989581.0764727241828; Tue, 9 Jul 2019 07:11:50 -0700 (PDT) Received: from localhost ([::1]:50334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqqS-0000KK-IU for importer@patchew.org; Tue, 09 Jul 2019 10:11:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54502) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqon-0007MR-Vv for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkqon-0008Dp-1W for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:05 -0400 Received: from mga02.intel.com ([134.134.136.20]:42710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkqom-0008DN-PZ for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:04 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 07:10:01 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga002.jf.intel.com with ESMTP; 09 Jul 2019 07:10:00 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,470,1557212400"; d="scan'208";a="176507503" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 22:09:22 +0800 Message-Id: <20190709140924.13291-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709140924.13291-1-richardw.yang@linux.intel.com> References: <20190709140924.13291-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 1/3] migration/savevm: flush file for iterable_only case X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It would be proper to flush file even for iterable_only case. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index c0e557b4c2..becedcc1c6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1292,7 +1292,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, b= ool iterable_only, } =20 if (iterable_only) { - return 0; + goto flush; } =20 vmdesc =3D qjson_new(); @@ -1353,6 +1353,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, b= ool iterable_only, } qjson_destroy(vmdesc); =20 +flush: qemu_fflush(f); return 0; } --=20 2.17.1 From nobody Mon May 6 06:34:40 2024 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=1562681511; cv=none; d=zoho.com; s=zohoarc; b=iZ/m5qvZ/zYM9jrw4p2wG+6uz+aRSNu1zCsyfDzrF1NzRptKJOKIXsOt5T7QEJ+SgDJ8CuK1br6Llv6TWlk4C1ukALsnDynAU/Te7N/dQ68DLI6hHHFPWcrbVyKih9QZ8p+nVyexhaWldmYZMKKmEAaOQ653O/VBHyDqNs+1leE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562681511; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3YqmoBtE/WqgHt+qrklqfoAI9L4XUDr0exmjRIYe38U=; b=k+L+JglKiKo65oiQuR/n01g5vU9378EU7JNJICKD8CP5mtjKqfrlwT1dqRVnN3E43/Zb/pxlJmkAIGbUYL6T4D03ThknmDos2qi44IuZOPIC1XOi0JOVIlStbg9GE4oWeL/6+axim+dHtlDt1o8taz1Pi0O08RcIY36DgP9AT6k= 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 1562681510987264.4712881170025; Tue, 9 Jul 2019 07:11:50 -0700 (PDT) Received: from localhost ([::1]:50330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqqP-0000BM-B7 for importer@patchew.org; Tue, 09 Jul 2019 10:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54515) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqoo-0007MU-Ol for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkqon-0008E7-GH for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:06 -0400 Received: from mga02.intel.com ([134.134.136.20]:42710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkqon-0008DN-8T for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:05 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 07:10:03 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga002.jf.intel.com with ESMTP; 09 Jul 2019 07:10:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,470,1557212400"; d="scan'208";a="176507530" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 22:09:23 +0800 Message-Id: <20190709140924.13291-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709140924.13291-1-richardw.yang@linux.intel.com> References: <20190709140924.13291-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 2/3] migration/savevm: split qemu_savevm_state_complete_precopy() into two parts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a preparation patch for further cleanup. No functional change, just wrap two major part of qemu_savevm_state_complete_precopy() into function. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 66 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index becedcc1c6..c41e13e322 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1246,23 +1246,12 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *= f) qemu_fflush(f); } =20 -int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, - bool inactivate_disks) +static +int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postc= opy, + bool iterable_only) { - QJSON *vmdesc; - int vmdesc_len; SaveStateEntry *se; int ret; - bool in_postcopy =3D migration_in_postcopy(); - Error *local_err =3D NULL; - - if (precopy_notify(PRECOPY_NOTIFY_COMPLETE, &local_err)) { - error_report_err(local_err); - } - - trace_savevm_state_complete_precopy(); - - cpu_synchronize_all_states(); =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || @@ -1291,9 +1280,18 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, = bool iterable_only, } } =20 - if (iterable_only) { - goto flush; - } + return 0; +} + +static +int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, + bool in_postcopy, + bool inactivate_disks) +{ + QJSON *vmdesc; + int vmdesc_len; + SaveStateEntry *se; + int ret; =20 vmdesc =3D qjson_new(); json_prop_int(vmdesc, "page_size", qemu_target_page_size()); @@ -1353,6 +1351,40 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, = bool iterable_only, } qjson_destroy(vmdesc); =20 + return 0; +} + +int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, + bool inactivate_disks) +{ + int ret; + Error *local_err =3D NULL; + bool in_postcopy =3D migration_in_postcopy(); + + if (precopy_notify(PRECOPY_NOTIFY_COMPLETE, &local_err)) { + error_report_err(local_err); + } + + trace_savevm_state_complete_precopy(); + + cpu_synchronize_all_states(); + + ret =3D qemu_savevm_state_complete_precopy_iterable(f, in_postcopy, + iterable_only); + if (ret) { + return ret; + } + + if (iterable_only) { + goto flush; + } + + ret =3D qemu_savevm_state_complete_precopy_non_iterable(f, in_postcopy, + inactivate_disks= ); + if (ret) { + return ret; + } + flush: qemu_fflush(f); return 0; --=20 2.17.1 From nobody Mon May 6 06:34:40 2024 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=1562681513; cv=none; d=zoho.com; s=zohoarc; b=UK8KOk0PyP6+uDS+O6NyS5FJk3QV57HppA2Ih51Mt0wyvfgXQXtbvyVrjgAFPSpOUllmoFDCboiq95THE2X8R+Wgb67G6qcQiVk/bzkPsEN4pkwJiTQbwJBfc6oIlIU0CGN7hKIogsKzE97iSVvTvFc0M0GpaTfL1lsrTxrQNUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562681513; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=H/N1F4n5SV+AjAmnqfEX68Gq3fxUyjQ286rIir9ckWk=; b=Bdnx3C1PtPUuGE4ZjeA/3CtH5CqTmx9gMC66p+8pwufgTBeK44TOJ5UOxscm2HwoUtUIe6MzUpzaS6r5PPrCsu7Tyx/MW4EsL/oO/4aewF2fjSRi8ZB36tdjLza+UW0RJfVm1Sx6yNYdP4ewKopa2nh30J1Ab4BwfiJ/zFzXg0g= 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 1562681513459195.45033608443043; Tue, 9 Jul 2019 07:11:53 -0700 (PDT) Received: from localhost ([::1]:50332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqqR-0000GH-HO for importer@patchew.org; Tue, 09 Jul 2019 10:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54522) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkqop-0007MV-BM for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkqoo-0008EN-0X for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:07 -0400 Received: from mga02.intel.com ([134.134.136.20]:42710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkqon-0008DN-Ni for qemu-devel@nongnu.org; Tue, 09 Jul 2019 10:10:05 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 07:10:04 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga002.jf.intel.com with ESMTP; 09 Jul 2019 07:10:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,470,1557212400"; d="scan'208";a="176507551" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 22:09:24 +0800 Message-Id: <20190709140924.13291-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190709140924.13291-1-richardw.yang@linux.intel.com> References: <20190709140924.13291-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 3/3] migration/savevm: move non SaveStateEntry condition check out of iteration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" in_postcopy and iterable_only are not SaveStateEntry specific, it would be more proper to check them out of iteration. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index c41e13e322..8a2ada529e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1247,8 +1247,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) } =20 static -int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postc= opy, - bool iterable_only) +int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postc= opy) { SaveStateEntry *se; int ret; @@ -1257,7 +1256,6 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUF= ile *f, bool in_postcopy, if (!se->ops || (in_postcopy && se->ops->has_postcopy && se->ops->has_postcopy(se->opaque)) || - (in_postcopy && !iterable_only) || !se->ops->save_live_complete_precopy) { continue; } @@ -1369,10 +1367,11 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f,= bool iterable_only, =20 cpu_synchronize_all_states(); =20 - ret =3D qemu_savevm_state_complete_precopy_iterable(f, in_postcopy, - iterable_only); - if (ret) { - return ret; + if (!in_postcopy || iterable_only) { + ret =3D qemu_savevm_state_complete_precopy_iterable(f, in_postcopy= ); + if (ret) { + return ret; + } } =20 if (iterable_only) { --=20 2.17.1