machined: Move image discovery logic into src/shared, so that we can make use of...

[elogind.git] / src / machine / machine.c

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 88c10b73157dab1ded04500f19a8d3c0cb689869..8dec716d719057f1d63c774369be275cdd1920f8 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -32,9 +32,10 @@
 #include "fileio.h"
 #include "special.h"
 #include "unit-name.h"
-#include "machine.h"
 #include "bus-util.h"
 #include "bus-error.h"
+#include "machine.h"
+#include "machine-dbus.h"
 
 Machine* machine_new(Manager *manager, const char *name) {
         Machine *m;
@@ -216,7 +217,7 @@ finish:
                 if (temp_path)
                         unlink(temp_path);
 
-                log_error_errno(-r, "Failed to save machine data %s: %m", m->state_file);
+                log_error_errno(r, "Failed to save machine data %s: %m", m->state_file);
         }
 
         return r;
@@ -259,8 +260,7 @@ int machine_load(Machine *m) {
                 if (r == -ENOENT)
                         return 0;
 
-                log_error_errno(-r, "Failed to read %s: %m", m->state_file);
-                return r;
+                return log_error_errno(r, "Failed to read %s: %m", m->state_file);
         }
 
         if (id)