From nobody Thu Sep 19 01:23:58 2024 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=1718319398; cv=none; d=zohomail.com; s=zohoarc; b=hgFZD1hvI7eG9qRLj8LU5h9MsLJebUyioQFPrlDQ1cnqX304RJgSfm/CWyN4901jJM3mv/5YJVoh7ck9cqTS249YV8v3+M3Uf8MzECCOVg7BMecDwHHv+DyhVJgQprS0E3D8Ms1ILr07Kk8OQQe913WlcVtzKgjLq/QJvOHnZqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718319398; 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=PAJvD6ZIZre3Ip1q6nPtwgugnd4IvLSzaD76IrAu5hw=; b=hwpB2K7yvMUH+IObiPWYlpKMkZNbT9Wz0WfiHUjXPqNRWXpVaABgFOycEdvDt5TjOz7JXTfd0VgZu8TFD3E91dp4JuI3YiMVrjFD2aYCurqAeBpewXHBv4ukummm59naS25SNWwfcI6Wnqr3RQh6IM32HBwud3LUKL5iHe1OoMs= 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 1718319398614433.51176114127; Thu, 13 Jun 2024 15:56:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8D7A51264; Thu, 13 Jun 2024 18:56:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9A9E11202; Thu, 13 Jun 2024 18:53:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D2161129C; Thu, 13 Jun 2024 18:53:39 -0400 (EDT) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 5285D1282 for ; Thu, 13 Jun 2024 18:52:42 -0400 (EDT) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2e78fe9fc2bso18805341fa.3 for ; Thu, 13 Jun 2024 15:52:42 -0700 (PDT) Received: from localhost ([69.51.97.134]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b956a5f4dfsm595666173.177.2024.06.13.15.52.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 15:52:40 -0700 (PDT) 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,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE 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=1718319161; x=1718923961; 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=6Jh3/fyH6EI9JpQvA7X2njO6QvG6pGmjXBv1CQHvLd8=; b=ge64TePFVAebhsDY27uY1TX3+efFjdBXS97aG3w3xFaUiZPgCwgFpH8fyXqHMkUgy9 JSv7ydPWQKetd/m0Dqg5cmpLyYWeOIo9CjeTSl6cnqEb3EeObtXQ/KVxf2UssjfUlSuC kXkRSKVS6nfGMv7xCZw31bumNaDYxN7RgIT5m7OYmGCjn/mMBhRlpd/PB8xgfceo8GPB T/tzXeA1KYRrJEjShmGQUevikgGRJMTJUuRwAFcrsg5WnsTMyk7TXOuZx9ECCDFc2Mum u/6Bh67oFk8K+6q1S6nbdHVw66ls1TZYAQMvdKMvrwHHpn+PFr8vBFecl2BPETKAM7G8 PQ+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718319161; x=1718923961; 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=6Jh3/fyH6EI9JpQvA7X2njO6QvG6pGmjXBv1CQHvLd8=; b=F6fhIK+sndy1x/Q+mNOze8jJaBQ+SWpWT2QwO5yY81dBtxak6Q/K1dtrIaMP6aMhr4 FKaNUNf/fccgwNLx4sWh/K8VoxDK10ufE6kyr2If9rCnTg2lSJqc/Q2UbtYviYctMe7B KKnoQqP+9OIEZNBx37Q/oboAuwGZwTfqLsdSB6wBwt/LaRdzQKuwiC9IPCyF3lBJ1GNq AyeWmUNH5BwSZnBHWuS9xTI84iC7wegX1z/Z6RyMozKIs0nTcfdSwFdiPsj8CZLS4w6D eeXhQZ/j2Pe1M5DSFXNrOcd4mBKhA9ayWRvLX/LFLlmCmA2FUZx7QM+XfMRVUNOmjVEM eFUg== X-Gm-Message-State: AOJu0YxUWpbagf+XzkSjP41F99ZxK3OgyQ5naurvOVL9+djgAR1THtsp PhxkpCOXs8jhulE7I0G5un8TbANUEsPtPbvAX4or4wCyJc34Xxc6moe3yv2bPXotvNjj+ejiSNm Q X-Google-Smtp-Source: AGHT+IF3orjiVvaRkvnjDE1scFTuRcdInArZqRf3lM43wXSfme/EPcWc4atqYE9Mr7/EvkYppIUquA== X-Received: by 2002:a2e:904c:0:b0:2eb:eb0f:a822 with SMTP id 38308e7fff4ca-2ec0e5d0c7emr5558431fa.24.1718319160994; Thu, 13 Jun 2024 15:52:40 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH RFC 5/9] qemu: conf: Add setting for save image version Date: Thu, 13 Jun 2024 16:43:19 -0600 Message-ID: <20240613225228.10665-6-jfehlig@suse.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240613225228.10665-1-jfehlig@suse.com> References: <20240613225228.10665-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: S7MMBCMZBEXZQODUD32DXZZSH75MFCEO X-Message-ID-Hash: S7MMBCMZBEXZQODUD32DXZZSH75MFCEO 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: 1718319400260100001 Content-Type: text/plain; charset="utf-8" Add a 'save_image_version' setting to qemu.conf to control the image version when saving a VM with 'virsh save' or 'virsh managedsave'. Default to the new version 3. Signed-off-by: Jim Fehlig --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 6 ++++++ src/qemu/qemu_conf.c | 8 ++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_saveimage.c | 19 ++++++++++++++----- src/qemu/qemu_saveimage.h | 6 +++--- src/qemu/qemu_snapshot.c | 4 ++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + 9 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 2b6526538f..acbfcd9fc3 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -92,6 +92,7 @@ module Libvirtd_qemu =3D | str_array_entry "namespaces" =20 let save_entry =3D str_entry "save_image_format" + | int_entry "save_image_version" | str_entry "dump_image_format" | str_entry "snapshot_image_format" | str_entry "auto_dump_path" diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 6bc2140dcb..b5df8c1cc6 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -590,6 +590,11 @@ # at scheduled saving, and it is an error if the specified save_image_form= at # is not valid, or the requested compression program can't be found. # +# save_image_version is applicable when using 'virsh save' or 'virsh manag= ed-save'. +# Currently only versions 2 and 3 are supported, with version 3 being the = default. +# If saved images must be compatible with an older libvirt without this se= tting, +# then set save_image_format_version to 2. +# # dump_image_format is used when you use 'virsh dump' at emergency # crashdump, and if the specified dump_image_format is not valid, or # the requested compression program can't be found, this falls @@ -601,6 +606,7 @@ # or the requested compression program can't be found. # #save_image_format =3D "raw" +#save_image_version =3D 3 #dump_image_format =3D "raw" #snapshot_image_format =3D "raw" =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4050a82341..3ed17165b8 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -66,6 +66,10 @@ VIR_LOG_INIT("qemu.qemu_conf"); #define QEMU_MIGRATION_PORT_MIN 49152 #define QEMU_MIGRATION_PORT_MAX 49215 =20 +/* Need to reconsile definition here and in qemu_saveimage.h */ +#define QEMU_SAVE_VERSION 3 + + VIR_ENUM_IMPL(virQEMUSchedCore, QEMU_SCHED_CORE_LAST, "none", @@ -246,6 +250,8 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->migrationPortMin =3D QEMU_MIGRATION_PORT_MIN; cfg->migrationPortMax =3D QEMU_MIGRATION_PORT_MAX; =20 + cfg->saveImageVersion =3D QEMU_SAVE_VERSION; + /* For privileged driver, try and find hugetlbfs mounts automatically. * Non-privileged driver requires admin to create a dir for the * user, chown it, and then let user configure it manually. */ @@ -610,6 +616,8 @@ virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig *c= fg, { if (virConfGetValueString(conf, "save_image_format", &cfg->saveImageFo= rmat) < 0) return -1; + if (virConfGetValueUInt(conf, "save_image_version", &cfg->saveImageVer= sion) < 0) + return -1; if (virConfGetValueString(conf, "dump_image_format", &cfg->dumpImageFo= rmat) < 0) return -1; if (virConfGetValueString(conf, "snapshot_image_format", &cfg->snapsho= tImageFormat) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 36049b4bfa..30f5c2151e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -193,6 +193,7 @@ struct _virQEMUDriverConfig { bool securityRequireConfined; =20 char *saveImageFormat; + unsigned int saveImageVersion; char *dumpImageFormat; char *snapshotImageFormat; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2698c7924..f9761242d2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2696,8 +2696,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, if (!(cookie =3D qemuDomainSaveCookieNew(vm))) goto endjob; =20 - if (!(data =3D virQEMUSaveDataNew(xml, cookie, was_running, compressed, - driver->xmlopt))) + if (!(data =3D virQEMUSaveDataNew(driver, xml, cookie, was_running, co= mpressed))) goto endjob; xml =3D NULL; =20 diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 50fec33f54..30085dc7bc 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -95,25 +95,34 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUSaveData, virQEMUS= aveDataFree); * This function steals @domXML on success. */ virQEMUSaveData * -virQEMUSaveDataNew(char *domXML, +virQEMUSaveDataNew(virQEMUDriver *driver, + char *domXML, qemuDomainSaveCookie *cookieObj, bool running, - int compressed, - virDomainXMLOption *xmlopt) + int compressed) { virQEMUSaveData *data =3D NULL; virQEMUSaveHeader *header; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 data =3D g_new0(virQEMUSaveData, 1); =20 if (cookieObj && !(data->cookie =3D virSaveCookieFormat((virObject *) cookieObj, - virDomainXMLOptionGetSaveCook= ie(xmlopt)))) + virDomainXMLOptionGetSaveCook= ie(driver->xmlopt)))) goto error; =20 header =3D &data->header; memcpy(header->magic, QEMU_SAVE_PARTIAL, sizeof(header->magic)); - header->version =3D QEMU_SAVE_VERSION; + + if (cfg->saveImageVersion < 2 || cfg->saveImageVersion > QEMU_SAVE_VER= SION) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid save image version %1$u"), + cfg->saveImageVersion); + goto error; + } + header->version =3D cfg->saveImageVersion; + header->was_running =3D running ? 1 : 0; header->compressed =3D compressed; =20 diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 9dd7de292d..63ad5508ed 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -123,11 +123,11 @@ virQEMUSaveDataWrite(virQEMUSaveData *data, const char *path); =20 virQEMUSaveData * -virQEMUSaveDataNew(char *domXML, +virQEMUSaveDataNew(virQEMUDriver *driver, + char *domXML, qemuDomainSaveCookie *cookieObj, bool running, - int compressed, - virDomainXMLOption *xmlopt); + int compressed); =20 void virQEMUSaveDataFree(virQEMUSaveData *data); diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index f5260c4a22..1d75208814 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1390,9 +1390,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, !(snapdef->cookie =3D (virObject *) qemuDomainSaveCookieNew(vm= ))) goto cleanup; =20 - if (!(data =3D virQEMUSaveDataNew(xml, + if (!(data =3D virQEMUSaveDataNew(driver, xml, (qemuDomainSaveCookie *) snapdef->= cookie, - resume, compressed, driver->xmlopt= ))) + resume, compressed))) goto cleanup; xml =3D NULL; =20 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe= mu.aug.in index b97e6de11e..8bcb332020 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -70,6 +70,7 @@ module Test_libvirtd_qemu =3D { "8" =3D "/dev/userfaultfd" } } { "save_image_format" =3D "raw" } +{ "save_image_version" =3D "3" } { "dump_image_format" =3D "raw" } { "snapshot_image_format" =3D "raw" } { "auto_dump_path" =3D "/var/lib/libvirt/qemu/dump" } --=20 2.44.0