[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 07/10] qemu-ga: qmp_guest_fstrim(): get rid of s
From: |
mdroth |
Subject: |
Re: [Qemu-devel] [PATCH 07/10] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set() |
Date: |
Wed, 28 Nov 2012 13:41:32 -0600 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Tue, Nov 27, 2012 at 11:02:01AM -0200, Luiz Capitulino wrote:
> Convert them to error_setg_errno().
>
> Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
> ---
> 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 9325433..72ef8ba 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -565,7 +565,6 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum,
> Error **err)
> struct FsMount *mount;
> int fd;
> Error *local_err = NULL;
> - char err_msg[512];
> struct fstrim_range r = {
> .start = 0,
> .len = -1,
> @@ -584,9 +583,7 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum,
> 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;
> }
>
> @@ -599,9 +596,8 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum,
> Error **err)
> ret = ioctl(fd, FITRIM, &r);
> if (ret == -1) {
> if (errno != ENOTTY && errno != EOPNOTSUPP) {
> - sprintf(err_msg, "failed to trim %s, %s",
> - mount->dirname, strerror(errno));
> - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg);
> + error_setg_errno(err, errno, "failed to trim %s",
> + mount->dirname);
> close(fd);
> goto error;
> }
> --
> 1.8.0
>
- [Qemu-devel] [PATCH 02/10] qemu-ga: qmp_guest_file_close(): fix fclose() error check, (continued)
- [Qemu-devel] [PATCH 02/10] qemu-ga: qmp_guest_file_close(): fix fclose() error check, Luiz Capitulino, 2012/11/27
- [Qemu-devel] [PATCH 08/10] qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set(), Luiz Capitulino, 2012/11/27
- [Qemu-devel] [PATCH 05/10] qemu-ga: build_fs_mount_list(): take an Error argument, Luiz Capitulino, 2012/11/27
- [Qemu-devel] [PATCH 10/10] qemu-ga: guest_suspend(): improve error reporting, Luiz Capitulino, 2012/11/27
- [Qemu-devel] [PATCH 07/10] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set(), Luiz Capitulino, 2012/11/27
- Re: [Qemu-devel] [PATCH 07/10] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set(),
mdroth <=
- [Qemu-devel] [PATCH 09/10] qemu-ga: bios_supports_mode(): improve error reporting, Luiz Capitulino, 2012/11/27
- Re: [Qemu-devel] [PATCH 00/10] qemu-ga: revamp error messages (for 1.4), mdroth, 2012/11/28
- Re: [Qemu-devel] [PATCH 00/10] qemu-ga: revamp error messages (for 1.4), mdroth, 2012/11/30