From nobody Thu Sep 19 00:16:14 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=1718319361; cv=none; d=zohomail.com; s=zohoarc; b=HodCkshs7qd5Je5JL0YO1I2EKTUJY0Uuv8hNgmExbeeFGwPLQnyYDM/JCRxlbbCFiU8Mf6hZcT+L/qmzwUdYhIsPXyp0pubJANbZTaluD3n/i0bMupKsZtfoGlBKMcWkiW3AvKNSYmgPqgzYC2xNAWm66lBWZIYi+FS5UrjQyGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718319361; 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=Cn27G0rvAZUCFD4J5Zou8rdZiUpUGqTuQsnVQl7dTo4=; b=kqvr8Or2hSJGX3vrM0n/jtNJXsJgKpozinA6kmkncPMqr2Wk/DQ/HkbchsNOHAG10nZrxtmPTqyUaNM2J7fvviKX+iDaq7N/oG2eBO+C6KUwPvi5235NIMZrp+3j14uEn1fYD/vi+Vj2b5PFZWBTbAuZpqwHeQOHc996jv0Cseg= 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 1718319361664796.2029131354103; Thu, 13 Jun 2024 15:56:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8602A1281; Thu, 13 Jun 2024 18:56:00 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3EC28129D; Thu, 13 Jun 2024 18:53:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6AC12129A; Thu, 13 Jun 2024 18:53:36 -0400 (EDT) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (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 3C947127E for ; Thu, 13 Jun 2024 18:52:40 -0400 (EDT) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2ec002caeb3so20107981fa.2 for ; Thu, 13 Jun 2024 15:52:40 -0700 (PDT) Received: from localhost ([69.51.97.134]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b956df737asm574574173.76.2024.06.13.15.52.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 15:52:38 -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=1718319159; x=1718923959; 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=7cTy2JbbSOhpb00Oq7WlFCt/kJn3RSHeMWdvZ8gXKNw=; b=LUqgG7n1vXtiWQ6VqKih8WbvImS7XOYRXSbFdghaKxi/SRvnqqn4IYfz6xj8y3AJdP Y7RL09H6lBj1qbfhf/fFzOe28tPxEtpFiECZPUwCTQw3fxUXemMpb+jj36js++iMpgwd NmrV5nIJrycwgUYOg1xq4mS8ADJW4t3CvF8y0221mhff+QvyDS2GKCVOPVHVYw9qeEUk D8eAxUr2zh4VHMpkdDqoID5TeFlWybkcEH5CN0GHuCd7UoM+R/7bQUqem6zshcaNoG8X IYChEVzIZzLFyLO8bm7oJKsBo50KGpkN+1pO5slqd4KdSxxhYclToIFQReG+6ffl2m1E I8uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718319159; x=1718923959; 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=7cTy2JbbSOhpb00Oq7WlFCt/kJn3RSHeMWdvZ8gXKNw=; b=FHdKGuG/Z/7WieFwSoKDsOAJ9X0JYhraZJmIasL2p5YyPqft+DqRTTpKxId/x8Cvnm tSE30N7Oz8Wax8yAvJmfmHcN974IEQ5rKWegQ6yPIePQOTjeWoCvjethZOq28WEYjCON F+NzTgcLvmbgiDl1sls3D5xRuegMX23oc1uR1gL1tqH+mOqwHSmT8Qt4N5YUnHnmw85f 2c1UScVCFbQ/lQPz1YNIkMAsRaP/+bIMWGn3IIgkC4G1uxrtaYlPmxFhhfk9Q/biIY3B YBqfSkHp9aFzYgfFMRy6DifzOQmkw1ZB9kEJVfazgVTTiWG2GnqkvUTJEQAh53G1dhOU NxCA== X-Gm-Message-State: AOJu0YxmiJsSHBwU1xGVSrn7GttrZYCBkKbgRfnyX1nhEy2AfEF/Jlvo V4aTnCfewclSJQJtJCx906/Hz4YTxoMV/d8s3QAbt7wMwgj+C27sr3JzDBsY3IAeuJiBsHYw42I d X-Google-Smtp-Source: AGHT+IFqVQ0zhcG7F2iAMmTqnqBbc+Q6U+rFgk5e0hJsCtWx7s+euj0F8mAo9lVLNU4ROSZRIxb1tA== X-Received: by 2002:a2e:7d02:0:b0:2ec:1682:b4dd with SMTP id 38308e7fff4ca-2ec1682bb67mr913851fa.7.1718319159015; Thu, 13 Jun 2024 15:52:39 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH RFC 4/9] qemu: Add a 'features' element to save image header and bump version Date: Thu, 13 Jun 2024 16:43:18 -0600 Message-ID: <20240613225228.10665-5-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: RQC6GLU2PDCLY45SWCCFFW4BTRIN7I62 X-Message-ID-Hash: RQC6GLU2PDCLY45SWCCFFW4BTRIN7I62 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: 1718319362051100001 Content-Type: text/plain; charset="utf-8" QEMU's new mapped-ram stream format [1] is incompatible with the existing sequential format. In order to support the new format in libvirt, a new 'features' element is added to the saved image header. This element can be used now indicate the use of mapped-ram feature, and provides a mechanism to support future save image features. An older libvirt that is unaware of mapped-ram must not attempt to open and restore a mapped-ram saved image. ATM, this can only be done by bumping the save image version. [1] https://gitlab.com/qemu-project/qemu/-/blob/master/docs/devel/migration= /mapped-ram.rst?ref_type=3Dheads Signed-off-by: Jim Fehlig --- src/qemu/qemu_saveimage.c | 7 +++++++ src/qemu/qemu_saveimage.h | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 018ab5a222..50fec33f54 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -74,6 +74,7 @@ qemuSaveImageBswapHeader(virQEMUSaveHeader *hdr) hdr->was_running =3D GUINT32_SWAP_LE_BE(hdr->was_running); hdr->compressed =3D GUINT32_SWAP_LE_BE(hdr->compressed); hdr->cookieOffset =3D GUINT32_SWAP_LE_BE(hdr->cookieOffset); + hdr->features =3D GUINT32_SWAP_LE_BE(hdr->features); } =20 =20 @@ -637,6 +638,12 @@ qemuSaveImageOpen(virQEMUDriver *driver, return -1; } =20 + if (header->features && header->features !=3D QEMU_SAVE_FEATURE_MAPPED= _RAM) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("image contains unsupported features)")); + return -1; + } + if (header->cookieOffset) xml_len =3D header->cookieOffset; else diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index e541792153..9dd7de292d 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -28,10 +28,14 @@ */ #define QEMU_SAVE_MAGIC "LibvirtQemudSave" #define QEMU_SAVE_PARTIAL "LibvirtQemudPart" -#define QEMU_SAVE_VERSION 2 +#define QEMU_SAVE_VERSION 3 =20 G_STATIC_ASSERT(sizeof(QEMU_SAVE_MAGIC) =3D=3D sizeof(QEMU_SAVE_PARTIAL)); =20 +typedef enum { + QEMU_SAVE_FEATURE_MAPPED_RAM =3D 1 << 0, +} qemuSaveFeatures; + typedef struct _virQEMUSaveHeader virQEMUSaveHeader; struct _virQEMUSaveHeader { char magic[sizeof(QEMU_SAVE_MAGIC)-1]; @@ -40,7 +44,8 @@ struct _virQEMUSaveHeader { uint32_t was_running; uint32_t compressed; uint32_t cookieOffset; - uint32_t unused[14]; + uint32_t features; + uint32_t unused[13]; }; =20 =20 --=20 2.44.0