| Message ID | 1354021324-31561-7-git-send-email-lcapitulino@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Nov 27, 2012 at 11:02:00AM -0200, Luiz Capitulino wrote: > Convert them to error_setg_errno(). > > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > qga/commands-posix.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 59bb32d..9325433 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -433,7 +433,6 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) > struct FsMount *mount; > Error *local_err = NULL; > int fd; > - char err_msg[512]; > > slog("guest-fsfreeze called"); > > @@ -450,9 +449,7 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) > QTAILQ_FOREACH(mount, &mounts, next) { > fd = qemu_open(mount->dirname, O_RDONLY); > if (fd == -1) { > - sprintf(err_msg, "failed to open %s, %s", mount->dirname, > - strerror(errno)); > - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(err, errno, "failed to open %s", mount->dirname); > goto error; > } > > @@ -468,9 +465,8 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) > ret = ioctl(fd, FIFREEZE); > if (ret == -1) { > if (errno != EOPNOTSUPP) { > - sprintf(err_msg, "failed to freeze %s, %s", > - mount->dirname, strerror(errno)); > - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(err, errno, "failed to freeze %s", > + mount->dirname); > close(fd); > goto error; > } > -- > 1.8.0 >
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 59bb32d..9325433 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -433,7 +433,6 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) struct FsMount *mount; Error *local_err = NULL; int fd; - char err_msg[512]; slog("guest-fsfreeze called"); @@ -450,9 +449,7 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) QTAILQ_FOREACH(mount, &mounts, next) { fd = qemu_open(mount->dirname, O_RDONLY); if (fd == -1) { - sprintf(err_msg, "failed to open %s, %s", mount->dirname, - strerror(errno)); - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); + error_setg_errno(err, errno, "failed to open %s", mount->dirname); goto error; } @@ -468,9 +465,8 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) ret = ioctl(fd, FIFREEZE); if (ret == -1) { if (errno != EOPNOTSUPP) { - sprintf(err_msg, "failed to freeze %s, %s", - mount->dirname, strerror(errno)); - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); + error_setg_errno(err, errno, "failed to freeze %s", + mount->dirname); close(fd); goto error; }
Convert them to error_setg_errno(). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- qga/commands-posix.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)