From nobody Tue Sep 9 23:56:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1737588389; cv=none; d=zohomail.com; s=zohoarc; b=RWoK+ZNIJpCXPxbwozYN8utjYWV+nRdjt44vqTmiFOIkckZRjGLGIb8ScMExEMkrugRf3dmJBaC7Xe2TA65DUWUGs4GEOR4eTMxlBDs/0iodSVVU8p1wTFwUoetSJVDCgIFLhsfCPjoup33q0v5kLAu6WzX+0YzoryzTTBt+n3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737588389; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=x3E/OlaDyLHdc/SlzSa2ffd0Nq8r6IRMhF5efLeIRN8=; b=nzEaI8PE2yR/mZjYsBkzWzDRYCgD59lhs8JBoWIIyHkhuC5GHUl0pPssDvWb5pY7GZJUDbPjmI4/WbCz7B2D0lBPUakU0Iu540WLw8a+mAYnj5URbxED8d4jVgb0Nz2UwIcqRjeSCC5zHJm04tsFCQJGRSaQ2SZrZyn3vIbdNnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1737588389746541.5570948176357; Wed, 22 Jan 2025 15:26:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 21F9E1354; Wed, 22 Jan 2025 18:26:29 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7093313CB; Wed, 22 Jan 2025 18:23:08 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A259131A; Wed, 22 Jan 2025 18:23:02 -0500 (EST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1CA00138F for ; Wed, 22 Jan 2025 18:22:46 -0500 (EST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3862ca8e0bbso215412f8f.0 for ; Wed, 22 Jan 2025 15:22:46 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3d7b0esm101268355ad.162.2025.01.22.15.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 15:22:44 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1737588165; x=1738192965; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sY2gUZMzogCtmcHJALvHGyD1TbymR6SMKOX+oh5HAJY=; b=es9SXWNE3WcFznCCzbhFwuRrAAQS7lr5hXUFv5bKmdIfk4PZpbMA4VId7IQ3LL7pDe Ize7oMlTD0QXUnNtLaJC9cV545mfa7MuUV5PvfgboI90vQChRNSsZbr7EwrH/VaCEXvC +fjZh4WD7AE5VBQb4gOYTsogR6RF18lpFXsMQKeR72mNZ0kR0CWS15rsx+MkxdtKikPn ur/zCraUwHciNrnr7it/GjSt6qf3C8bPybQTcPFx//r354EFj5kYIY1e1/Bsl92rfA4m Humt7CigleP5LcERWsNe62Pmy2fAUWNz/+NtCb7XSTnIS7A10VveRGaAmpTM3d00rmuP YcCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737588165; x=1738192965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sY2gUZMzogCtmcHJALvHGyD1TbymR6SMKOX+oh5HAJY=; b=T25mjCFeOQ5tRCGLZ7IYh0c6WDghUlVjzdoJQRJprFyWd1uECcfdCJzOkC0F2zrMUs s0leLS9vTUjfoqzMa0nlLJ2MLd1d9YoDQ2S61BwDr7DX6Z6yUldR0eanEWs6Fpudziwt wGLQIJIVoQCXnjwP/bX8FenfpEY4HkAXtE5aFCodNi13fRtM7qtwVcOKUp2na85sFcUs +gq1sGp6c8PrKXRAmglyjpUF2mWfSBLdSNvUWSQkKan7F03qiauMTWKnnAL4aWEDqYmK V3/xTgTdn4g/ssPPZC2KN6S85gXzUacmndH1HzgF6Kz3SEyIgkANAXlhyu5Mym/QuUUB WY7g== X-Gm-Message-State: AOJu0Yw/TIE12NGJnEO+qQa33QfleyTH7rnHVNHL492g65Ixpe8Tsu7I 8uzCrXA+/LNXne0lz15svyOU3YeJ5YRUdgRzVaMM87mRymipi0n4MNfOZvDkjO9xSs3PIpsI2Ru f X-Gm-Gg: ASbGnct3qLLrCYSvLSJKKKBpPSdUIGUZMsRfHyNpzRQ3iEdCyA+cIU5QOpRofZCwp71 ChAb9evIkBNgtxiqjwrjikIKst3JEzUCyxLTe6GDrNG2mlS6TVj3t1Q4JtpY+vAtZDOmVvKGq5n lVE8F8KJKKEGfUkWJrGlFYvDC8q5MNVqWOFJG9G7l4UvEKuK2yRemkCnJRYgtoP+T9uXsWvB8md DnrwvDjO3GOaJZ4CwSLDCW/x3gKTwIxYhwqHi1M/TfJ2wd1h2pxBnoUPaQJ3KvN6t16nWxv0PWi +KwK11Uuzn3F X-Google-Smtp-Source: AGHT+IFwCX4IrIIsqj1WhSsNw2kleHCCfGrD04i/x7JIx9hsBZzqOh2BeQY7tn2DOd0tTFFYGSefyw== X-Received: by 2002:a5d:47c2:0:b0:38a:888c:7df0 with SMTP id ffacd0b85a97d-38bf56494e9mr22348580f8f.1.1737588164849; Wed, 22 Jan 2025 15:22:44 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 08/20] qemu: Add helper function for creating save image fd Date: Wed, 22 Jan 2025 16:16:42 -0700 Message-ID: <20250122232228.19306-9-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250122232228.19306-1-jfehlig@suse.com> References: <20250122232228.19306-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FLZZWOYJBZSCDBR3EA3MLLCYLQWCZBM5 X-Message-ID-Hash: FLZZWOYJBZSCDBR3EA3MLLCYLQWCZBM5 X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: farosas@suse.de X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737588390944019000 Content-Type: text/plain; charset="utf-8" Move the code in qemuSaveImageCreate that opens, labels, and wraps the save image fd to a helper function, providing more flexibility for upcoming mapped-ram support. Signed-off-by: Jim Fehlig --- src/qemu/qemu_saveimage.c | 65 +++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index ff5b9e72eb..65464fd1e1 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -361,6 +361,50 @@ qemuSaveImageDecompressionStop(virCommand *cmd, } =20 =20 +static int +qemuSaveImageCreateFd(virQEMUDriver *driver, + virDomainObj *vm, + const char *path, + virFileWrapperFd *wrapperFd, + bool *needUnlink, + unsigned int flags) +{ + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + int ret =3D -1; + VIR_AUTOCLOSE fd =3D -1; + int directFlag =3D 0; + unsigned int wrapperFlags =3D VIR_FILE_WRAPPER_NON_BLOCKING; + + if (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) { + wrapperFlags |=3D VIR_FILE_WRAPPER_BYPASS_CACHE; + directFlag =3D virFileDirectFdFlag(); + if (directFlag < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("bypass cache unsupported by this system")); + return -1; + } + } + + fd =3D virQEMUFileOpenAs(cfg->user, cfg->group, false, path, + O_WRONLY | O_TRUNC | O_CREAT | directFlag, + needUnlink); + + if (fd < 0) + return -1; + + if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) + return -1; + + if (!(wrapperFd =3D virFileWrapperFdNew(&fd, path, wrapperFlags))) + return -1; + + ret =3D fd; + fd =3D -1; + + return ret; +} + + /* Helper function to execute a migration to file with a correct save head= er * the caller needs to make sure that the processors are stopped and do al= l other * actions besides saving memory */ @@ -377,33 +421,14 @@ qemuSaveImageCreate(virQEMUDriver *driver, bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; - int directFlag =3D 0; virFileWrapperFd *wrapperFd =3D NULL; - unsigned int wrapperFlags =3D VIR_FILE_WRAPPER_NON_BLOCKING; =20 /* Obtain the file handle. */ - if ((flags & VIR_DOMAIN_SAVE_BYPASS_CACHE)) { - wrapperFlags |=3D VIR_FILE_WRAPPER_BYPASS_CACHE; - directFlag =3D virFileDirectFdFlag(); - if (directFlag < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("bypass cache unsupported by this system")); - goto cleanup; - } - } + fd =3D qemuSaveImageCreateFd(driver, vm, path, wrapperFd, &needUnlink,= flags); =20 - fd =3D virQEMUFileOpenAs(cfg->user, cfg->group, false, path, - O_WRONLY | O_TRUNC | O_CREAT | directFlag, - &needUnlink); if (fd < 0) goto cleanup; =20 - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) - goto cleanup; - - if (!(wrapperFd =3D virFileWrapperFdNew(&fd, path, wrapperFlags))) - goto cleanup; - if (virQEMUSaveDataWrite(data, fd, path) < 0) goto cleanup; =20 --=20 2.43.0