* Unused variables in dbus_call_update_gl
@ 2023-06-29 12:53 BALATON Zoltan
2023-06-29 13:15 ` BALATON Zoltan
0 siblings, 1 reply; 4+ messages in thread
From: BALATON Zoltan @ 2023-06-29 12:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
Hello,
After recent commits I'm now getting:
../ui/dbus-listener.c: In function ‘dbus_call_update_gl’:
../ui/dbus-listener.c:210:26: error: unused variable ‘ddl’ [-Werror=unused-variable]
210 | DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, dcl);
| ^~~
At top level:
../ui/dbus-listener.c:180:13: error: ‘dbus_update_gl_cb’ defined but not used [-Werror=unused-function]
180 | static void dbus_update_gl_cb(GObject *source_object,
| ^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
when compiling on Linux with gcc.
Regards,
BALATON Zoltan
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Unused variables in dbus_call_update_gl 2023-06-29 12:53 Unused variables in dbus_call_update_gl BALATON Zoltan @ 2023-06-29 13:15 ` BALATON Zoltan 2023-06-30 14:31 ` Richard Henderson 0 siblings, 1 reply; 4+ messages in thread From: BALATON Zoltan @ 2023-06-29 13:15 UTC (permalink / raw) To: qemu-devel; +Cc: Marc-André Lureau [-- Attachment #1: Type: text/plain, Size: 1659 bytes --] On Thu, 29 Jun 2023, BALATON Zoltan wrote: > Hello, > > After recent commits I'm now getting: > > ../ui/dbus-listener.c: In function ‘dbus_call_update_gl’: > ../ui/dbus-listener.c:210:26: error: unused variable ‘ddl’ > [-Werror=unused-variable] > 210 | DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, > dcl); > | ^~~ > At top level: > ../ui/dbus-listener.c:180:13: error: ‘dbus_update_gl_cb’ defined but not used > [-Werror=unused-function] > 180 | static void dbus_update_gl_cb(GObject *source_object, > | ^~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors > > when compiling on Linux with gcc. The patch below seems to fix compilation for me but not sure what else would it break. Regards, BALATON Zoltan diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index e10162b279..601c134e09 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -177,6 +177,7 @@ fail: } #endif /* WIN32 */ +#if defined (CONFIG_GBM) || defined (WIN32) static void dbus_update_gl_cb(GObject *source_object, GAsyncResult *res, gpointer user_data) @@ -203,12 +204,14 @@ static void dbus_update_gl_cb(GObject *source_object, graphic_hw_gl_block(ddl->dcl.con, false); g_object_unref(ddl); } +#endif static void dbus_call_update_gl(DisplayChangeListener *dcl, int x, int y, int w, int h) { +#if defined (CONFIG_GBM) || defined (WIN32) DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, dcl); - +#endif trace_dbus_update_gl(x, y, w, h); glFlush(); ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Unused variables in dbus_call_update_gl 2023-06-29 13:15 ` BALATON Zoltan @ 2023-06-30 14:31 ` Richard Henderson 2023-06-30 21:44 ` Marc-André Lureau 0 siblings, 1 reply; 4+ messages in thread From: Richard Henderson @ 2023-06-30 14:31 UTC (permalink / raw) To: BALATON Zoltan, qemu-devel; +Cc: Marc-André Lureau On 6/29/23 15:15, BALATON Zoltan wrote: > On Thu, 29 Jun 2023, BALATON Zoltan wrote: >> Hello, >> >> After recent commits I'm now getting: >> >> ../ui/dbus-listener.c: In function ‘dbus_call_update_gl’: >> ../ui/dbus-listener.c:210:26: error: unused variable ‘ddl’ >> [-Werror=unused-variable] >> 210 | DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, >> dcl); >> | ^~~ >> At top level: >> ../ui/dbus-listener.c:180:13: error: ‘dbus_update_gl_cb’ defined but not used >> [-Werror=unused-function] >> 180 | static void dbus_update_gl_cb(GObject *source_object, >> | ^~~~~~~~~~~~~~~~~ >> cc1: all warnings being treated as errors >> >> when compiling on Linux with gcc. > > The patch below seems to fix compilation for me but not sure what else > would it break. > > Regards, > BALATON Zoltan > > diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c > index e10162b279..601c134e09 100644 > --- a/ui/dbus-listener.c > +++ b/ui/dbus-listener.c > @@ -177,6 +177,7 @@ fail: > } > #endif /* WIN32 */ > > +#if defined (CONFIG_GBM) || defined (WIN32) > static void dbus_update_gl_cb(GObject *source_object, > GAsyncResult *res, > gpointer user_data) > @@ -203,12 +204,14 @@ static void dbus_update_gl_cb(GObject *source_object, > graphic_hw_gl_block(ddl->dcl.con, false); > g_object_unref(ddl); > } > +#endif > > static void dbus_call_update_gl(DisplayChangeListener *dcl, > int x, int y, int w, int h) > { > +#if defined (CONFIG_GBM) || defined (WIN32) > DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, dcl); > - > +#endif > trace_dbus_update_gl(x, y, w, h); > > glFlush(); I'm going to commit this later today unless Marc can immediately suggest something better, to un-break the tree. I really should have done more thorough testing earlier, and not allowed the merge to proceed... Ho hum. r~ ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Unused variables in dbus_call_update_gl 2023-06-30 14:31 ` Richard Henderson @ 2023-06-30 21:44 ` Marc-André Lureau 0 siblings, 0 replies; 4+ messages in thread From: Marc-André Lureau @ 2023-06-30 21:44 UTC (permalink / raw) To: Richard Henderson; +Cc: BALATON Zoltan, qemu-devel [-- Attachment #1: Type: text/plain, Size: 2418 bytes --] Hi Richard On Fri, Jun 30, 2023 at 4:31 PM Richard Henderson < richard.henderson@linaro.org> wrote: > On 6/29/23 15:15, BALATON Zoltan wrote: > > On Thu, 29 Jun 2023, BALATON Zoltan wrote: > >> Hello, > >> > >> After recent commits I'm now getting: > >> > >> ../ui/dbus-listener.c: In function ‘dbus_call_update_gl’: > >> ../ui/dbus-listener.c:210:26: error: unused variable ‘ddl’ > >> [-Werror=unused-variable] > >> 210 | DBusDisplayListener *ddl = container_of(dcl, > DBusDisplayListener, > >> dcl); > >> | ^~~ > >> At top level: > >> ../ui/dbus-listener.c:180:13: error: ‘dbus_update_gl_cb’ defined but > not used > >> [-Werror=unused-function] > >> 180 | static void dbus_update_gl_cb(GObject *source_object, > >> | ^~~~~~~~~~~~~~~~~ > >> cc1: all warnings being treated as errors > >> > >> when compiling on Linux with gcc. > > > > The patch below seems to fix compilation for me but not sure what else > > would it break. > > > > Regards, > > BALATON Zoltan > > > > diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c > > index e10162b279..601c134e09 100644 > > --- a/ui/dbus-listener.c > > +++ b/ui/dbus-listener.c > > @@ -177,6 +177,7 @@ fail: > > } > > #endif /* WIN32 */ > > > > +#if defined (CONFIG_GBM) || defined (WIN32) > > static void dbus_update_gl_cb(GObject *source_object, > > GAsyncResult *res, > > gpointer user_data) > > @@ -203,12 +204,14 @@ static void dbus_update_gl_cb(GObject > *source_object, > > graphic_hw_gl_block(ddl->dcl.con, false); > > g_object_unref(ddl); > > } > > +#endif > > > > static void dbus_call_update_gl(DisplayChangeListener *dcl, > > int x, int y, int w, int h) > > { > > +#if defined (CONFIG_GBM) || defined (WIN32) > > DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, > dcl); > > - > > +#endif > > trace_dbus_update_gl(x, y, w, h); > > > > glFlush(); > > I'm going to commit this later today unless Marc can immediately suggest > something better, > to un-break the tree. I really should have done more thorough testing > earlier, and not > allowed the merge to proceed... Ho hum. > > > Please commit, along with "[PATCH] audio: dbus requires pixman" thanks [-- Attachment #2: Type: text/html, Size: 3232 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-30 21:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-06-29 12:53 Unused variables in dbus_call_update_gl BALATON Zoltan 2023-06-29 13:15 ` BALATON Zoltan 2023-06-30 14:31 ` Richard Henderson 2023-06-30 21:44 ` Marc-André Lureau
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).