9:37 a.m.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_block.c | 20 --------------------
src/qemu/qemu_block.h | 6 ------
src/qemu/qemu_monitor.c | 12 ------------
src/qemu/qemu_monitor.h | 6 ------
src/qemu/qemu_monitor_json.c | 22 ----------------------
src/qemu/qemu_monitor_json.h | 6 ------
tests/qemumonitorjsontest.c | 1 -
7 files changed, 73 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 870d44ecd5..81c807660f 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2108,26 +2108,6 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriver *driver,
}
-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
qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
virDomainDiskDef *disk,
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 8641c8a2d2..bcd3f5960b 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -179,12 +179,6 @@ qemuBlockStorageSourceChainDetach(qemuMonitor *mon,
G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData,
qemuBlockStorageSourceChainDataFree);
-int
-qemuBlockSnapshotAddLegacy(virJSONValue *actions,
- virDomainDiskDef *disk,
- virStorageSource *newsrc,
- bool reuse);
-
int
qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
virDomainDiskDef *disk,
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6ebdeb46f3..b575eaae06 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4397,18 +4397,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
qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index b82f198285..916a86f423 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1461,12 +1461,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(virJSONValue
*sources,
const char *sourcebitmap);
int
-qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions,
- const char *device,
- const char *path,
- const char *format,
- bool existing);
-int
qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node,
const char *overlay);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 941596563a..8cda6f36b7 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -8548,28 +8548,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
qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index e4c65e250e..613b251908 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -813,12 +813,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(virJSONValue
*sources,
const char *sourcebitmap);
int
-qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions,
- const char *device,
- const char *path,
- const char *format,
- bool existing);
-int
qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
const char *node,
const char *overlay);
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 692aa75791..adfe6e1c55 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2742,7 +2742,6 @@ testQemuMonitorJSONTransaction(const void *opaque)
qemuMonitorTransactionBitmapEnable(actions, "node3",
"bitmap3") < 0 ||
qemuMonitorTransactionBitmapDisable(actions, "node4",
"bitmap4") < 0 ||
qemuMonitorTransactionBitmapMerge(actions, "node5",
"bitmap5", &mergebitmaps) < 0 ||
- qemuMonitorTransactionSnapshotLegacy(actions, "dev6", "path",
"qcow2", true) < 0 ||
qemuMonitorTransactionSnapshotBlockdev(actions, "node7",
"overlay7") < 0 ||
qemuMonitorTransactionBackup(actions, "dev8", "job8",
"target8", "bitmap8",
QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE) <
0 ||
--
2.36.1