From nobody Fri Dec 19 20:46:07 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=1740097586; cv=none; d=zohomail.com; s=zohoarc; b=EssNVtTe8ypG7OlfRGM+GegdALAXGERd/5VdAag7IRi7JNHcILXTY0J7u5HAxbkpUhs2FGPCFqh5gC33em15UtujG7e9kl+6bMhcSQYlxLhmBZ9nhaDyHDR40XP+99CFghIF/Gg4QI7y3s2iwQ1QlVpN0LBOuDeQpN5E+7rf/mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740097586; 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=qqrl3490CG7NW2f6bcq4HAlaMGxaKbQWuOhZFjM2pqg=; b=WHoO/Mx3m3q1WP1EK7vKC1syG+LbhKWk2Y/atQJVVLpn3mDS6PXstTSnJ4NpZapUQUC4buVDi8fuMjk4Y4NUvLJjpM/HZDMaSZ2rmVB3LERHdfpF9dm/Tde2zRjbJ1015iLRASc9v34ogFplFp1hEHr36Jzy5kGEmiGGzXRDN/w= 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 1740097586700645.8479960558917; Thu, 20 Feb 2025 16:26:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A2521210; Thu, 20 Feb 2025 19:26:25 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 603A522DC; Thu, 20 Feb 2025 19:25:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0F6109D5; Thu, 20 Feb 2025 19:25:32 -0500 (EST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 927A52184 for ; Thu, 20 Feb 2025 19:25:27 -0500 (EST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4394a823036so15075625e9.0 for ; Thu, 20 Feb 2025 16:25:27 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d558527dsm127149375ad.219.2025.02.20.16.25.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 16:25:26 -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=1740097526; x=1740702326; 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=fnxwnJGfdCHw6ZIkjoxz/OAzPKKRGr9L3G/k4t3oMiA=; b=JE7D7YseeZ8qNZ/OtNLnACQD2U9UssmXqGfL5pct6mjl4L7EpVTEyJJkgigPSO7r+m F+mjt6wgXcHnLlnBI7dg2gnRN+cVsOey9oToW8DD+7pOzRrcc0xszmwnDIAcjSm3zLf6 vgzurLkAFLNsD2EcdGrA8sG2l4YOEKuZCMi1Ni+eEkli61bMVD/KsT4Wb856BPDnlr7a BJ4P6quSyFHZOXnhn60votE8GWVauIFtGuJP+VN87WRvGx41Ysv0sOwdk3Pq5Rz5kBQC Hp3LVwmdDpgK7ynSvapI8o75SQxOz6HyB9Z4EqqgkoasF19NV6OxRCLyVF4R8dhQzeSa qmTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740097526; x=1740702326; 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=fnxwnJGfdCHw6ZIkjoxz/OAzPKKRGr9L3G/k4t3oMiA=; b=XqJqT77A+oiiMsFPhnOGHP696B+30yIt2BNo0yZOpkF22GyL7/OGKdCbxVR9tRc0x0 W+pMVNGJ6QrZG6ZcxT4YLldCTvRPzhDlxf3E23KHw8Kzw5si3FhKPRXYJP+7rJVGu/gb tset2BLwlCyTA3p/TKfW8+GTrLWnmMNEuIDYFGW4dsUTSwE37HU7sG76V0laUO9Su5Ah p2IrWmWIQrje4r6GWKTAHyafykq+zWmG9uNVood/EK3zuA+pwE5PKC0/0sXd1nhjCJbB GwviBUEv5BCWZyo1RHNLhqGqI86FlB3H4yt+XdpH0BsM8Tx3W+ojYcZL+Eh0HSGKOHKV hojQ== X-Gm-Message-State: AOJu0YxDO7IQPnEI08PLuhj3/gh1RZSOLuv520LxUOW7Xr1mL49A+C0V 1GNnHI5SSzxjlCalPrLG6Oo5Vx0nIdhbOIzUfEU9EVBFsFc9CSLgPttSKVX9jqNgvmPV3Z7nAKr F X-Gm-Gg: ASbGncuav4ZgNvfkG199f+pzG3rtXsGUz/XM+lGA17Bdzog/e/aR0ZJrLLN4SPu8mtU /B3iiGu4Fz92out9tLqyoLimjra7x/uP1Pf7pvedq98xUfEzktW+FlEO5uOCIrNoFY3wb+GDfo+ W1P65lPRGH+YudA9psMJ4HW133/wuiN7kqNdWYrDtLjwHof9uPV3kuE7iNBqYh9hb3YvXQ304rE j/chlgCgjwb4fyKLARVrHyq4rGSYL+Wy+992tw81TibhKb6d5XSSoAwLCcTrjyOEuBT3XZSkI7G PZSVyMwnFAsr9fpJZRuAvjY6Lj8iFmCs5A== X-Google-Smtp-Source: AGHT+IHc0bc5yzIBB0Of6X8/Hz6XQrt9fdOjabUsfzlEtvNzP+OS+CNgEEz6yRlcQlxnfL7ep9vxCQ== X-Received: by 2002:a5d:45c5:0:b0:38d:e0be:71a3 with SMTP id ffacd0b85a97d-38f708593a9mr388105f8f.54.1740097526485; Thu, 20 Feb 2025 16:25:26 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 2/2] qemu: Add support for 'image_format' typed parameter Date: Thu, 20 Feb 2025 17:23:54 -0700 Message-ID: <20250221002521.9901-3-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250221002521.9901-1-jfehlig@suse.com> References: <20250221002521.9901-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QVVSWEG3QNG2WKQDFLCRPGAYOIJ6G2VU X-Message-ID-Hash: QVVSWEG3QNG2WKQDFLCRPGAYOIJ6G2VU 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: 1740097587264019100 Content-Type: text/plain; charset="utf-8" Add support for the 'image_format' typed parameter in virDomainSaveParams. The parameter overrides the 'save_image_format' setting in qemu.conf. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_driver.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 76b808b98f..6db7a30658 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2806,11 +2806,13 @@ qemuDomainSaveParams(virDomainPtr dom, unsigned int flags) { virQEMUDriver *driver =3D dom->conn->privateData; - g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainObj *vm =3D NULL; g_autoptr(virCommand) compressor =3D NULL; const char *to =3D NULL; const char *dxml =3D NULL; + const char *formatstr =3D NULL; + int format =3D cfg->saveImageFormat; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -2822,6 +2824,8 @@ qemuDomainSaveParams(virDomainPtr dom, VIR_TYPED_PARAM_STRING, VIR_DOMAIN_SAVE_PARAM_DXML, VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_SAVE_PARAM_IMAGE_FORMAT, + VIR_TYPED_PARAM_STRING, NULL) < 0) return -1; =20 @@ -2831,6 +2835,9 @@ qemuDomainSaveParams(virDomainPtr dom, if (virTypedParamsGetString(params, nparams, VIR_DOMAIN_SAVE_PARAM_DXML, &dxml) < 0) return -1; + if (virTypedParamsGetString(params, nparams, + VIR_DOMAIN_SAVE_PARAM_IMAGE_FORMAT, &forma= tstr) < 0) + return -1; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) goto cleanup; @@ -2843,14 +2850,19 @@ qemuDomainSaveParams(virDomainPtr dom, return qemuDomainManagedSaveHelper(driver, vm, dxml, flags); } =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (qemuSaveImageGetCompressionProgram(cfg->saveImageFormat, &compress= or, "save") < 0) + if (formatstr && (format =3D qemuSaveFormatTypeFromString(formatstr)) = < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid image_format '%1$s'"), formatstr); + goto cleanup; + } + + if (qemuSaveImageGetCompressionProgram(format, &compressor, "save") < = 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) goto cleanup; =20 - ret =3D qemuDomainSaveInternal(driver, vm, to, cfg->saveImageFormat, + ret =3D qemuDomainSaveInternal(driver, vm, to, format, compressor, dxml, flags); =20 cleanup: --=20 2.43.0