From nobody Sun May 5 05:37:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604938661; cv=none; d=zohomail.com; s=zohoarc; b=UAvWGu4a8FK4h9auiQStn85hO8kVDLZeYlwrCoBrbjKxDOzlMvWf2ewq41GRhV5Lyr/HdLQy6lEOZSJnAGNcRlKvgIz37jS35gPVvW9x/SYKkUQUotIL3PkT35PGAZFZ9TASnDJ2dVZspsZZY2Hnm7D5u4gh3pEuRUUx5JSMd1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604938661; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=CtgWJJYV8ebQ/dyedE85lljH0Fchd2+HOoh3DgBp3yo=; b=h1MTnra2iLZ83EqweucQsUajw2V4cwomttAV0asrqp8Okq2MuKXMlMWNJNdJnw1eWofEAKmTBb9EeFLJbZrg/hPatUbZvO9Z/0fHRnGgsrccDsr3rwc2iBuW/CI0r3UknT3kB385KZGZVYsDBV7vsMOUk7U9z6qLDKTkBYr1gLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604938661635700.5687004634079; Mon, 9 Nov 2020 08:17:41 -0800 (PST) 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-588-tpj52C6KNSmA-E325iAvfg-1; Mon, 09 Nov 2020 11:17:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A86088014C1; Mon, 9 Nov 2020 16:17:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4ADD71002C11; Mon, 9 Nov 2020 16:17:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5E9E2180B657; Mon, 9 Nov 2020 16:17:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A9GHO17014148 for ; Mon, 9 Nov 2020 11:17:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1239375128; Mon, 9 Nov 2020 16:17:24 +0000 (UTC) Received: from fedora.redhat.com (ovpn-114-194.ams2.redhat.com [10.36.114.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AA2C75125; Mon, 9 Nov 2020 16:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604938660; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CtgWJJYV8ebQ/dyedE85lljH0Fchd2+HOoh3DgBp3yo=; b=fwGPxPuHA85/+XSS+u8R0SX/IQZrkSsgkz4XbLbkaDhf5kms37zuqAvWYWtclgk9SJTTd9 g934Pz/NbLsqDKv1WLB/NvHBZT1Cf8743WZpIqOwv0+ihf4MYHCs2MLl9t0jSt6vM37ECN 3iKls4AAeZcP8KSGjBy792/iNFRpabo= X-MC-Unique: tpj52C6KNSmA-E325iAvfg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] Fix name prefix of VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE Date: Mon, 9 Nov 2020 16:17:15 +0000 Message-Id: <20201109161715.814604-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The enum constant names should all have a prefix that matches the enum name. VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE was missing the "CREATE_" part of the name prefix. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- include/libvirt/libvirt-domain-checkpoint.h | 4 ++-- src/libvirt-domain-checkpoint.c | 4 ++-- src/qemu/qemu_checkpoint.c | 4 ++-- tools/virsh-checkpoint.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt-domain-checkpoint.h b/include/libvirt/= libvirt-domain-checkpoint.h index 58932c8a6a..a2f97531f8 100644 --- a/include/libvirt/libvirt-domain-checkpoint.h +++ b/include/libvirt/libvirt-domain-checkpoint.h @@ -57,8 +57,8 @@ typedef enum { quiesce all mo= unted file systems w= ithin the domain */ - VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE =3D (1 << 2), /* validate dis= k data state - when redefinin= g a checkpoint */ + VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE =3D (1 << 2), /* val= idate disk data state + when = redefining a checkpoint */ } virDomainCheckpointCreateFlags; =20 /* Create a checkpoint using the current VM state. */ diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoin= t.c index e0c2527ccb..e6ad4f4f5d 100644 --- a/src/libvirt-domain-checkpoint.c +++ b/src/libvirt-domain-checkpoint.c @@ -125,7 +125,7 @@ virDomainCheckpointGetConnect(virDomainCheckpointPtr ch= eckpoint) * has a way to resupply correct defaults). Not all hypervisors support * this flag. * - * If @flags includes VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE along with + * If @flags includes VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE along= with * VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE the state of the metadata related * to the disk state of the redefined checkpoint is validated. Note that * hypervisors may require that the @domain is running to perform validati= on. @@ -160,7 +160,7 @@ virDomainCheckpointCreateXML(virDomainPtr domain, VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE, error); =20 - VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, + VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE, error); =20 diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index c24376dbe8..eb33633a11 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -538,13 +538,13 @@ qemuCheckpointCreateXML(virDomainPtr domain, virDomainCheckpointPtr checkpoint =3D NULL; bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; - bool validate_bitmaps =3D flags & VIR_DOMAIN_CHECKPOINT_REDEFINE_VALID= ATE; + bool validate_bitmaps =3D flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFIN= E_VALIDATE; unsigned int parse_flags =3D 0; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virDomainCheckpointDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | - VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, NULL); + VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, NULL); =20 if (redefine) { parse_flags |=3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index cc2bbdae8a..f6396d16eb 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -125,7 +125,7 @@ cmdCheckpointCreate(vshControl *ctl, if (vshCommandOptBool(cmd, "redefine")) flags |=3D VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; if (vshCommandOptBool(cmd, "redefine-validate")) - flags |=3D VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE; + flags |=3D VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE; if (vshCommandOptBool(cmd, "quiesce")) flags |=3D VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE; =20 --=20 2.28.0