From nobody Sat Feb 7 08:53:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598527297; cv=none; d=zohomail.com; s=zohoarc; b=OHHGL8ICc/0yHN0wfJufhuTzZQ4nGhGsHg4XCOIAnDGuK87BsWeeZyaOew04Jla4pdZIxcRhbhNyGO3xgxIDrlL6cGJIGO0AxDN3PK56UbJULlEOzj6W5+P55RGw/JV/xB0i2AMqfbRSg4bAqw8QcDHnyPqmUIzVHhn/itQ0wtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598527297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TIaPxJ3W4oIpuEkSXLVUr3gtmgczeyz6Ejvy/R1YbP4=; b=eLNFWFL1U4/vM1WmFvWHpEdEjaVZfsahcdhuDM4L21GeD1KOqHYVZLiJGNbp18Fl4hTh0w2uft8E1LWaOIdzs8fxeAu3hlLcpHfnaYtZH7V0T9E1ofbJHaWBRVT7Mtx8om9aAaQbvwyJIABkG9YaCQAb2KvV9lKOD4VxMBDjEnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159852729726339.780447486121034; Thu, 27 Aug 2020 04:21:37 -0700 (PDT) Received: from localhost ([::1]:43762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBFyJ-0002fo-QX for importer@patchew.org; Thu, 27 Aug 2020 07:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBFte-0004za-M4 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 07:16:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48411 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBFtb-0000qg-Q1 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 07:16:46 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-445-0E1zL4s6PVWNgzvRGcgYig-1; Thu, 27 Aug 2020 07:16:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA75B185FD72; Thu, 27 Aug 2020 11:16:37 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95A26757EC; Thu, 27 Aug 2020 11:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598527002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TIaPxJ3W4oIpuEkSXLVUr3gtmgczeyz6Ejvy/R1YbP4=; b=IEAIu/Sd0sRLlwYvQuktRIFi/vyrA2x0dmqKRVe30GwoW8KlD1lNRE8VPgPrFdMS0HCnoc V7W5wOn/JaoEdkYwDY5/nDFp3Mbyurtn5ZIR9iAMA9byt85gBUrImjQHcDrHYJXiwteHPM yerQ1I0qlLJ9L9G6Llu5O2WrHZFQHmM= X-MC-Unique: 0E1zL4s6PVWNgzvRGcgYig-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] block: allow specifying name of block device for vmstate storage Date: Thu, 27 Aug 2020 12:16:04 +0100 Message-Id: <20200827111606.1408275-6-berrange@redhat.com> In-Reply-To: <20200827111606.1408275-1-berrange@redhat.com> References: <20200827111606.1408275-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Krempa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Denis V. Lunev" , qemu-block@nongnu.org, Juan Quintela , John Snow , Markus Armbruster , "Dr. David Alan Gilbert" , Pavel Dovgalyuk , Paolo Bonzini , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Currently the vmstate will be stored in the first block device that supports snapshots. Historically this would have usually been the root device, but with UEFI it might be the variable store. There needs to be a way to override the choice of block device to store the state in. Signed-off-by: Daniel P. Berrang=C3=A9 --- block/monitor/block-hmp-cmds.c | 2 +- block/snapshot.c | 17 +++++++++++++++-- include/block/snapshot.h | 4 +++- migration/savevm.c | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index db76c43cc2..81d1b52262 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -900,7 +900,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdic= t) SnapshotEntry *snapshot_entry; Error *err =3D NULL; =20 - bs =3D bdrv_all_find_vmstate_bs(NULL, &err); + bs =3D bdrv_all_find_vmstate_bs(NULL, NULL, &err); if (!bs) { error_report_err(err); return; diff --git a/block/snapshot.c b/block/snapshot.c index 5691cdc6cb..1f7b9a5146 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -604,7 +604,9 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, return 0; } =20 -BlockDriverState *bdrv_all_find_vmstate_bs(strList *devices, Error **errp) +BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs, + strList *devices, + Error **errp) { g_autoptr(GList) bdrvs =3D NULL; GList *iterbdrvs; @@ -624,6 +626,13 @@ BlockDriverState *bdrv_all_find_vmstate_bs(strList *de= vices, Error **errp) bdrv_can_snapshot(bs); aio_context_release(ctx); =20 + if (vmstate_bs && g_str_equal(vmstate_bs, + bdrv_get_node_name(bs))) { + error_setg(errp, "block device '%s' does not support snapshots= ", + vmstate_bs); + return NULL; + } + if (found) { return bs; } @@ -631,6 +640,10 @@ BlockDriverState *bdrv_all_find_vmstate_bs(strList *de= vices, Error **errp) iterbdrvs =3D iterbdrvs->next; } =20 - error_setg(errp, "No block device supports snapshots"); + if (vmstate_bs) { + error_setg(errp, "Block device '%s' does not exist", vmstate_bs); + } else { + error_setg(errp, "No block device supports snapshots"); + } return NULL; } diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 1c5b0705a9..05550e5da1 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -86,6 +86,8 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, strList *devices, Error **errp); =20 -BlockDriverState *bdrv_all_find_vmstate_bs(strList *devices, Error **errp); +BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs, + strList *devices, + Error **errp); =20 #endif diff --git a/migration/savevm.c b/migration/savevm.c index ae56de1a85..4a52704132 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2691,7 +2691,7 @@ int save_snapshot(const char *name, Error **errp) } } =20 - bs =3D bdrv_all_find_vmstate_bs(NULL, errp); + bs =3D bdrv_all_find_vmstate_bs(NULL, NULL, errp); if (bs =3D=3D NULL) { return ret; } @@ -2881,7 +2881,7 @@ int load_snapshot(const char *name, Error **errp) return -1; } =20 - bs_vm_state =3D bdrv_all_find_vmstate_bs(NULL, errp); + bs_vm_state =3D bdrv_all_find_vmstate_bs(NULL, NULL, errp); if (!bs_vm_state) { return -1; } --=20 2.26.2