| Message ID | 1426410988-3695-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Sun, 03/15 10:16, Paolo Bonzini wrote: > monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP > command add_fd). Free it. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> > --- > v1->v2: line length [Fam], pass &error_abort [Shannon] > v2->v3: use "!!" instead of "? true : false" [Markus] > --- > vl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index eba5d4c..5985680 100644 > --- a/vl.c > +++ b/vl.c > @@ -1011,6 +1011,7 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) > int fd, dupfd, flags; > int64_t fdset_id; > const char *fd_opaque = NULL; > + AddfdInfo *fdinfo; > > fd = qemu_opt_get_number(opts, "fd", -1); > fdset_id = qemu_opt_get_number(opts, "set", -1); > @@ -1060,8 +1061,9 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) > } > > /* add the duplicate fd, and optionally the opaque string, to the fd set */ > - monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false, > - fd_opaque, NULL); > + fdinfo = monitor_fdset_add_fd(dupfd, true, fdset_id, !!fd_opaque, fd_opaque, > + &error_abort); > + g_free(fdinfo); > > return 0; > } > -- > 2.3.0 > >
Paolo Bonzini <pbonzini@redhat.com> writes: > monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP > command add_fd). Free it. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > v1->v2: line length [Fam], pass &error_abort [Shannon] > v2->v3: use "!!" instead of "? true : false" [Markus] > --- > vl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index eba5d4c..5985680 100644 > --- a/vl.c > +++ b/vl.c > @@ -1011,6 +1011,7 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) > int fd, dupfd, flags; > int64_t fdset_id; > const char *fd_opaque = NULL; > + AddfdInfo *fdinfo; > > fd = qemu_opt_get_number(opts, "fd", -1); > fdset_id = qemu_opt_get_number(opts, "set", -1); > @@ -1060,8 +1061,9 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) > } > > /* add the duplicate fd, and optionally the opaque string, to the fd set */ > - monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false, > - fd_opaque, NULL); > + fdinfo = monitor_fdset_add_fd(dupfd, true, fdset_id, !!fd_opaque, fd_opaque, > + &error_abort); > + g_free(fdinfo); > > return 0; > } Aside: monitor_fdset_add_fd()'s two has_ parameters are rather unnatural. Reviewed-by: Markus Armbruster <armbru@redhat.com>
15.03.2015 12:16, Paolo Bonzini wrote: > monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP > command add_fd). Free it. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > v1->v2: line length [Fam], pass &error_abort [Shannon] > v2->v3: use "!!" instead of "? true : false" [Markus] And ofcourse after finding v2 and v3, I applied this v3 one instead of the initial version with a fixup. Well, this boolean thing becomes really ugly... :( Thanks, /mjt
diff --git a/vl.c b/vl.c index eba5d4c..5985680 100644 --- a/vl.c +++ b/vl.c @@ -1011,6 +1011,7 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) int fd, dupfd, flags; int64_t fdset_id; const char *fd_opaque = NULL; + AddfdInfo *fdinfo; fd = qemu_opt_get_number(opts, "fd", -1); fdset_id = qemu_opt_get_number(opts, "set", -1); @@ -1060,8 +1061,9 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) } /* add the duplicate fd, and optionally the opaque string, to the fd set */ - monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false, - fd_opaque, NULL); + fdinfo = monitor_fdset_add_fd(dupfd, true, fdset_id, !!fd_opaque, fd_opaque, + &error_abort); + g_free(fdinfo); return 0; }
monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP command add_fd). Free it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- v1->v2: line length [Fam], pass &error_abort [Shannon] v2->v3: use "!!" instead of "? true : false" [Markus] --- vl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)