diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index bb732a134750ee7485cfc1293194ac4290b8401f..12b093071a5cfcb85263d3a2aa307e7712c16b68 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -1291,3 +1291,10 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, cleanup: return ret; } + + +int +virDomainSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def) +{ + return def->type; +} diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index bcd92dc62fa809ae52bd2603fa4d794190d30e3f..59c6d9245fad1217d56d6e51cf36d9eeecc81b46 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -187,6 +187,8 @@ int virDomainSnapshotRedefinePrep(virDomainPtr domain, bool *update_current, unsigned int flags); +int virDomainSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def); + VIR_ENUM_DECL(virDomainSnapshotLocation) VIR_ENUM_DECL(virDomainSnapshotState) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index aae6a3b95c14ad9c986e254c90c0e1b116e7033c..67d20ed848dae628ea5df488d1470dc16e049d45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -659,6 +659,7 @@ virDomainSnapshotDefFormat; virDomainSnapshotDefFree; virDomainSnapshotDefIsExternal; virDomainSnapshotDefParseString; +virDomainSnapshotDiskGetActualType; virDomainSnapshotDropParent; virDomainSnapshotFindByName; virDomainSnapshotForEach; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dc4ded35cfead51eb922d60e7f9b6f5f1da40fb4..2c397b06d876617cbd98a6cacfddf520546cfd33 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1464,13 +1464,6 @@ cleanup: } -int -qemuSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def) -{ - return def->type; -} - - int qemuTranslateSnapshotDiskSourcePool(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainSnapshotDiskDefPtr def) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 842b740fe818bb80fede114be747d1562a2a8c05..c181dc215a8c9ecedcf6db77a52d7726340b5fb5 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -308,8 +308,6 @@ virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver); int qemuTranslateDiskSourcePool(virConnectPtr conn, virDomainDiskDefPtr def); -int qemuSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def); - int qemuTranslateSnapshotDiskSourcePool(virConnectPtr conn, virDomainSnapshotDiskDefPtr def); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ddbd2129c1675891b91e07503b443efed5946e5..aa2e1787a60ebcdcc86067e1cea049a9b597c3cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12321,7 +12321,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk) static int qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr disk) { - int actualType = qemuSnapshotDiskGetActualType(disk); + int actualType = virDomainSnapshotDiskGetActualType(disk); switch ((enum virDomainDiskType) actualType) { case VIR_DOMAIN_DISK_TYPE_BLOCK: @@ -12345,7 +12345,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d static int qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr disk) { - int actualType = qemuSnapshotDiskGetActualType(disk); + int actualType = virDomainSnapshotDiskGetActualType(disk); switch ((enum virDomainDiskType) actualType) { case VIR_DOMAIN_DISK_TYPE_BLOCK: @@ -12397,7 +12397,7 @@ qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn, return -1; } - actualType = qemuSnapshotDiskGetActualType(snapdisk); + actualType = virDomainSnapshotDiskGetActualType(snapdisk); switch ((enum virDomainDiskType) actualType) { case VIR_DOMAIN_DISK_TYPE_BLOCK: