security: Sanitize type of @migrated in virSecurityManagerRestoreAllLabel

Also remove one spurious ATTRIBUTE_UNUSED guarding the @migrated
argument.

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f1c0041a11c961ffd8a3b2aff0d3b22957ac81e7..6af77c9758ab3d132467e689d125ecbbf88de834 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4419,7 +4419,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     if (!(flags & VIR_QEMU_PROCESS_STOP_NO_RELABEL))
         virSecurityManagerRestoreAllLabel(driver->securityManager,
                                           vm->def,
-                                          flags & VIR_QEMU_PROCESS_STOP_MIGRATED);
+                                          !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED));
     virSecurityManagerReleaseLabel(driver->securityManager, vm->def);
 
     for (i = 0; i < vm->def->ndisks; i++) {

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index ec8c101e5a94062ce18a55cb7ecda58b3f1f9d88..ed9d1928d03afaf1f92666162ec7cc7664cac7f9 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -550,7 +550,7 @@ AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
 static int
 AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
                                 virDomainDefPtr def,
-                                int migrated ATTRIBUTE_UNUSED)
+                                bool migrated ATTRIBUTE_UNUSED)
 {
     int rc = 0;
     virSecurityLabelDefPtr secdef =

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 28f033dca843b6c382e9db765053f15cafc57245..6e5ccfa324ee4c214b59dac80c744a849fc0b048 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -351,7 +351,7 @@ static int
 virSecurityDACRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr,
                                            virDomainDefPtr def,
                                            virDomainDiskDefPtr disk,
-                                           int migrated)
+                                           bool migrated)
 {
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityLabelDefPtr secdef;
@@ -414,7 +414,7 @@ virSecurityDACRestoreSecurityImageLabel(virSecurityManagerPtr mgr,
                                         virDomainDefPtr def,
                                         virDomainDiskDefPtr disk)
 {
-    return virSecurityDACRestoreSecurityImageLabelInt(mgr, def, disk, 0);
+    return virSecurityDACRestoreSecurityImageLabelInt(mgr, def, disk, false);
 }
 
 
@@ -877,7 +877,7 @@ virSecurityDACRestoreSecurityTPMFileLabel(virSecurityManagerPtr mgr,
 static int
 virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
                                       virDomainDefPtr def,
-                                      int migrated)
+                                      bool migrated)
 {
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityLabelDefPtr secdef;

diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index ced1b9220aae4247d871750924b4028df18e2c97..879f63c81e0e5a1abb8ee81e49726b52ddc87bcd 100644 (file)
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -89,7 +89,7 @@ typedef int (*virSecurityDomainSetAllLabel) (virSecurityManagerPtr mgr,
                                              const char *stdin_path);
 typedef int (*virSecurityDomainRestoreAllLabel) (virSecurityManagerPtr mgr,
                                                  virDomainDefPtr def,
-                                                 int migrated);
+                                                 bool migrated);
 typedef int (*virSecurityDomainGetProcessLabel) (virSecurityManagerPtr mgr,
                                                  virDomainDefPtr def,
                                                  pid_t pid,

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 79edb07e91bfc4df2ec95be9cb9bdf5366b822ed..715159c35de2b95ea80b5c1ad04027c126ecdb38 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -593,7 +593,7 @@ int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr,
 
 int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr,
                                       virDomainDefPtr vm,
-                                      int migrated)
+                                      bool migrated)
 {
     if (mgr->drv->domainRestoreSecurityAllLabel) {
         int ret;

diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 81d3160a8b3199d2a6ec16b5f348056e604cca64..3cddcd2cb6418ea49dffc454eb4158de2b956ec7 100644 (file)
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -99,7 +99,7 @@ int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr,
                                   const char *stdin_path);
 int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr,
                                       virDomainDefPtr def,
-                                      int migrated);
+                                      bool migrated);
 int virSecurityManagerGetProcessLabel(virSecurityManagerPtr mgr,
                                       virDomainDefPtr def,
                                       pid_t pid,

diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index 73e1ac167e3e0292f370fa8053d6ca52df96b058..a096ce2ada49c604ce5f101374d0b2fceb4a5393 100644 (file)
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -139,7 +139,7 @@ static int virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_U
 
 static int virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
                                                virDomainDefPtr vm ATTRIBUTE_UNUSED,
-                                               int migrated ATTRIBUTE_UNUSED)
+                                               bool migrated ATTRIBUTE_UNUSED)
 {
     return 0;
 }

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 0c34af8be961492da4775aabc6aca60b3fddc4e2..f5d67a9aea5119a85f0ca3a5f11c72564a5b5d10 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1124,7 +1124,7 @@ static int
 virSecuritySELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr,
                                                virDomainDefPtr def,
                                                virDomainDiskDefPtr disk,
-                                               int migrated)
+                                               bool migrated)
 {
     virSecurityLabelDefPtr seclabel;
     virSecurityDeviceLabelDefPtr disk_seclabel;
@@ -1186,7 +1186,7 @@ virSecuritySELinuxRestoreSecurityImageLabel(virSecurityManagerPtr mgr,
                                             virDomainDefPtr def,
                                             virDomainDiskDefPtr disk)
 {
-    return virSecuritySELinuxRestoreSecurityImageLabelInt(mgr, def, disk, 0);
+    return virSecuritySELinuxRestoreSecurityImageLabelInt(mgr, def, disk, false);
 }
 
 
@@ -1837,7 +1837,7 @@ virSecuritySELinuxGetBaseLabel(virSecurityManagerPtr mgr, int virtType)
 static int
 virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
                                           virDomainDefPtr def,
-                                          int migrated ATTRIBUTE_UNUSED)
+                                          bool migrated)
 {
     virSecurityLabelDefPtr secdef;
     virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index e4b2db6ba58b73d00cf4fff4ad53fa3ac2da5924..355c978e70955198941ea431b1856d3e15b9f694 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -323,7 +323,7 @@ virSecurityStackSetSecurityAllLabel(virSecurityManagerPtr mgr,
 static int
 virSecurityStackRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
                                         virDomainDefPtr vm,
-                                        int migrated)
+                                        bool migrated)
 {
     virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityStackItemPtr item = priv->itemsHead;