From 08e3b1c0dc1261e1e0380f8c5d42b2adfdf8bc43 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 25 Sep 2018 13:32:07 +0200 Subject: [PATCH] virSecurityDACRestoreAllLabel: Reorder device relabeling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It helps whe trying to match calls with virSecurityDACSetAllLabel if the order in which devices are set/restored is the same in both functions. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrangé Reviewed-by: Ján Tomko --- src/security/security_dac.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 7be555903d..4935c962b9 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1664,11 +1664,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, VIR_DEBUG("Restoring security label on %s migrated=%d", def->name, migrated); - for (i = 0; i < def->nhostdevs; i++) { - if (virSecurityDACRestoreHostdevLabel(mgr, - def, - def->hostdevs[i], - NULL) < 0) + for (i = 0; i < def->ndisks; i++) { + if (virSecurityDACRestoreImageLabelInt(mgr, + def, + def->disks[i]->src, + migrated) < 0) rc = -1; } @@ -1682,11 +1682,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, rc = -1; } - for (i = 0; i < def->ndisks; i++) { - if (virSecurityDACRestoreImageLabelInt(mgr, - def, - def->disks[i]->src, - migrated) < 0) + for (i = 0; i < def->nhostdevs; i++) { + if (virSecurityDACRestoreHostdevLabel(mgr, + def, + def->hostdevs[i], + NULL) < 0) rc = -1; } -- GitLab