[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH] monitor: Fix return type of monitor_fdset_dup
From: |
Yury Kotov |
Subject: |
Re: [Qemu-trivial] [PATCH] monitor: Fix return type of monitor_fdset_dup_fd_find |
Date: |
Tue, 14 May 2019 13:00:09 +0300 |
+ armbru@
Ping
This just fixes the return types because mon_fdset->id is int64_t
Without it, there is a bug when removing fd for fdset id >= 2^32
11.04.2019, 20:49, "Yury Kotov" <address@hidden>:
> Signed-off-by: Yury Kotov <address@hidden>
> ---
> include/monitor/monitor.h | 2 +-
> monitor.c | 4 ++--
> stubs/fdset.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
> index c1b40a9cac..2872621afd 100644
> --- a/include/monitor/monitor.h
> +++ b/include/monitor/monitor.h
> @@ -46,7 +46,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id,
> int64_t fdset_id,
> int monitor_fdset_get_fd(int64_t fdset_id, int flags);
> int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
> void monitor_fdset_dup_fd_remove(int dup_fd);
> -int monitor_fdset_dup_fd_find(int dup_fd);
> +int64_t monitor_fdset_dup_fd_find(int dup_fd);
>
> void monitor_vfprintf(FILE *stream,
> const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0);
> diff --git a/monitor.c b/monitor.c
> index 4807bbe811..50e6e820d6 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2585,7 +2585,7 @@ err:
> return -1;
> }
>
> -static int monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove)
> +static int64_t monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove)
> {
> MonFdset *mon_fdset;
> MonFdsetFd *mon_fdset_fd_dup;
> @@ -2613,7 +2613,7 @@ err:
> return -1;
> }
>
> -int monitor_fdset_dup_fd_find(int dup_fd)
> +int64_t monitor_fdset_dup_fd_find(int dup_fd)
> {
> return monitor_fdset_dup_fd_find_remove(dup_fd, false);
> }
> diff --git a/stubs/fdset.c b/stubs/fdset.c
> index 4f3edf2ea4..a1b8f41f62 100644
> --- a/stubs/fdset.c
> +++ b/stubs/fdset.c
> @@ -7,7 +7,7 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
> return -1;
> }
>
> -int monitor_fdset_dup_fd_find(int dup_fd)
> +int64_t monitor_fdset_dup_fd_find(int dup_fd)
> {
> return -1;
> }
> --
> 2.21.0
Regards,
Yury
- Re: [Qemu-trivial] [PATCH] monitor: Fix return type of monitor_fdset_dup_fd_find,
Yury Kotov <=