From nobody Tue Sep 9 23:39:22 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=1738290728; cv=none; d=zohomail.com; s=zohoarc; b=J2tUgEpNVj1ZNh3ytS8MMOqYSLw6tyXbDpKR6UWk+0N3/D+5fKYFiLhx3AKYiS2+aES0iB0A2KA0ldlhI1k7rJJWnS6JR1PRNJFLjWWKW/0geTNd4Yx0tlODEcuY6gyliW4IBRPcir9DUNOfvLCz4PbSLt0fey6QW8hPT+6GlQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738290728; h=Content-Transfer-Encoding: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:Cc; bh=wNzQybQsHbUyQ+u1uskMYPdPyIrTE0lYc7PhlRgbi/I=; b=DZKmEeL9JQo2+6EK94lDkxtGOyHor6jAiyo0ZfclFK1zocL3f7O+bUUSZgDSddEwnM4T57ah6iRMEAwTW3f9DJBulweLgArmUEv+HDw2Tyuv4OGr3ux8G3ZvWASDJwBfc3ZZ368tKfp43sq+kzRa255WUZC0A2zQjfd1xbb30kY= 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 1738290728647322.00970684245056; Thu, 30 Jan 2025 18:32:08 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id ED8361D00; Thu, 30 Jan 2025 21:32:07 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D11411D20; Thu, 30 Jan 2025 21:31:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 19A8E1CD2; Thu, 30 Jan 2025 21:31:16 -0500 (EST) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 4C7071CCF for ; Thu, 30 Jan 2025 21:31:15 -0500 (EST) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5d3d14336f0so2242178a12.3 for ; Thu, 30 Jan 2025 18:31:15 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21de31f5a60sm20415385ad.61.2025.01.30.18.31.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jan 2025 18:31: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_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=1738290674; x=1738895474; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ol2IacikHWZQwFx7f8//3jPXZ9ImuW0G1h2PSIlo/jk=; b=HTYxOjLhHGMP8eLl3ufJ/c4g87y7MqU8mf1bn9+abO9dJQNc9NlHJfJuIekhRxfqXe EL5C4gqkM7KAMMp4vrDk+yIsf7WeYZBvCtVlpfUulN02zfJ2YjAyoj8+hjOVy2t5tesI 0cEgTpwYz4vEjK95uSoZJ61ayBEHLEHnE+THbCRGOr8yzy3AydvLFOBH0dzMJbEsz7Ti 776+peOVtkH5Md5xxuz1j4C4s4jD3pjEFw6HvH2iXBnGlHVT/H4Fj3i7TdyLe3d1OHm+ GKyc+JL+EMb92o74kSFebbC1cDsmkW2wuuICdt6zCdw1v2Eus1c7QRXtviD7+SxpDkHF Zarw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738290674; x=1738895474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ol2IacikHWZQwFx7f8//3jPXZ9ImuW0G1h2PSIlo/jk=; b=qsXjDTHqYwyMWa+OUVILYR45v4Jfw2wqdYGoYOxtLuTG+S+JC1ub1s1ilsZHvVUED5 Vl6ojEAk5jFanjmTTGK99AVMuDJncnjkjWvwkXpojPRsyFmwixXmekjoCLs1IeItKCU/ 7w6/rmf83RQkNWiEr5ZpCdvlnJlU2s+7I+fmrMWvGN0AJhiNQEpDeQOpBKO/TBdb/1MK Vh2UGod/BTo6Gf6Y8l3342o6qhPb9TCNBCrnA8PbIqtnZPHpyyhAJVdmLDUo1KDzYbDD e6mEwnAnp5fEzwHVwfCNjWvGP//sUcj3pXL+EXzu/GotjYPz0L6H0UWtIAsV1NrC6gI3 y6aw== X-Gm-Message-State: AOJu0YyRJOjLE11svaQqpttXP78jNIJwuNlKZxcG1yDjV8thzZ7KnlBx Hsmy4XY6gH56ERwNYP8JId5iqGPisV9YdUTq1LT301ocUWor8a+GecpN3tH4p0NiA5C1ktC/gQE 4 X-Gm-Gg: ASbGncs20qGp3jPgYzUbZUVUOrlSfems6lA24N+Ht3yPbBP5qb8qZ9mvg9ZhjWBli48 WszV+qf4wvTfPYEuJV3FjHVLAMNy8zArmuUgV/FvgyOgSYrsrRjYFo9urdzdSIPiTaZJtWSa79M suci0TQ7Oh9aOV3tqkJeTL/+5crPtZcW/0CmgQXwIhsB5FQWKaVfNqtTYqOgprk+3WDjAXiYMab TeLyi31W1aPepG5sNQfCn/wMW+2PiLY6y75llpjUb1i3yj27amAHmXlQp7lgWIsqHZnSUbWnjc8 Eh/fSHOweeijdRdGZ+WY/XqHvTuR6z0T/A== X-Google-Smtp-Source: AGHT+IGMECMR0pzeeQvg4VdmphXGiMcOS1e5SjGj4exBBahAzy1it0PFrDrH2yfxokMJFpTRAyY38w== X-Received: by 2002:a17:907:9726:b0:ab6:cdc4:e825 with SMTP id a640c23a62f3a-ab6cfda40e6mr913949366b.40.1738290674115; Thu, 30 Jan 2025 18:31:14 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 1/3] qemu: Move unlinking corrupt save image file to caller Date: Thu, 30 Jan 2025 19:29:02 -0700 Message-ID: <20250131023110.20024-2-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250131023110.20024-1-jfehlig@suse.com> References: <20250131023110.20024-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CMVX6HTTWBV5XZBOKATKXUP533ZKHLZ5 X-Message-ID-Hash: CMVX6HTTWBV5XZBOKATKXUP533ZKHLZ5 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 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: 1738290730121019000 Content-Type: text/plain; charset="utf-8" qemuDomainObjRestore is the only caller of qemuSaveImageOpen that requests an unlink of a corrupted save image. Provide a function to check for a corrupt image and move unlinking it to qemuDomainObjRestore. Signed-off-by: Jim Fehlig --- src/qemu/qemu_driver.c | 23 ++++++++++----- src/qemu/qemu_saveimage.c | 59 +++++++++++++++++++++------------------ src/qemu/qemu_saveimage.h | 8 ++++-- src/qemu/qemu_snapshot.c | 3 +- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index da714f1975..2e80ce7921 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5777,7 +5777,7 @@ qemuDomainRestoreInternal(virConnectPtr conn, =20 fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) !=3D 0, - &wrapperFd, false, false); + &wrapperFd, false); if (fd < 0) goto cleanup; =20 @@ -5912,7 +5912,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, con= st char *path, virCheckFlags(VIR_DOMAIN_SAVE_IMAGE_XML_SECURE, NULL); =20 fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, - false, NULL, false, false); + false, NULL, false); =20 if (fd < 0) goto cleanup; @@ -5949,7 +5949,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, cons= t char *path, state =3D 0; =20 fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, - false, NULL, true, false); + false, NULL, true); =20 if (fd < 0) goto cleanup; @@ -6030,7 +6030,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) } =20 if ((fd =3D qemuSaveImageOpen(driver, priv->qemuCaps, path, &def, &dat= a, - false, NULL, false, false)) < 0) + false, NULL, false)) < 0) goto cleanup; =20 ret =3D qemuDomainDefFormatXML(driver, priv->qemuCaps, def, flags); @@ -6094,10 +6094,19 @@ qemuDomainObjRestore(virConnectPtr conn, virFileWrapperFd *wrapperFd =3D NULL; =20 fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, - bypass_cache, &wrapperFd, false, true); + bypass_cache, &wrapperFd, false); if (fd < 0) { - if (fd =3D=3D -3) - ret =3D 1; + if (qemuSaveImageIsCorrupt(driver, path)) { + if (unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %1$s"), + path); + ret =3D -1; + } else { + virResetLastError(); + ret =3D 1; + } + } goto cleanup; } =20 diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 69617e07eb..385ac8a649 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -520,6 +520,35 @@ qemuSaveImageGetCompressionProgram(const char *imageFo= rmat, return -1; } =20 +/** + * qemuSaveImageIsCorrupt: + * @driver: qemu driver data + * @path: path of the save image + * + * Returns true if the save image file identified by @path does not exist = or + * has a corrupt header. Returns false otherwise. + */ + +bool +qemuSaveImageIsCorrupt(virQEMUDriver *driver, const char *path) +{ + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOCLOSE fd =3D -1; + virQEMUSaveHeader header; + + if ((fd =3D qemuDomainOpenFile(cfg, NULL, path, O_RDONLY, NULL)) < 0) + return true; + + if (saferead(fd, &header, sizeof(header)) !=3D sizeof(header)) + return true; + + if (memcmp(header.magic, QEMU_SAVE_MAGIC, sizeof(header.magic)) !=3D 0= || + memcmp(header.magic, QEMU_SAVE_PARTIAL, sizeof(header.magic)) =3D= =3D 0) + return true; + + return false; +} + =20 /** * qemuSaveImageOpen: @@ -531,11 +560,10 @@ qemuSaveImageGetCompressionProgram(const char *imageF= ormat, * @bypass_cache: bypass cache when opening the file * @wrapperFd: returns the file wrapper structure * @open_write: open the file for writing (for updates) - * @unlink_corrupt: remove the image file if it is corrupted * * Returns the opened fd of the save image file and fills the appropriate = fields - * on success. On error returns -1 on most failures, -3 if corrupt image w= as - * unlinked (no error raised). + * on success. On error returns -1 on most failures, -3 if a corrupt image= was + * detected. */ int qemuSaveImageOpen(virQEMUDriver *driver, @@ -545,8 +573,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, virQEMUSaveData **ret_data, bool bypass_cache, virFileWrapperFd **wrapperFd, - bool open_write, - bool unlink_corrupt) + bool open_write) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); VIR_AUTOCLOSE fd =3D -1; @@ -580,17 +607,6 @@ qemuSaveImageOpen(virQEMUDriver *driver, =20 header =3D &data->header; if (saferead(fd, header, sizeof(*header)) !=3D sizeof(*header)) { - if (unlink_corrupt) { - if (unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %1$s"), - path); - return -1; - } else { - return -3; - } - } - virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to read qemu header")); return -1; @@ -598,17 +614,6 @@ qemuSaveImageOpen(virQEMUDriver *driver, =20 if (memcmp(header->magic, QEMU_SAVE_MAGIC, sizeof(header->magic)) !=3D= 0) { if (memcmp(header->magic, QEMU_SAVE_PARTIAL, sizeof(header->magic)= ) =3D=3D 0) { - if (unlink_corrupt) { - if (unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %1= $s"), - path); - return -1; - } else { - return -3; - } - } - virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("save image is incomplete")); return -1; diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 0e58dd14b6..dc49f8463f 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -69,6 +69,11 @@ qemuSaveImageStartVM(virConnectPtr conn, virDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6); =20 +bool +qemuSaveImageIsCorrupt(virQEMUDriver *driver, + const char *path) + ATTRIBUTE_NONNULL(2); + int qemuSaveImageOpen(virQEMUDriver *driver, virQEMUCaps *qemuCaps, @@ -77,8 +82,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, virQEMUSaveData **ret_data, bool bypass_cache, virFileWrapperFd **wrapperFd, - bool open_write, - bool unlink_corrupt) + bool open_write) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); =20 int diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5273348aeb..b9c3983472 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2379,8 +2379,7 @@ qemuSnapshotRevertExternalPrepare(virDomainObj *vm, memdata->path =3D snapdef->memorysnapshotfile; memdata->fd =3D qemuSaveImageOpen(driver, NULL, memdata->path, &savedef, &memdata->data, - false, NULL, - false, false); + false, NULL, false); =20 if (memdata->fd < 0) return -1; --=20 2.43.0