openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: block: Replace snapshot transaction action generator 

Use the new generator residing in the monitor code rather than directly
using qemuMonitorJSONTransactionAdd.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-26 16:33:43 +02:00
parent bacbd0f2ee
commit 043c09b4f8
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_block.c
View File

@ -22,7 +22,6 @@
#include "qemu_command.h"
#include "qemu_domain.h"
#include "qemu_alias.h"
#include "qemu_monitor_json.h"
#include "viralloc.h"
#include "virstring.h"
@ -1880,15 +1879,7 @@ qemuBlockSnapshotAddLegacy(virJSONValuePtr actions,
if (qemuGetDriveSourceString(newsrc, NULL, &source) < 0)
return -1;
if (qemuMonitorJSONTransactionAdd(actions, "blockdev-snapshot-sync",
"s:device", device,
"s:snapshot-file", source,
"s:format", format,
"S:mode", reuse ? "existing" : NULL,
NULL) < 0)
return -1;
return 0;
return qemuMonitorTransactionSnapshotLegacy(actions, device, source, format, reuse);
}
@ -1897,13 +1888,9 @@ qemuBlockSnapshotAddBlockdev(virJSONValuePtr actions,
virDomainDiskDefPtr disk,
virStorageSourcePtr newsrc)
{
if (qemuMonitorJSONTransactionAdd(actions, "blockdev-snapshot",
"s:node", disk->src->nodeformat,
"s:overlay", newsrc->nodeformat,
NULL) < 0)
return -1;
return 0;
return qemuMonitorTransactionSnapshotBlockdev(actions,
disk->src->nodeformat,
newsrc->nodeformat);
}