diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index c5484c7b9321e553e80b74eda69e8eb35fb4dedd..cab991a078bd6303bce29cf1f499198cc441c34c 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -298,8 +298,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, virJSONValuePtr actions, virDomainMomentDefPtr *incremental, virHashTablePtr blockNamedNodeData, - virQEMUDriverConfigPtr cfg, - bool removeStore) + virQEMUDriverConfigPtr cfg) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -331,7 +330,6 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, } if (!(dd->blockjob = qemuBlockJobDiskNewBackup(vm, dd->domdisk, dd->store, - removeStore, dd->incrementalBitmap))) return -1; @@ -389,13 +387,11 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm, virHashTablePtr blockNamedNodeData, virJSONValuePtr actions, virQEMUDriverConfigPtr cfg, - struct qemuBackupDiskData **rdd, - bool reuse_external) + struct qemuBackupDiskData **rdd) { struct qemuBackupDiskData *disks = NULL; ssize_t ndisks = 0; size_t i; - bool removeStore = !reuse_external && (def->type == VIR_DOMAIN_BACKUP_TYPE_PULL); disks = g_new0(struct qemuBackupDiskData, def->ndisks); @@ -410,7 +406,7 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm, if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, incremental, blockNamedNodeData, - cfg, removeStore) < 0) + cfg) < 0) goto error; if (def->type == VIR_DOMAIN_BACKUP_TYPE_PULL) { @@ -826,7 +822,7 @@ qemuBackupBegin(virDomainObjPtr vm, goto endjob; if ((ndd = qemuBackupDiskPrepareData(vm, def, incremental, blockNamedNodeData, - actions, cfg, &dd, reuse)) <= 0) { + actions, cfg, &dd)) <= 0) { if (ndd == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("no disks selected for backup")); diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 131b53d88deb31fd45fb67ec0a7648a6efd3de8a..c536c19bb6d58e15b0e67e4a30dbb7dd04802599 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -382,7 +382,6 @@ qemuBlockJobDataPtr qemuBlockJobDiskNewBackup(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr store, - bool deleteStore, const char *bitmap) { g_autoptr(qemuBlockJobData) job = NULL; @@ -395,7 +394,6 @@ qemuBlockJobDiskNewBackup(virDomainObjPtr vm, job->data.backup.bitmap = g_strdup(bitmap); job->data.backup.store = virObjectRef(store); - job->data.backup.deleteStore = deleteStore; /* backup jobs are usually started in bulk by transaction so the caller * shall save the status XML */ diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index 42b973fe9690a5490eb32e0a3d3bde2daeacf560..7d584a29801f6c9dc9e9309477effc7ea9c505a7 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -113,7 +113,6 @@ typedef qemuBlockJobBackupData *qemuBlockJobDataBackupPtr; struct _qemuBlockJobBackupData { virStorageSourcePtr store; - bool deleteStore; char *bitmap; }; @@ -201,7 +200,6 @@ qemuBlockJobDataPtr qemuBlockJobDiskNewBackup(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr store, - bool deleteStore, const char *bitmap); qemuBlockJobDataPtr diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ee9562b9d9b545fa0ae84e7469f69cdd367a1c02..065c9e97a907bd35b91cb462211d3b3c9700e8d2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2617,9 +2617,6 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload, data->xmlopt, false) < 0) return -1; - - if (job->data.backup.deleteStore) - virBufferAddLit(&childBuf, "\n"); } break; @@ -3222,10 +3219,6 @@ qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job, if (!(tmp = virXPathNode("./store", ctxt)) || !(job->data.backup.store = qemuDomainObjPrivateXMLParseBlockjobChain(tmp, ctxt, xmlopt))) goto broken; - - if (virXPathNode("./deleteStore", ctxt)) - job->data.backup.deleteStore = true; - break; case QEMU_BLOCKJOB_TYPE_BROKEN: diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemustatusxml2xmldata/backup-pull-in.xml index 6ef4965bedd868e9c46015cebc2ed7ba7fa16697..3c69c418403fd20336aa2bf33642356b92dcbb93 100644 --- a/tests/qemustatusxml2xmldata/backup-pull-in.xml +++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml @@ -248,7 +248,6 @@ - -2