| Message ID | 87mv6yk1x3.fsf@dusky.pond.sub.org |
|---|---|
| State | New |
| Headers | show |
On Thu, 2017-08-17 at 10:56 +0200, Markus Armbruster wrote: > Gerd, can we delete the vnc_init_func() stub? Things still compile > for > me when I do. > > diff --git a/include/ui/console.h b/include/ui/console.h > index 7262bef..2c3b2cd 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -484,11 +484,6 @@ static inline QemuOpts *vnc_parse(const char > *str, Error **errp) > error_setg(errp, "VNC support is disabled"); > return NULL; > } > -static inline int vnc_init_func(void *opaque, QemuOpts *opts, Error > **errp) > -{ > - error_setg(errp, "VNC support is disabled"); > - return -1; > -} > #endif Looking at a663fbd9e2f65fae81018d81f231ad79510cf9fb. Guess we want fix qemu_opts_foreach to not barf on NULL, then revert that commit, so f8c75b2486 (adding Eduardo to Cc) works as intended. Beside that: The inline for vnc_init_func looks pointless (it's used via function pointer). Also it can be empty as it will never be actually called. Which is fine, vnc_parse will throw an error if someone tries to use vnc with a binary without vnc support. cheers, Gerd
On Wed, Aug 23, 2017 at 05:07:12PM +0200, Gerd Hoffmann wrote: > On Thu, 2017-08-17 at 10:56 +0200, Markus Armbruster wrote: > > Gerd, can we delete the vnc_init_func() stub? Things still compile > > for > > me when I do. > > > > diff --git a/include/ui/console.h b/include/ui/console.h > > index 7262bef..2c3b2cd 100644 > > --- a/include/ui/console.h > > +++ b/include/ui/console.h > > @@ -484,11 +484,6 @@ static inline QemuOpts *vnc_parse(const char > > *str, Error **errp) > > error_setg(errp, "VNC support is disabled"); > > return NULL; > > } > > -static inline int vnc_init_func(void *opaque, QemuOpts *opts, Error > > **errp) > > -{ > > - error_setg(errp, "VNC support is disabled"); > > - return -1; > > -} > > #endif > > Looking at a663fbd9e2f65fae81018d81f231ad79510cf9fb. Guess we want fix > qemu_opts_foreach to not barf on NULL, then revert that commit, so > f8c75b2486 (adding Eduardo to Cc) works as intended. I agree with that plan, but I wouldn't mind having the stub removed in the meantime. > > Beside that: The inline for vnc_init_func looks pointless (it's used > via function pointer). Also it can be empty as it will never be > actually called. Which is fine, vnc_parse will throw an error if > someone tries to use vnc with a binary without vnc support. True.
diff --git a/include/ui/console.h b/include/ui/console.h index 7262bef..2c3b2cd 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -484,11 +484,6 @@ static inline QemuOpts *vnc_parse(const char *str, Error **errp) error_setg(errp, "VNC support is disabled"); return NULL; } -static inline int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) -{ - error_setg(errp, "VNC support is disabled"); - return -1; -} #endif /* curses.c */