From nobody Wed Mar 12 17:59:21 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=1741215239; cv=none; d=zohomail.com; s=zohoarc; b=LkKObwXp0a602k3eU7HEXShdhtU3iEVrB+OzqWZjadch6Q3BABHpc8bUINtfmXB23hKcaER+synl/xm9RGvAYhEdaXvtt7/An+LO4Wh1eLpRgQDQm2gcxkMguR3KY+ar3w58JdZExjgtql3qSBbywy/zg7K39QNIDWZAlHEg3rE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741215239; 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=9JdJsHD4aLkRxhKM2tzasji0EgACov5AcQoixD5JJio=; b=G7gjvcc2X+YgLB1W0UCoWYkYEj6LAOqHhD8kwsfPg8WGD+nQQrnDXuK3USrMobOKq9KPpSg6BjpOgYIJeZtpz43XekUc5BqruKHrujXhwhjDJRy4NQnFT0OBw4hHr7RCscGqb2pYRGrsXyBMSRduAPhXNXNvvY2U+GUboxNAnBI= 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 1741215239226476.28610292994233; Wed, 5 Mar 2025 14:53:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 989A21605; Wed, 5 Mar 2025 17:53:58 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 565FC1561; Wed, 5 Mar 2025 17:50:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6B8C21526; Wed, 5 Mar 2025 17:50:38 -0500 (EST) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 605DD1526 for ; Wed, 5 Mar 2025 17:50:15 -0500 (EST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aaec61d0f65so10020666b.1 for ; Wed, 05 Mar 2025 14:50:15 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2ff4e773693sm1874838a91.14.2025.03.05.14.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 14:50:13 -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_H3, RCVD_IN_MSPIKE_WL,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=1741215014; x=1741819814; 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=Dn5U5pKSkIQIae1N9FSU+zw0xydbcPuMiofaZ8s/Kdg=; b=UXbeUnZMri/SuBz68CBkzizs/wZL+02pxSZgCKM7BOvB2SZAlxbpfmE8ogYh4vyEpy e79exjezyKO9A1GlL6x48mpswOpM1T6X50kkzioDlZGP/bPxd8lv5uGyta0xjAIfJ7p3 zDHH0JehtkNaYIj+5tpgAXR3Him//a/cZ2v+Z+zgOBahnCByIWj5WTp37uatcMk7ZruB botE5ou+17X7pRvn0Ox4q+9hU/bh/mNRmTh2KIRrp8TgVCW3Tgiv98szxjTI92nSgsSm tX2udxRGyp9py/M94/d9vPYhfqdhqpibmO5r6HK0Z8c7f37UwvST0+Y+WPAgE8zaSuON Rr+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215014; x=1741819814; 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=Dn5U5pKSkIQIae1N9FSU+zw0xydbcPuMiofaZ8s/Kdg=; b=KcQikerInpQNfMS6HpkRwtkXEMYQHnvUbkewI3J2Z9lBXDE2uHtDUVdGuSqegbamAf I80vzShA3EhaJrTrAI3V8nz7CT41vSPPdb4BuhLYsw8VzoVK8OgsGfICPge4/ZiupZXq dcGEoaED1SYozp+ET1Y8q3EAMFL+RsCUlHNIQydmDNra/h5p3qZLNFX5DIy8otpvgwDf kIbcWV6gqBq8Ko75ZJPi292+H+YvN/e390wpCS/Kw+Ot3pji9UZxhIAxou+pGnkH7zgw X3xPZDzuLwmZJhmucgey7L1FA14uSCk7wt92uMXCvD/mJBS/Y423dPN2DLuPJK0s9EKN fWyg== X-Gm-Message-State: AOJu0YwN02zBfTft/RN87AV1lfkLYYc1YYzxF2NKCDI4A2I9kj1kk9ST Fyj7UtnYyWVaID4vb4hDVP12eYlx6mSUji7y0usBX7tAbgGYk5YrtCM7c8/O+rbprasWqtzB/2l V X-Gm-Gg: ASbGnctg1F5WFas9G1jGNjh2K7jDZv9Pz1LC1J4V7hcGkBWQ9wADCLZSIKAA00q94YT mAbqL+uyN1SFBPXOV+WnW8lo0dY8m9bfFYSsIIeRYf9NC5An0KHVjIIK6eCvSzkt3nTeC3E7lkE Wrl4oGcGXxSn0ZEw1QXbINbg6I5HazNJ4XCApaVsRp5dXkGzDFPCuYEu2//IVBTmJ22R/k/6GsH lxYa+eoCi73Aad9IGo4owlo3NRNFGyBGJG+PK0H4haKtvdx4qhE5WS/klVBVScL/O3MwCD+xJzR kJk/Y4HW5Ll0C45c3cyvIY7InvM0zMbM2TO4Pf9AzPdfGi71RUaTyqYIySnu1oE= X-Google-Smtp-Source: AGHT+IH3dl/amA73LuR4ZbExfxDpJJrdiJBEXwTUfFpv6IQlyjAS0p7A5zVkTw4p/dbP7P1x6fgvSg== X-Received: by 2002:a17:907:944b:b0:ac1:f19a:c0b8 with SMTP id a640c23a62f3a-ac20d911f1cmr522118966b.24.1741215014177; Wed, 05 Mar 2025 14:50:14 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V4 08/18] qemu: Add helper function for creating save image fd Date: Wed, 5 Mar 2025 15:48:17 -0700 Message-ID: <20250305224957.5369-9-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305224957.5369-1-jfehlig@suse.com> References: <20250305224957.5369-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SHWLCEFWTDLEJSRFITDILF4VPTLE5RI6 X-Message-ID-Hash: SHWLCEFWTDLEJSRFITDILF4VPTLE5RI6 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: 1741215241151019000 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 29b4e39879..e3f6a0ad0f 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -425,6 +425,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 */ @@ -441,33 +485,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