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

qemu: Remove unused code for pre-blockdev disk snapshot monitor interaction

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-19 18:21:19 +02:00
parent 4574818067
commit 58e740aa24
7 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_block.c
View File

@ -2106,26 +2106,6 @@ qemuBlockStorageSourceDetachOneBlockdev(virDomainObj *vm,
} }
int
qemuBlockSnapshotAddLegacy(virJSONValue *actions,
virDomainDiskDef *disk,
virStorageSource *newsrc,
bool reuse)
{
const char *format = virStorageFileFormatTypeToString(newsrc->format);
g_autofree char *device = NULL;
g_autofree char *source = NULL;
if (!(device = qemuAliasDiskDriveFromDisk(disk)))
return -1;
if (qemuGetDriveSourceString(newsrc, NULL, &source) < 0)
return -1;
return qemuMonitorTransactionSnapshotLegacy(actions, device, source, format, reuse);
}
int int
qemuBlockSnapshotAddBlockdev(virJSONValue *actions, qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
virDomainDiskDef *disk, virDomainDiskDef *disk,

6
src/qemu/qemu_block.h
View File

@ -177,12 +177,6 @@ qemuBlockStorageSourceChainDetach(qemuMonitor *mon,
G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData, G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData,
qemuBlockStorageSourceChainDataFree); qemuBlockStorageSourceChainDataFree);
int
qemuBlockSnapshotAddLegacy(virJSONValue *actions,
virDomainDiskDef *disk,
virStorageSource *newsrc,
bool reuse);
int int
qemuBlockSnapshotAddBlockdev(virJSONValue *actions, qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
virDomainDiskDef *disk, virDomainDiskDef *disk,

12
src/qemu/qemu_monitor.c
View File

@ -4347,18 +4347,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
} }
int
qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions,
const char *device,
const char *path,
const char *format,
bool existing)
{
return qemuMonitorJSONTransactionSnapshotLegacy(actions, device, path,
format, existing);
}
int int
qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node, const char *node,

6
src/qemu/qemu_monitor.h
View File

@ -1457,12 +1457,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
const char *sourcebitmap); const char *sourcebitmap);
int int
qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions,
const char *device,
const char *path,
const char *format,
bool existing);
int
qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node, const char *node,
const char *overlay); const char *overlay);

22
src/qemu/qemu_monitor_json.c
View File

@ -8520,28 +8520,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
} }
int
qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions,
const char *device,
const char *path,
const char *format,
bool existing)
{
const char *mode = NULL;
if (existing)
mode = "existing";
return qemuMonitorJSONTransactionAdd(actions,
"blockdev-snapshot-sync",
"s:device", device,
"s:snapshot-file", path,
"s:format", format,
"S:mode", mode,
NULL);
}
int int
qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node, const char *node,

6
src/qemu/qemu_monitor_json.h
View File

@ -812,12 +812,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
const char *sourcebitmap); const char *sourcebitmap);
int int
qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions,
const char *device,
const char *path,
const char *format,
bool existing);
int
qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node, const char *node,
const char *overlay); const char *overlay);

1
tests/qemumonitorjsontest.c
View File

@ -2665,7 +2665,6 @@ testQemuMonitorJSONTransaction(const void *opaque)
qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < 0 || qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < 0 ||
qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 || qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 ||
qemuMonitorTransactionBitmapMerge(actions, "node5", "bitmap5", &mergebitmaps) < 0 || qemuMonitorTransactionBitmapMerge(actions, "node5", "bitmap5", &mergebitmaps) < 0 ||
qemuMonitorTransactionSnapshotLegacy(actions, "dev6", "path", "qcow2", true) < 0 ||
qemuMonitorTransactionSnapshotBlockdev(actions, "node7", "overlay7") < 0 || qemuMonitorTransactionSnapshotBlockdev(actions, "node7", "overlay7") < 0 ||
qemuMonitorTransactionBackup(actions, "dev8", "job8", "target8", "bitmap8", qemuMonitorTransactionBackup(actions, "dev8", "job8", "target8", "bitmap8",
QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE) < 0 || QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE) < 0 ||