From nobody Fri Dec 19 20:16:35 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=1738953680; cv=none; d=zohomail.com; s=zohoarc; b=naUHHwy3BUDMFv1NjhdUCIobnftHjL5DR2Oi2cN6QPoMP1ETEOvKTd9YFYgVA96El2fa+JvIf2UpEvrM78YMnN70lYV37114bxB61+kb/wzSph0khQS73FJUXo3lcgP+wvssxSufZRqWlvjD5XO029liJEzvN+EoiL/vuwey76E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738953680; 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=KVzOjUZTwqNB+IMRtWItBaHG7xaPuQpH0vKogDhpEvo=; b=GJiZUVkGIo6fKgUOTJew0d1JHcbAOpkreTRukAdh+NT3eky6yBYrKl4Aspkxrye5Kmc3iOY1vpDyBlFbujXaoA9huqXy1cOkvyBSEBL8wwWIASWDnMKiowiL2t0cUYYpHn2HSaLreiq8JihzftfyWI/yTPiSKTpUlnTioLKQe5o= 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 1738953680080538.118289350892; Fri, 7 Feb 2025 10:41:20 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 08D8E15C5; Fri, 7 Feb 2025 13:41:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6B4D71601; Fri, 7 Feb 2025 13:38:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0EBF1152F; Fri, 7 Feb 2025 13:38:09 -0500 (EST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 C1DD215D3 for ; Fri, 7 Feb 2025 13:37:51 -0500 (EST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4363dc916ceso21413925e9.0 for ; Fri, 07 Feb 2025 10:37:51 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fa09b5c692sm3709323a91.42.2025.02.07.10.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 10:37:50 -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=1738953470; x=1739558270; 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=qnKuj9xCChcznLnTdljfYgReIkKHN51FLYM4HfI4yJ8=; b=VuiJtKy9TibMXqICmNeL8I93w8LN9en59g1PeJ3jCZIXr3zzUSEbgno3gWmt6SB7+E 4NrTlqT9Y0/PerA5bBsvhbSmXPkKhq3nhrRO3KDcmbeOJkiJ6pQPphYEG2HD+HRQnCEb DbDEAyJih5LoFfaZwgmw6df9vyfLZJ/f53YoDQoRU2F+VQJJCWpthT9qgnD/rRYi+FWk /Yn0nOeIvykiKdinClIvsE7UGtgmy8zQZh1/d5JDRbTLTbS8Pdymz4Ohu/n/f7OoBMOP oXueGRIAkXWOzHVZIISXLKzYoaXJRotw8bsahFUoQD0Gkn1Tgf+pM/lwqgDQ4PzA9V9i GquA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738953470; x=1739558270; 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=qnKuj9xCChcznLnTdljfYgReIkKHN51FLYM4HfI4yJ8=; b=RzweVwo+G1gls6i0heV9seSrREyz7vNMwrvIptAYKMjUH0kxIz3uBQZJ5Ygb4kH1DL fa8n6EMdMngTCAMDvTLD1Yf7mJsJ1OaxkVK5FAwPxuJ5UryAlWdlMo+g1gtirAFDz73s IhNOwmG+WnXpEiVuH7qXWjlbUdIdDrGykUtEwZ+OsEIpNpNeGTnDjIy9lrqNV0qX7CwL Wk1J0RRwXHDvTiLYuRPYBY9UzQa8wIIx1CnLws306GZZibst11bP54HLUkfoMTUTZcsA swM+3jGXHF3XsfC+9R4kDo6CQEc1TikNowYLaHCxrHWwE6O6JOZF/iOMLIZDaW2eHJla vQxg== X-Gm-Message-State: AOJu0YyLWNRv0FS9ODMFBp7ffKOJlStnutXphoHFN8H4Ub7qFWJmVApn pfVfsKzXLe6DZyVvcr/wQhvyEUl3R0Y/3Uk6AJOUjJjY9VTj2hFRnszmfT1QrL5y6d7LfzJh3Mx i X-Gm-Gg: ASbGncvlnYEXptZDXFndebCL+/XbBjbbNs1kgkVi8pElczITCgS/UxKgXtFuoOiSCU7 s7LtclppmHQGN5y8pBG10AgBnBIQmAuyloJWviUjuqnsVCVUHpyXCHY9kvpry8imQPm1LqIYHaA izZAAdqKetwkbnJoyJfw2Okr+CIBR1Np0rWbSamdiSxrrrzfnIXKq6lXo2e9p+NUFsAEkOSUAXs 505aF0IoEwrRS8gcKMtsRyXL89OEEIczqLYND1hvCVIMGT2eJbQpcHDbtzhAWx+fNtL8/srRlip /6iLAWz8g3FLpqBzvF6xaQb9TWOWhQ5uNQ== X-Google-Smtp-Source: AGHT+IEM7hoCEnQvLPO9oE+JbIHrlT8Lj1KCxkrH7wfOnC6CO6eWPRDJnVm42KUdE0vxxjDpKJVaBw== X-Received: by 2002:a05:6000:188b:b0:38d:b7dc:30b8 with SMTP id ffacd0b85a97d-38dbb2cf5b8mr7157803f8f.18.1738953470615; Fri, 07 Feb 2025 10:37:50 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V3 08/19] qemu: Add helper function for creating save image fd Date: Fri, 7 Feb 2025 11:27:19 -0700 Message-ID: <20250207183730.21686-9-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207183730.21686-1-jfehlig@suse.com> References: <20250207183730.21686-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LPB7DI2ZRDY2AJ3PZMG5V2FWWCY332F5 X-Message-ID-Hash: LPB7DI2ZRDY2AJ3PZMG5V2FWWCY332F5 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: 1738953681235019100 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 6888528729..4304530610 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -445,6 +445,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 */ @@ -461,33 +505,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