From nobody Fri Dec 12 14:07:31 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=1765273881; cv=none; d=zohomail.com; s=zohoarc; b=iKt4LOpwUggJWYEWFYW2QqeyMsHeaFR0+ypBVz++eXn0FymPs27xZAyN2hUTHvgDExnUbQjRXCEFQtaAA24dH9fVeNWP03i9jEiCZrU/fw1Vw21+BRcpW2FQA/tJzYmhklRd7/lyizFblhWKx6uZhI5niZhnejxeJKKtd/R3LtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765273881; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner: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=H0G2qdARsuAduSD6i+V2sLffa8BsKm1EfoyRGT3gW5s=; b=ZoUR7g5OFAryRJhUsMKoSLR69b75yo7jCVwzS1nYl6t4BHUMtU15yf0YGgf2F9lvvXWA7zqBZ5Lg0sMAhttNdIpoU3JTD8FWPM4+1Imxosw8ThwL97J2dY2SDQnhhXcfk4f21ZN2uBP62hbk1J0mLj5+kvyXuX3zWNHFICQoyaw= 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 1765273881392820.2286311012091; Tue, 9 Dec 2025 01:51:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 69C3D43DBA; Tue, 9 Dec 2025 04:50:17 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8B14743E40; Tue, 9 Dec 2025 04:47:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A8FB741A1D; Tue, 9 Dec 2025 04:46:19 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E10B241A28 for ; Tue, 9 Dec 2025 04:46:18 -0500 (EST) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-R0puh-k-OBugofhq3aghXg-1; Tue, 09 Dec 2025 04:46:16 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27E3A195609E for ; Tue, 9 Dec 2025 09:46:16 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70B191956095 for ; Tue, 9 Dec 2025 09:46:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765273578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H0G2qdARsuAduSD6i+V2sLffa8BsKm1EfoyRGT3gW5s=; b=iCPN3Jxd4JNJFCf9dkXRdWrSq8gkWoSifnC7AoBoUYb1otYHCE6TMyPSazpXvsfXbg9ra5 f8n3xzMB4EtPbqM2aDaLoJL2HSDK2HsNeD4CMuQmaYjZYDjMJGRHczHvuCW936MWyvWhTP 8XTsP2YUwGLYyuJJeE0qi+21miYO+sc= X-MC-Unique: R0puh-k-OBugofhq3aghXg-1 X-Mimecast-MFC-AGG-ID: R0puh-k-OBugofhq3aghXg_1765273576 To: devel@lists.libvirt.org Subject: [PATCH 4/9] qemu: Use 'virQEMUSaveFormat' type everywhere except qemu_conf Date: Tue, 9 Dec 2025 10:46:04 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 0MgOpax-8Vvs6jzArXw-7sWBep1cuJFWc_gWeoB5-rw_1765273576 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: B6NNY34LHB5AGRYI2EQCJFPVRFV5Q6YS X-Message-ID-Hash: B6NNY34LHB5AGRYI2EQCJFPVRFV5Q6YS X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1765273883197158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Convert all code refering to the save image type to use the proper enum value. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 18 ++++++++++++------ src/qemu/qemu_saveimage.c | 4 ++-- src/qemu/qemu_saveimage.h | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f2e024dae3..d88c0833ad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2583,7 +2583,7 @@ static int qemuDomainSaveInternal(virQEMUDriver *driver, virDomainObj *vm, const char *path, - int format, + virQEMUSaveFormat format, virCommand *compressor, const char *xmlin, virTypedParameterPtr params, @@ -2823,7 +2823,7 @@ qemuDomainSaveParams(virDomainPtr dom, const char *to =3D NULL; const char *dxml =3D NULL; const char *formatstr =3D NULL; - int format =3D cfg->saveImageFormat; + virQEMUSaveFormat format =3D cfg->saveImageFormat; int ret =3D -1; virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -2863,10 +2863,16 @@ qemuDomainSaveParams(virDomainPtr dom, return qemuDomainManagedSaveHelper(driver, vm, dxml, flags); } - if (formatstr && (format =3D qemuSaveFormatTypeFromString(formatstr)) = < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Invalid image_format '%1$s'"), formatstr); - goto cleanup; + if (formatstr) { + int formatVal; + + if ((formatVal =3D qemuSaveFormatTypeFromString(formatstr)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid image_format '%1$s'"), formatstr); + goto cleanup; + } + + format =3D formatVal; } if (qemuSaveImageGetCompressionProgram(format, &compressor, "save") < = 0) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 145a0f4832..48f8220dee 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -79,7 +79,7 @@ virQEMUSaveData * virQEMUSaveDataNew(char *domXML, qemuDomainSaveCookie *cookieObj, bool running, - int format, + virQEMUSaveFormat format, virDomainXMLOption *xmlopt) { virQEMUSaveData *data =3D NULL; @@ -551,7 +551,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, * Returns -1 on failure, 0 on success. */ int -qemuSaveImageGetCompressionProgram(int format, +qemuSaveImageGetCompressionProgram(virQEMUSaveFormat format, virCommand **compressor, const char *styleFormat) { diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 15b73eb395..0a22ee5f05 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -114,7 +114,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); int -qemuSaveImageGetCompressionProgram(int format, +qemuSaveImageGetCompressionProgram(virQEMUSaveFormat format, virCommand **compressor, const char *styleFormat) ATTRIBUTE_NONNULL(2); @@ -153,7 +153,7 @@ virQEMUSaveData * virQEMUSaveDataNew(char *domXML, qemuDomainSaveCookie *cookieObj, bool running, - int format, + virQEMUSaveFormat format, virDomainXMLOption *xmlopt); void --=20 2.52.0