From nobody Mon Feb 9 11:51:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1655305102; cv=none; d=zohomail.com; s=zohoarc; b=n0nIL6Ehu+wOZ/8DUvwreN66QjcEB+6x2yJYuv/34BQF0ksDhhNBVpsSnZZOTMSCBPVZ6B0D8efifjxxf/BwpgHiTtSCOHgw+Qk4PvgqFOr2HxhwzvAsDMwaWXkhXb9HOM3nEDyiUgFPnWd0SM/j4Nlkv52BImgc+KOTexGEn5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655305102; 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; bh=cCVw1roIOvT9zJ6xa/6LWdkbmcnt8mrbADvUZWKRJcg=; b=C8pZfd9ceQGI0oL4DF7wELRWq/GTG8iDY7HXsq+3CQbI5wS3LpU+9Ydl1Qr3JIU8Mi7l/wed6uUV29GPZeJhRw7XYtWPLPZ+wNZFBmt5zSA53P8Smtb/JB3E4WbxXB+eclcrdfI8Jc8uvCp6Op+UY0PKF0UBjSJFbrTy16BbHis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655305102161200.76147322384406; Wed, 15 Jun 2022 07:58:22 -0700 (PDT) Received: from localhost ([::1]:40236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1UTN-0000al-4d for importer@patchew.org; Wed, 15 Jun 2022 10:58:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1UO4-00061u-DT for qemu-devel@nongnu.org; Wed, 15 Jun 2022 10:52:52 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:53752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1UO1-0000yI-PN for qemu-devel@nongnu.org; Wed, 15 Jun 2022 10:52:52 -0400 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25FDvkVW002771; Wed, 15 Jun 2022 14:52:33 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmjns8tjn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 14:52:33 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25FEQ6QV023072; Wed, 15 Jun 2022 14:52:32 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25vph1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 14:52:32 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 25FEqSMn018501; Wed, 15 Jun 2022 14:52:31 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25vpfm-4; Wed, 15 Jun 2022 14:52:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=cCVw1roIOvT9zJ6xa/6LWdkbmcnt8mrbADvUZWKRJcg=; b=Rif0i1sn+vyjJtKJheA6qgTzMNPfwnfbOKf9qOsNgXDsx9P4iooq5ONZiqtIKvfExuxk 3gqfSYC4GwYkUAFMvj2rqRAcbwQTxqRzfcW/8mfeX0At4TuXX+0d/WoA6oXa84Yh3Tds OUcAdtsb//b/2oBgk38DPiXD0OKfhnXm6XmvJmArO0U1180ApLBbbU1rcDTz85NdxTMr iQCfMZlXAtGrNMQBxbMlx7yJolMd+w5bu9gQIv/NVeuh+/R931lF7lf4cSJ773jtfc74 1/t8YnqRNhaWRAOyFTxQqGS13M8cS0VlG0eHosoCDZLIwXS7mdZn2SY54GhvwymAq+aX kA== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , "Daniel P. Berrange" , Juan Quintela , Markus Armbruster , Eric Blake , Jason Zeng , Zheng Chuan , Steve Sistare , Mark Kanda , Guoyi Tu , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov , David Hildenbrand , John Snow Subject: [PATCH V8 03/39] migration: simplify savevm Date: Wed, 15 Jun 2022 07:51:50 -0700 Message-Id: <1655304746-102776-4-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com> References: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-GUID: -FCh_8HyIZ5idAE1WPvHInjPyYdJ4IYp X-Proofpoint-ORIG-GUID: -FCh_8HyIZ5idAE1WPvHInjPyYdJ4IYp Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.220.177.32; envelope-from=steven.sistare@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1655305102686100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use qemu_file_open to simplify a few functions in savevm.c. No functional change. Signed-off-by: Steve Sistare Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Marc-Andr=C3=A9 Lureau --- migration/savevm.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index d907689..0b2c5cd 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2931,7 +2931,6 @@ void qmp_xen_save_devices_state(const char *filename,= bool has_live, bool live, Error **errp) { QEMUFile *f; - QIOChannelFile *ioc; int saved_vm_running; int ret; =20 @@ -2945,14 +2944,11 @@ void qmp_xen_save_devices_state(const char *filenam= e, bool has_live, bool live, vm_stop(RUN_STATE_SAVE_VM); global_state_store_running(); =20 - ioc =3D qio_channel_file_new_path(filename, O_WRONLY | O_CREAT | O_TRU= NC, - 0660, errp); - if (!ioc) { + f =3D qemu_fopen_file(filename, O_WRONLY | O_CREAT | O_TRUNC, 0660, + "migration-xen-save-state", errp); + if (!f) { goto the_end; } - qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state"); - f =3D qemu_fopen_channel_output(QIO_CHANNEL(ioc)); - object_unref(OBJECT(ioc)); ret =3D qemu_save_device_state(f); if (ret < 0 || qemu_fclose(f) < 0) { error_setg(errp, QERR_IO_ERROR); @@ -2981,7 +2977,6 @@ void qmp_xen_save_devices_state(const char *filename,= bool has_live, bool live, void qmp_xen_load_devices_state(const char *filename, Error **errp) { QEMUFile *f; - QIOChannelFile *ioc; int ret; =20 /* Guest must be paused before loading the device state; the RAM state @@ -2993,14 +2988,11 @@ void qmp_xen_load_devices_state(const char *filenam= e, Error **errp) } vm_stop(RUN_STATE_RESTORE_VM); =20 - ioc =3D qio_channel_file_new_path(filename, O_RDONLY | O_BINARY, 0, er= rp); - if (!ioc) { + f =3D qemu_fopen_file(filename, O_RDONLY | O_BINARY, 0, + "migration-xen-load-state", errp); + if (!f) { return; } - qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-load-state"); - f =3D qemu_fopen_channel_input(QIO_CHANNEL(ioc)); - object_unref(OBJECT(ioc)); - ret =3D qemu_loadvm_state(f); qemu_fclose(f); if (ret < 0) { --=20 1.8.3.1