[PATCH v2 1/2] lxc: Remove unnecessary error label

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Since lxcConvertSize already creates an error message, there
is no need to use an error: label in lxcSetMemTune to just
overwrite or essentially rewrite the same error. So remove
the label.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/lxc/lxc_native.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index e1992fd1f9..cb20f1f5cf 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -763,7 +763,7 @@ lxcSetMemTune(virDomainDefPtr def, virConfPtr properties)
                               "lxc.cgroup.memory.limit_in_bytes",
                               &value) > 0) {
         if (lxcConvertSize(value, &size) < 0)
-            goto error;
+            return -1;
         size = size / 1024;
         virDomainDefSetMemoryTotal(def, size);
         def->mem.hard_limit = virMemoryLimitTruncate(size);
@@ -773,7 +773,7 @@ lxcSetMemTune(virDomainDefPtr def, virConfPtr properties)
                               "lxc.cgroup.memory.soft_limit_in_bytes",
                               &value) > 0) {
         if (lxcConvertSize(value, &size) < 0)
-            goto error;
+            return -1;
         def->mem.soft_limit = virMemoryLimitTruncate(size / 1024);
     }
 
@@ -781,16 +781,10 @@ lxcSetMemTune(virDomainDefPtr def, virConfPtr properties)
                               "lxc.cgroup.memory.memsw.limit_in_bytes",
                               &value) > 0) {
         if (lxcConvertSize(value, &size) < 0)
-            goto error;
+            return -1;
         def->mem.swap_hard_limit = virMemoryLimitTruncate(size / 1024);
     }
     return 0;
-
- error:
-    virReportError(VIR_ERR_INTERNAL_ERROR,
-                   _("failed to parse integer: '%s'"), value);
-    return -1;
-
 }
 
 static int
-- 
2.17.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux