NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename VIR_DOMAIN_SNAPSHOT_LOCATION_NONE to VIR_DOMAIN_SNAPSHOT_LOCATION_NO

Browse Source 
The string value associated to the enum is "no". Rename the enum
accordingly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-03-08 15:42:38 +01:00
parent f17da1c24b
commit fe6e11e856
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -5521,7 +5521,7 @@ virDomainDiskDefPostParse(virDomainDiskDef *disk,
if (disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT && if (disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT &&
disk->src->readonly) disk->src->readonly)
disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && if (disk->src->type == VIR_STORAGE_TYPE_NETWORK &&
disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) { disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) {
@ -5536,7 +5536,7 @@ virDomainDiskDefPostParse(virDomainDiskDef *disk,
/* vhost-user doesn't allow us to snapshot, disable snapshots by default */ /* vhost-user doesn't allow us to snapshot, disable snapshots by default */
if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER &&
disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) { disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) {
disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
} }
if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
@ -23617,7 +23617,7 @@ virDomainDiskDefFormat(virBuffer *buf,
virBufferAsprintf(&attrBuf, " sgio='%s'", sgio); virBufferAsprintf(&attrBuf, " sgio='%s'", sgio);
if (def->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT && if (def->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT &&
!(def->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && !(def->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO &&
def->src->readonly)) def->src->readonly))
virBufferAsprintf(&attrBuf, " snapshot='%s'", virBufferAsprintf(&attrBuf, " snapshot='%s'",
virDomainSnapshotLocationTypeToString(def->snapshot)); virDomainSnapshotLocationTypeToString(def->snapshot));

2
src/conf/domain_conf.h
View File

@ -539,7 +539,7 @@ typedef enum {
typedef enum { typedef enum {
VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT = 0, VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT = 0,
VIR_DOMAIN_SNAPSHOT_LOCATION_NONE, VIR_DOMAIN_SNAPSHOT_LOCATION_NO,
VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL, VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL,
VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL, VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL,

2
src/conf/domain_validate.c
View File

@ -317,7 +317,7 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk)
return -1; return -1;
} }
if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NO) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("only snapshot=no is supported with vhostuser disk")); _("only snapshot=no is supported with vhostuser disk"));
return -1; return -1;

12
src/conf/snapshot_conf.c
View File

@ -337,11 +337,11 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt,
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
} else if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE) { } else if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE) {
def->memory = (offline ? def->memory = (offline ?
VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : VIR_DOMAIN_SNAPSHOT_LOCATION_NO :
VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL); VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL);
} }
if (offline && def->memory && if (offline && def->memory &&
def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_NO) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("memory state cannot be saved with offline or " _("memory state cannot be saved with offline or "
"disk-only snapshot")); "disk-only snapshot"));
@ -681,15 +681,15 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef,
if (snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) { if (snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) {
if (domdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT && if (domdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT &&
(!require_match || (!require_match ||
domdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE)) { domdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO)) {
snapdisk->snapshot = domdisk->snapshot; snapdisk->snapshot = domdisk->snapshot;
} else { } else {
snapdisk->snapshot = default_snapshot; snapdisk->snapshot = default_snapshot;
} }
} else if (require_match && } else if (require_match &&
snapdisk->snapshot != default_snapshot && snapdisk->snapshot != default_snapshot &&
!(snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && !(snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO &&
domdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE)) { domdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk '%s' must use snapshot mode '%s'"), _("disk '%s' must use snapshot mode '%s'"),
snapdisk->name, snapdisk->name,
@ -728,7 +728,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef,
/* Don't snapshot empty drives */ /* Don't snapshot empty drives */
if (virStorageSourceIsEmpty(domdef->disks[i]->src)) if (virStorageSourceIsEmpty(domdef->disks[i]->src))
snapdisk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; snapdisk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
else else
snapdisk->snapshot = domdef->disks[i]->snapshot; snapdisk->snapshot = domdef->disks[i]->snapshot;

2
src/qemu/qemu_domain.c
View File

@ -6886,7 +6886,7 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriver *driver,
/* FIXME: we also need to handle LVM here */ /* FIXME: we also need to handle LVM here */
if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK || if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK ||
snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO)
continue; continue;
if (!virStorageSourceIsLocalStorage(def->disks[i]->src)) { if (!virStorageSourceIsLocalStorage(def->disks[i]->src)) {

12
src/qemu/qemu_snapshot.c
View File

@ -692,7 +692,7 @@ qemuSnapshotPrepare(virDomainObj *vm,
virDomainSnapshotDiskDef *disk = &def->disks[i]; virDomainSnapshotDiskDef *disk = &def->disks[i];
virDomainDiskDef *dom_disk = vm->def->disks[i]; virDomainDiskDef *dom_disk = vm->def->disks[i];
if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NO &&
qemuDomainDiskBlockJobIsActive(dom_disk)) qemuDomainDiskBlockJobIsActive(dom_disk))
return -1; return -1;
@ -757,7 +757,7 @@ qemuSnapshotPrepare(virDomainObj *vm,
external++; external++;
break; break;
case VIR_DOMAIN_SNAPSHOT_LOCATION_NONE: case VIR_DOMAIN_SNAPSHOT_LOCATION_NO:
/* Remember seeing a disk that has snapshot disabled */ /* Remember seeing a disk that has snapshot disabled */
if (!virStorageSourceIsEmpty(dom_disk->src) && if (!virStorageSourceIsEmpty(dom_disk->src) &&
!dom_disk->src->readonly) !dom_disk->src->readonly)
@ -773,7 +773,7 @@ qemuSnapshotPrepare(virDomainObj *vm,
} }
if (!found_internal && !external && if (!found_internal && !external &&
def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_NO) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("nothing selected for snapshot")); _("nothing selected for snapshot"));
return -1; return -1;
@ -1657,7 +1657,7 @@ qemuSnapshotCreateAlignDisks(virDomainObj *vm,
def->state = VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT; def->state = VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT;
else else
def->state = VIR_DOMAIN_SNAPSHOT_SHUTOFF; def->state = VIR_DOMAIN_SNAPSHOT_SHUTOFF;
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
} else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { } else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
def->state = virDomainObjGetState(vm, NULL); def->state = virDomainObjGetState(vm, NULL);
align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
@ -1665,7 +1665,7 @@ qemuSnapshotCreateAlignDisks(virDomainObj *vm,
def->state = virDomainObjGetState(vm, NULL); def->state = virDomainObjGetState(vm, NULL);
if (virDomainObjIsActive(vm) && if (virDomainObjIsActive(vm) &&
def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_NO) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("internal snapshot of a running VM " _("internal snapshot of a running VM "
"must include the memory state")); "must include the memory state"));
@ -1673,7 +1673,7 @@ qemuSnapshotCreateAlignDisks(virDomainObj *vm,
} }
if (def->state == VIR_DOMAIN_SNAPSHOT_SHUTOFF) if (def->state == VIR_DOMAIN_SNAPSHOT_SHUTOFF)
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
else else
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
} }

4
src/test/test_driver.c
View File

@ -8723,14 +8723,14 @@ testDomainSnapshotAlignDisks(virDomainObj *vm,
def->state = VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT; def->state = VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT;
else else
def->state = VIR_DOMAIN_SNAPSHOT_SHUTOFF; def->state = VIR_DOMAIN_SNAPSHOT_SHUTOFF;
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
} else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { } else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
def->state = virDomainObjGetState(vm, NULL); def->state = virDomainObjGetState(vm, NULL);
align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
} else { } else {
def->state = virDomainObjGetState(vm, NULL); def->state = virDomainObjGetState(vm, NULL);
def->memory = def->state == VIR_DOMAIN_SNAPSHOT_SHUTOFF ? def->memory = def->state == VIR_DOMAIN_SNAPSHOT_SHUTOFF ?
VIR_DOMAIN_SNAPSHOT_LOCATION_NONE : VIR_DOMAIN_SNAPSHOT_LOCATION_NO :
VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
} }

2
src/vz/vz_sdk.c
View File

@ -4640,7 +4640,7 @@ prlsdkParseSnapshotTree(const char *treexml)
def->parent.description = virXPathString("string(./Description)", ctxt); def->parent.description = virXPathString("string(./Description)", ctxt);
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
xmlstr = virXPathString("string(./@state)", ctxt); xmlstr = virXPathString("string(./@state)", ctxt);
if (!xmlstr) { if (!xmlstr) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",