diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 71daa539e3..2cdcd88713 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29946,7 +29946,7 @@ virDomainDefHasManagedPR(const virDomainDef *def) size_t i; for (i = 0; i < def->ndisks; i++) { - if (virStoragePRDefIsManaged(def->disks[i]->src->pr)) + if (virStorageSourceChainHasManagedPR(def->disks[i]->src)) return true; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b2decc12fb..059229ff70 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2815,6 +2815,7 @@ virStoragePRDefIsEqual; virStoragePRDefIsManaged; virStoragePRDefParseXML; virStorageSourceBackingStoreClear; +virStorageSourceChainHasManagedPR; virStorageSourceClear; virStorageSourceCopy; virStorageSourceFindByNodeName; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 10fe0f201a..62768af968 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2025,6 +2025,20 @@ virStoragePRDefIsManaged(virStoragePRDefPtr prd) } +bool +virStorageSourceChainHasManagedPR(virStorageSourcePtr src) +{ + virStorageSourcePtr n; + + for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { + if (virStoragePRDefIsManaged(src->pr)) + return true; + } + + return false; +} + + virSecurityDeviceLabelDefPtr virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src, const char *model) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 4591e6e213..33fc853fcd 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -400,6 +400,9 @@ bool virStoragePRDefIsEqual(virStoragePRDefPtr a, virStoragePRDefPtr b); bool virStoragePRDefIsManaged(virStoragePRDefPtr prd); +bool +virStorageSourceChainHasManagedPR(virStorageSourcePtr src); + virSecurityDeviceLabelDefPtr virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src, const char *model);