qga: Make errp the last parameter of qga_vss_fsfreeze

Signed-off-by: Fam Zheng <[email protected]>
Message-Id: <20170421122710[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 19d72b2411e3434de565ba1ef3de9553bc3275f3..04026eedbf2facdfbf75dfdee6cf327531d95e73 100644 (file)
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -768,7 +768,7 @@ int64_t qmp_guest_fsfreeze_freeze(Error **errp)
     /* cannot risk guest agent blocking itself on a write in this state */
     ga_set_frozen(ga_state);
 
-    qga_vss_fsfreeze(&i, &local_err, true);
+    qga_vss_fsfreeze(&i, true, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
         goto error;
@@ -807,7 +807,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
         return 0;
     }
 
-    qga_vss_fsfreeze(&i, errp, false);
+    qga_vss_fsfreeze(&i, false, errp);
 
     ga_unset_frozen(ga_state);
     return i;

diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index 9a0e46356ab7d12758c477ef38db81d099276e6b..a80933c98bccef35231d1d9bb18e382c3cf277a7 100644 (file)
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -145,7 +145,7 @@ void ga_uninstall_vss_provider(void)
 }
 
 /* Call VSS requester and freeze/thaw filesystems and applications */
-void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool freeze)
+void qga_vss_fsfreeze(int *nr_volume, bool freeze, Error **errp)
 {
     const char *func_name = freeze ? "requester_freeze" : "requester_thaw";
     QGAVSSRequesterFunc func;

diff --git a/qga/vss-win32.h b/qga/vss-win32.h
index 4d1d15081e9d098f07355d4bc306b1ef7d5f5e61..51d303a8f6b17426ffd37fd15ad7e4644d3cbe08 100644 (file)
--- a/qga/vss-win32.h
+++ b/qga/vss-win32.h
@@ -21,6 +21,6 @@ bool vss_initialized(void);
 int ga_install_vss_provider(void);
 void ga_uninstall_vss_provider(void);
 
-void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool freeze);
+void qga_vss_fsfreeze(int *nr_volume, bool freeze, Error **errp);
 
 #endif