Commit 4462a530 authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

qga: Make errp the last parameter of qga_vss_fsfreeze 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-14-famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bbfb89e3

qga/commands-win32.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

qga/vss-win32.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

qga/vss-win32.h

+1 −1
Original line number Diff line number Diff line
@@ -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