Re: [Spice-devel] [PATCH spice-gtk] RFC: build-sys: remove the spice-controller library

2017-06-19 Thread Jeremy White 
On 06/14/2017 03:46 PM, Marc-André Lureau wrote:
> Hi Jeremy
> 
> - Original Message -
>> On 06/14/2017 02:55 PM, marcandre.lur...@redhat.com wrote:
>>> From: Marc-André Lureau 
>>>
>>> The spice-controller was a small library to let NPAPI browser plugins
>>> communicate with the spice client. Due to usage of vala, the library
>>> could not promise ABI stability, and was also considerer a pretty
>>> poor implementation.
>>>
>>> Furthermore, major browser vendors began to phase out NPAPI support in
>>> 2013, and some would like to see it gone by the end of this
>>> year (realistically, it may not happen though).
>>>
>>> As an alternative, remote-viewer (the first class Spice client)
>>> learned to connect with a file of mime type application/x-virt-viewer,
>>> as early as February 2013 with v0.5.5.
>>>
>>> RFC as we may want to have another release with the controller, and
>>> announce it's the last one that will ship it - remote-viewer should
>>> follow with a similar announcement.
>>
>> The spice controller also provides the ability for an application to
>> securely pass a username and password in via the controller socket.
> 
> The password should be a one time / short lived token when used with .vv file.
> And if it is sent over a network it should be sent over a secured mean (https 
> for ex)
> 
>> The use of a file would have potential risk vectors.  Is there an option
>> to provide that facility?
> 
> I don't see much alternative. Do you a other proposal?
> 

I think my use case simply requires the ability to pass the pass word in
a way that cannot be intercepted by any kind of hook; whether it be
wireshark, or an inotify hook.  A unix domain socket that can receive
the password would suffice, I believe.

Cheers,

Jeremy
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-server v4] gitignore: Reduce html files exclusion

2017-06-19 Thread Frediano Ziglio 
Limit html files ignored only to autogenerated ones.
Can happen that you are working on some html files on your main
spice-server directory and it's not desirable to ignore them.
For instance this can happen if you download a patch from patchwork.

Signed-off-by: Frediano Ziglio 
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Changes since v3:
- better filter for autogenerated files.

Changes since v2:
- better comment.

diff --git a/.gitignore b/.gitignore
index cac10f9..25db761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.tar.bz2
 *.tar.gz
 *.pyc
-*.html
 aclocal.m4
 autom4te.cache
 compile
@@ -35,6 +34,7 @@ INSTALL
 .tarball-version
 docs/manual/manual.chunked/
 docs/manual/manual.html
+docs/spice_style.html
 .dirstamp
 .deps
 .libs
-- 
2.9.4

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server v2] gitignore: Reduce html files exclusion

2017-06-19 Thread Uri Lublin 

On 06/19/2017 01:28 PM, Frediano Ziglio wrote:


On 06/19/2017 09:40 AM, Pavel Grunt wrote:

Hi,

On Sun, 2017-06-18 at 05:06 -0400, Frediano Ziglio wrote:

ping


no reply to Uri's questions?


Specifically, it's not clear why not ignore all .html files.



Because html files are common and you want to ignore only
autogenerated one.


That's theoretical. Practically, there are no such html files in
spice-server.

I do not mind that much about the patch itself, but it would be
nice if you change the log message to say that you only want to
block generated files.








- Original Message -

From: "Uri Lublin" 
To: "Frediano Ziglio" , spice-de...@lists.free
desktop.org
Sent: Thursday, January 26, 2017 1:22:39 PM
Subject: Re: [Spice-devel] [PATCH spice-server v2] gitignore:
Reduce html files exclusion

On 01/26/2017 12:52 PM, Frediano Ziglio wrote:

ping



Limit the html files ignored.
Can happen that you are working on some html files on your
main
spice-server directory and it's not desirable to ignore them.


Hi Frediano,

How can that happen ?  What html files one may work on ?

I'd add in the commit log that html files under docs/ are still
ignored (be more specific with above "Limit").

Uri.




Signed-off-by: Frediano Ziglio 
---
   .gitignore | 3 +--
   1 file changed, 1 insertion(+), 2 deletions(-)

Changes since v1:
- remove redundant ignore;
- move exclusion to get better order.

diff --git a/.gitignore b/.gitignore
index cac10f9..85f922b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
   *.tar.bz2
   *.tar.gz
   *.pyc
-*.html
   aclocal.m4
   autom4te.cache
   compile
@@ -34,7 +33,7 @@ INSTALL
   .version
   .tarball-version
   docs/manual/manual.chunked/
-docs/manual/manual.html
+docs/**/*.html
   .dirstamp
   .deps
   .libs




___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Marc-André Lureau 


- Original Message -
> On Mon, 2017-06-19 at 10:06 -0400, Frediano Ziglio wrote:
> > Question: can GDK have no X11?
> chances are low but there may be a distro shipping gtk without the x11
> backend
> 
> > I suppose only wayland compiled in?
> or win32 or quartz (macOS).
> 
> The issue I noticed was in egl - which can work with wayland or X11
> 
> Pavel

ok, ack then!
thanks

> 
> > 
> > > 
> > > ---
> > >  src/spice-gtk-session.c |  2 +-
> > >  src/spice-widget-egl.c  | 14 +-
> > >  src/spice-widget.c  |  2 +-
> > >  3 files changed, 15 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> > > index 33db3c8..e338ce6 100644
> > > --- a/src/spice-gtk-session.c
> > > +++ b/src/spice-gtk-session.c
> > > @@ -18,10 +18,10 @@
> > >  #include "config.h"
> > >  
> > >  #include 
> > > +#include 
> > >  
> > >  #ifdef HAVE_X11_XKBLIB_H
> > >  #include 
> > > -#include 
> > >  #endif
> > >  #ifdef GDK_WINDOWING_X11
> > >  #include 
> > > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > > index 7c21113..b50641c 100644
> > > --- a/src/spice-widget-egl.c
> > > +++ b/src/spice-widget-egl.c
> > > @@ -18,6 +18,7 @@
> > >  #include "config.h"
> > >  
> > >  #include 
> > > +#include 
> > >  
> > >  #define EGL_EGLEXT_PROTOTYPES
> > >  #define GL_GLEXT_PROTOTYPES
> > > @@ -27,7 +28,9 @@
> > >  #include "spice-gtk-session-priv.h"
> > >  #include 
> > >  
> > > +#ifdef GDK_WINDOWING_X11
> > >  #include 
> > > +#endif
> > >  #ifdef GDK_WINDOWING_WAYLAND
> > >  #include 
> > >  #endif
> > > @@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError
> > > **err)
> > >  
> > >  g_return_val_if_fail(d->egl.context_ready, FALSE);
> > >  
> > > +#ifdef GDK_WINDOWING_X11
> > >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> > >  EGLBoolean success = eglMakeCurrent(d->egl.display,
> > >  d->egl.surface,
> > > @@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError
> > > **err)
> > >  return FALSE;
> > >  }
> > >  }
> > > +#endif
> > >  #if GTK_CHECK_VERSION(3,16,0)
> > > -else {
> > > +#ifdef GDK_WINDOWING_X11
> > > +else
> > > +#endif
> > > +{
> > >  /* Ignore GLib's too-new warnings */
> > >  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> > >  GtkWidget *area = gtk_stack_get_child_by_name(d->stack,
> > > "gl-area");
> > > @@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > > *display)
> > >  d->egl.prog = 0;
> > >  }
> > >  
> > > +#ifdef GDK_WINDOWING_X11
> > >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> > >  /* egl.surface && egl.ctx are only created on x11, see
> > > spice_egl_init() */
> > > @@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > > *display)
> > >  /* do not call eglterminate() since egl may be used by
> > >   * somebody else code */
> > >  }
> > > +#endif
> > >  }
> > >  
> > >  G_GNUC_INTERNAL
> > > @@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay
> > > *display)
> > >   0, 0, 1, 1);
> > >  }
> > >  
> > > +#ifdef GDK_WINDOWING_X11
> > >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> > >  /* gtk+ does the swap with gtkglarea */
> > >  eglSwapBuffers(d->egl.display, d->egl.surface);
> > >  }
> > > +#endif
> > >  
> > >  glUseProgram(prog);
> > >  }
> > > diff --git a/src/spice-widget.c b/src/spice-widget.c
> > > index 386724d..139510d 100644
> > > --- a/src/spice-widget.c
> > > +++ b/src/spice-widget.c
> > > @@ -19,10 +19,10 @@
> > >  
> > >  #include 
> > >  #include 
> > > +#include 
> > >  
> > >  #ifdef HAVE_X11_XKBLIB_H
> > >  #include 
> > > -#include 
> > >  #endif
> > >  #ifdef GDK_WINDOWING_X11
> > >  #include 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk v2] Unrealize egl display only if it has context

2017-06-19 Thread Marc-André Lureau 
ack

- Original Message -
> Avoids a critical to be logged when closing remote-viewer:
>  "gl_make_current: assertion 'd->egl.context_ready' failed"
> ---
>  src/spice-widget.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/spice-widget.c b/src/spice-widget.c
> index 139510d..c335083 100644
> --- a/src/spice-widget.c
> +++ b/src/spice-widget.c
> @@ -2161,7 +2161,8 @@ static void unrealize(GtkWidget *widget)
>  {
>  spice_cairo_image_destroy(SPICE_DISPLAY(widget));
>  #if HAVE_EGL
> -spice_egl_unrealize_display(SPICE_DISPLAY(widget));
> +if (SPICE_DISPLAY(widget)->priv->egl.context_ready)
> +spice_egl_unrealize_display(SPICE_DISPLAY(widget));
>  #endif
>  
>  GTK_WIDGET_CLASS(spice_display_parent_class)->unrealize(widget);
> --
> 2.13.0
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-gtk v2] Unrealize egl display only if it has context

2017-06-19 Thread Pavel Grunt 
Avoids a critical to be logged when closing remote-viewer:
 "gl_make_current: assertion 'd->egl.context_ready' failed"
---
 src/spice-widget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 139510d..c335083 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -2161,7 +2161,8 @@ static void unrealize(GtkWidget *widget)
 {
 spice_cairo_image_destroy(SPICE_DISPLAY(widget));
 #if HAVE_EGL
-spice_egl_unrealize_display(SPICE_DISPLAY(widget));
+if (SPICE_DISPLAY(widget)->priv->egl.context_ready)
+spice_egl_unrealize_display(SPICE_DISPLAY(widget));
 #endif
 
 GTK_WIDGET_CLASS(spice_display_parent_class)->unrealize(widget);
-- 
2.13.0

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Pavel Grunt 
On Mon, 2017-06-19 at 10:06 -0400, Frediano Ziglio wrote:
> Question: can GDK have no X11?
chances are low but there may be a distro shipping gtk without the x11
backend

> I suppose only wayland compiled in?
or win32 or quartz (macOS).

The issue I noticed was in egl - which can work with wayland or X11

Pavel

> 
> > 
> > ---
> >  src/spice-gtk-session.c |  2 +-
> >  src/spice-widget-egl.c  | 14 +-
> >  src/spice-widget.c  |  2 +-
> >  3 files changed, 15 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> > index 33db3c8..e338ce6 100644
> > --- a/src/spice-gtk-session.c
> > +++ b/src/spice-gtk-session.c
> > @@ -18,10 +18,10 @@
> >  #include "config.h"
> >  
> >  #include 
> > +#include 
> >  
> >  #ifdef HAVE_X11_XKBLIB_H
> >  #include 
> > -#include 
> >  #endif
> >  #ifdef GDK_WINDOWING_X11
> >  #include 
> > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > index 7c21113..b50641c 100644
> > --- a/src/spice-widget-egl.c
> > +++ b/src/spice-widget-egl.c
> > @@ -18,6 +18,7 @@
> >  #include "config.h"
> >  
> >  #include 
> > +#include 
> >  
> >  #define EGL_EGLEXT_PROTOTYPES
> >  #define GL_GLEXT_PROTOTYPES
> > @@ -27,7 +28,9 @@
> >  #include "spice-gtk-session-priv.h"
> >  #include 
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  #include 
> > +#endif
> >  #ifdef GDK_WINDOWING_WAYLAND
> >  #include 
> >  #endif
> > @@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError
> > **err)
> >  
> >  g_return_val_if_fail(d->egl.context_ready, FALSE);
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  EGLBoolean success = eglMakeCurrent(d->egl.display,
> >  d->egl.surface,
> > @@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError
> > **err)
> >  return FALSE;
> >  }
> >  }
> > +#endif
> >  #if GTK_CHECK_VERSION(3,16,0)
> > -else {
> > +#ifdef GDK_WINDOWING_X11
> > +else
> > +#endif
> > +{
> >  /* Ignore GLib's too-new warnings */
> >  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> >  GtkWidget *area = gtk_stack_get_child_by_name(d->stack,
> > "gl-area");
> > @@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > *display)
> >  d->egl.prog = 0;
> >  }
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  /* egl.surface && egl.ctx are only created on x11, see
> > spice_egl_init() */
> > @@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > *display)
> >  /* do not call eglterminate() since egl may be used by
> >   * somebody else code */
> >  }
> > +#endif
> >  }
> >  
> >  G_GNUC_INTERNAL
> > @@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay
> > *display)
> >   0, 0, 1, 1);
> >  }
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  /* gtk+ does the swap with gtkglarea */
> >  eglSwapBuffers(d->egl.display, d->egl.surface);
> >  }
> > +#endif
> >  
> >  glUseProgram(prog);
> >  }
> > diff --git a/src/spice-widget.c b/src/spice-widget.c
> > index 386724d..139510d 100644
> > --- a/src/spice-widget.c
> > +++ b/src/spice-widget.c
> > @@ -19,10 +19,10 @@
> >  
> >  #include 
> >  #include 
> > +#include 
> >  
> >  #ifdef HAVE_X11_XKBLIB_H
> >  #include 
> > -#include 
> >  #endif
> >  #ifdef GDK_WINDOWING_X11
> >  #include 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Pavel Grunt 
Hi,

On Mon, 2017-06-19 at 10:05 -0400, Marc-André Lureau wrote:
> Hi, 
> 
> looks fine, how did you reproduce a build issue and make sure it
> fixed it?
> 
I noticed an "unguarded" usage of GDK_IS_X11_DISPLAY(), so i built
gtk+ enabling only the wayland backend (and add the guards where
needed).

what may not be so obvious, it's needed to add
  #include 
because it contains GDK_WINDOWING_* defines


> - Original Message -
> > ---
> >  src/spice-gtk-session.c |  2 +-
> >  src/spice-widget-egl.c  | 14 +-
> >  src/spice-widget.c  |  2 +-
> >  3 files changed, 15 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> > index 33db3c8..e338ce6 100644
> > --- a/src/spice-gtk-session.c
> > +++ b/src/spice-gtk-session.c
> > @@ -18,10 +18,10 @@
> >  #include "config.h"
> >  
> >  #include 
> > +#include 
> >  
> >  #ifdef HAVE_X11_XKBLIB_H
> >  #include 
> > -#include 
> >  #endif
> >  #ifdef GDK_WINDOWING_X11
> >  #include 
> > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > index 7c21113..b50641c 100644
> > --- a/src/spice-widget-egl.c
> > +++ b/src/spice-widget-egl.c
> > @@ -18,6 +18,7 @@
> >  #include "config.h"
> >  
> >  #include 
> > +#include 
> >  
> >  #define EGL_EGLEXT_PROTOTYPES
> >  #define GL_GLEXT_PROTOTYPES
> > @@ -27,7 +28,9 @@
> >  #include "spice-gtk-session-priv.h"
> >  #include 
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  #include 
> > +#endif
> >  #ifdef GDK_WINDOWING_WAYLAND
> >  #include 
> >  #endif
> > @@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError
> > **err)
> >  
> >  g_return_val_if_fail(d->egl.context_ready, FALSE);
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  EGLBoolean success = eglMakeCurrent(d->egl.display,
> >  d->egl.surface,
> > @@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError
> > **err)
> >  return FALSE;
> >  }
> >  }
> > +#endif
> >  #if GTK_CHECK_VERSION(3,16,0)
> > -else {
> > +#ifdef GDK_WINDOWING_X11
> > +else
> > +#endif
> > +{
> >  /* Ignore GLib's too-new warnings */
> >  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> >  GtkWidget *area = gtk_stack_get_child_by_name(d->stack,
> > "gl-area");
> > @@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > *display)
> >  d->egl.prog = 0;
> >  }
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  /* egl.surface && egl.ctx are only created on x11, see
> > spice_egl_init() */
> > @@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay
> > *display)
> >  /* do not call eglterminate() since egl may be used by
> >   * somebody else code */
> >  }
> > +#endif
> >  }
> >  
> >  G_GNUC_INTERNAL
> > @@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay
> > *display)
> >   0, 0, 1, 1);
> >  }
> >  
> > +#ifdef GDK_WINDOWING_X11
> >  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
> >  /* gtk+ does the swap with gtkglarea */
> >  eglSwapBuffers(d->egl.display, d->egl.surface);
> >  }
> > +#endif
> >  
> >  glUseProgram(prog);
> >  }
> > diff --git a/src/spice-widget.c b/src/spice-widget.c
> > index 386724d..139510d 100644
> > --- a/src/spice-widget.c
> > +++ b/src/spice-widget.c
> > @@ -19,10 +19,10 @@
> >  
> >  #include 
> >  #include 
> > +#include 
> >  
> >  #ifdef HAVE_X11_XKBLIB_H
> >  #include 
> > -#include 
> >  #endif
> >  #ifdef GDK_WINDOWING_X11
> >  #include 
> > --
> > 2.13.0
> > 
> > ___
> > Spice-devel mailing list
> > Spice-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> > 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Frediano Ziglio 
Question: can GDK have no X11?
I suppose only wayland compiled in?

> 
> ---
>  src/spice-gtk-session.c |  2 +-
>  src/spice-widget-egl.c  | 14 +-
>  src/spice-widget.c  |  2 +-
>  3 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> index 33db3c8..e338ce6 100644
> --- a/src/spice-gtk-session.c
> +++ b/src/spice-gtk-session.c
> @@ -18,10 +18,10 @@
>  #include "config.h"
>  
>  #include 
> +#include 
>  
>  #ifdef HAVE_X11_XKBLIB_H
>  #include 
> -#include 
>  #endif
>  #ifdef GDK_WINDOWING_X11
>  #include 
> diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> index 7c21113..b50641c 100644
> --- a/src/spice-widget-egl.c
> +++ b/src/spice-widget-egl.c
> @@ -18,6 +18,7 @@
>  #include "config.h"
>  
>  #include 
> +#include 
>  
>  #define EGL_EGLEXT_PROTOTYPES
>  #define GL_GLEXT_PROTOTYPES
> @@ -27,7 +28,9 @@
>  #include "spice-gtk-session-priv.h"
>  #include 
>  
> +#ifdef GDK_WINDOWING_X11
>  #include 
> +#endif
>  #ifdef GDK_WINDOWING_WAYLAND
>  #include 
>  #endif
> @@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError **err)
>  
>  g_return_val_if_fail(d->egl.context_ready, FALSE);
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  EGLBoolean success = eglMakeCurrent(d->egl.display,
>  d->egl.surface,
> @@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError **err)
>  return FALSE;
>  }
>  }
> +#endif
>  #if GTK_CHECK_VERSION(3,16,0)
> -else {
> +#ifdef GDK_WINDOWING_X11
> +else
> +#endif
> +{
>  /* Ignore GLib's too-new warnings */
>  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
>  GtkWidget *area = gtk_stack_get_child_by_name(d->stack, "gl-area");
> @@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>  d->egl.prog = 0;
>  }
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  /* egl.surface && egl.ctx are only created on x11, see
> spice_egl_init() */
> @@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>  /* do not call eglterminate() since egl may be used by
>   * somebody else code */
>  }
> +#endif
>  }
>  
>  G_GNUC_INTERNAL
> @@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay *display)
>   0, 0, 1, 1);
>  }
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  /* gtk+ does the swap with gtkglarea */
>  eglSwapBuffers(d->egl.display, d->egl.surface);
>  }
> +#endif
>  
>  glUseProgram(prog);
>  }
> diff --git a/src/spice-widget.c b/src/spice-widget.c
> index 386724d..139510d 100644
> --- a/src/spice-widget.c
> +++ b/src/spice-widget.c
> @@ -19,10 +19,10 @@
>  
>  #include 
>  #include 
> +#include 
>  
>  #ifdef HAVE_X11_XKBLIB_H
>  #include 
> -#include 
>  #endif
>  #ifdef GDK_WINDOWING_X11
>  #include 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Marc-André Lureau 
Hi, 

looks fine, how did you reproduce a build issue and make sure it fixed it?

- Original Message -
> ---
>  src/spice-gtk-session.c |  2 +-
>  src/spice-widget-egl.c  | 14 +-
>  src/spice-widget.c  |  2 +-
>  3 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> index 33db3c8..e338ce6 100644
> --- a/src/spice-gtk-session.c
> +++ b/src/spice-gtk-session.c
> @@ -18,10 +18,10 @@
>  #include "config.h"
>  
>  #include 
> +#include 
>  
>  #ifdef HAVE_X11_XKBLIB_H
>  #include 
> -#include 
>  #endif
>  #ifdef GDK_WINDOWING_X11
>  #include 
> diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> index 7c21113..b50641c 100644
> --- a/src/spice-widget-egl.c
> +++ b/src/spice-widget-egl.c
> @@ -18,6 +18,7 @@
>  #include "config.h"
>  
>  #include 
> +#include 
>  
>  #define EGL_EGLEXT_PROTOTYPES
>  #define GL_GLEXT_PROTOTYPES
> @@ -27,7 +28,9 @@
>  #include "spice-gtk-session-priv.h"
>  #include 
>  
> +#ifdef GDK_WINDOWING_X11
>  #include 
> +#endif
>  #ifdef GDK_WINDOWING_WAYLAND
>  #include 
>  #endif
> @@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError **err)
>  
>  g_return_val_if_fail(d->egl.context_ready, FALSE);
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  EGLBoolean success = eglMakeCurrent(d->egl.display,
>  d->egl.surface,
> @@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError **err)
>  return FALSE;
>  }
>  }
> +#endif
>  #if GTK_CHECK_VERSION(3,16,0)
> -else {
> +#ifdef GDK_WINDOWING_X11
> +else
> +#endif
> +{
>  /* Ignore GLib's too-new warnings */
>  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
>  GtkWidget *area = gtk_stack_get_child_by_name(d->stack, "gl-area");
> @@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>  d->egl.prog = 0;
>  }
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  /* egl.surface && egl.ctx are only created on x11, see
> spice_egl_init() */
> @@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>  /* do not call eglterminate() since egl may be used by
>   * somebody else code */
>  }
> +#endif
>  }
>  
>  G_GNUC_INTERNAL
> @@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay *display)
>   0, 0, 1, 1);
>  }
>  
> +#ifdef GDK_WINDOWING_X11
>  if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
>  /* gtk+ does the swap with gtkglarea */
>  eglSwapBuffers(d->egl.display, d->egl.surface);
>  }
> +#endif
>  
>  glUseProgram(prog);
>  }
> diff --git a/src/spice-widget.c b/src/spice-widget.c
> index 386724d..139510d 100644
> --- a/src/spice-widget.c
> +++ b/src/spice-widget.c
> @@ -19,10 +19,10 @@
>  
>  #include 
>  #include 
> +#include 
>  
>  #ifdef HAVE_X11_XKBLIB_H
>  #include 
> -#include 
>  #endif
>  #ifdef GDK_WINDOWING_X11
>  #include 
> --
> 2.13.0
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-gtk] Allow to build without X11 gdk backend

2017-06-19 Thread Pavel Grunt 
---
 src/spice-gtk-session.c |  2 +-
 src/spice-widget-egl.c  | 14 +-
 src/spice-widget.c  |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
index 33db3c8..e338ce6 100644
--- a/src/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
@@ -18,10 +18,10 @@
 #include "config.h"
 
 #include 
+#include 
 
 #ifdef HAVE_X11_XKBLIB_H
 #include 
-#include 
 #endif
 #ifdef GDK_WINDOWING_X11
 #include 
diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index 7c21113..b50641c 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -18,6 +18,7 @@
 #include "config.h"
 
 #include 
+#include 
 
 #define EGL_EGLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
@@ -27,7 +28,9 @@
 #include "spice-gtk-session-priv.h"
 #include 
 
+#ifdef GDK_WINDOWING_X11
 #include 
+#endif
 #ifdef GDK_WINDOWING_WAYLAND
 #include 
 #endif
@@ -291,6 +294,7 @@ gl_make_current(SpiceDisplay *display, GError **err)
 
 g_return_val_if_fail(d->egl.context_ready, FALSE);
 
+#ifdef GDK_WINDOWING_X11
 if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
 EGLBoolean success = eglMakeCurrent(d->egl.display,
 d->egl.surface,
@@ -303,8 +307,12 @@ gl_make_current(SpiceDisplay *display, GError **err)
 return FALSE;
 }
 }
+#endif
 #if GTK_CHECK_VERSION(3,16,0)
-else {
+#ifdef GDK_WINDOWING_X11
+else
+#endif
+{
 /* Ignore GLib's too-new warnings */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 GtkWidget *area = gtk_stack_get_child_by_name(d->stack, "gl-area");
@@ -402,6 +410,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
 d->egl.prog = 0;
 }
 
+#ifdef GDK_WINDOWING_X11
 if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
 /* egl.surface && egl.ctx are only created on x11, see
spice_egl_init() */
@@ -422,6 +431,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
 /* do not call eglterminate() since egl may be used by
  * somebody else code */
 }
+#endif
 }
 
 G_GNUC_INTERNAL
@@ -619,10 +629,12 @@ void spice_egl_update_display(SpiceDisplay *display)
  0, 0, 1, 1);
 }
 
+#ifdef GDK_WINDOWING_X11
 if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
 /* gtk+ does the swap with gtkglarea */
 eglSwapBuffers(d->egl.display, d->egl.surface);
 }
+#endif
 
 glUseProgram(prog);
 }
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 386724d..139510d 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -19,10 +19,10 @@
 
 #include 
 #include 
+#include 
 
 #ifdef HAVE_X11_XKBLIB_H
 #include 
-#include 
 #endif
 #ifdef GDK_WINDOWING_X11
 #include 
-- 
2.13.0

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [qxl] qxl: call provider init

2017-06-19 Thread Christophe Fergeau 
I've now pushed this upstream.

Christophe

On Mon, Jun 19, 2017 at 12:08:33PM +0200, Christophe Fergeau wrote:
> From: Dave Airlie 
> 
> This prevents crashes when multiple QXL devices are configured in a VM.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1428340
> ---
>  src/qxl_drmmode.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/qxl_drmmode.c b/src/qxl_drmmode.c
> index ff164cd..a2f84b1 100644
> --- a/src/qxl_drmmode.c
> +++ b/src/qxl_drmmode.c
> @@ -938,6 +938,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr 
> drmmode, int cpp)
>   for (i = 0; i < drmmode->mode_res->count_connectors; i++)
>   drmmode_output_init(pScrn, drmmode, i);
>  
> +#if XF86_CRTC_VERSION >= 5
> + xf86ProviderSetup(pScrn, NULL, "qxl");
> +#endif
>   xf86InitialConfiguration(pScrn, TRUE);
>  
>   return TRUE;
> -- 
> 2.13.0
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel


signature.asc
Description: PGP signature
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Marc-André Lureau 
Hi

- Original Message -
> On Mon, 2017-06-19 at 06:00 -0400, Marc-André Lureau wrote:
> > 
> > - Original Message -
> > > 
> > > 
> > > - Original Message -
> > > > Avoids a critical to be logged when closing remote-viewer:
> > > >  "gl_make_current: assertion 'd->egl.context_ready' failed"
> > > 
> > > ack, thanks
> > 
> > actually, why not check egl.context_ready?
> 
> In which cases you want to test the precondition added in
> 422572c37793bf6141bc58d441bcda37090c74f3 ?

Yes, and as Victor suggested, you can do the check at the caller location.

> 
> >  (you might be switch back to 2d, and still have egl context to
> > clean up)
> 
> Yes. (btw I am not sure the switch's worked - eg in rebooting)

It used to work. It shouldn't be hard to check, with qemu <2.8 release iirc.

> 
> Pavel
> > 
> > > 
> > > > ---
> > > >  src/spice-widget-egl.c | 3 +++
> > > >  1 file changed, 3 insertions(+)
> > > > 
> > > > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > > > index 7c21113..5951ae6 100644
> > > > --- a/src/spice-widget-egl.c
> > > > +++ b/src/spice-widget-egl.c
> > > > @@ -374,6 +374,9 @@ void
> > > > spice_egl_unrealize_display(SpiceDisplay *display)
> > > >  
> > > >  DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
> > > >  
> > > > +if (!d->egl.enabled)
> > > > +return;
> > > > +
> > > >  if (!gl_make_current(display, NULL))
> > > >  return;
> > > >  
> > > > --
> > > > 2.13.0
> > > > 
> > > > ___
> > > > Spice-devel mailing list
> > > > Spice-devel@lists.freedesktop.org
> > > > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> > > > 
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Pavel Grunt 
On Mon, 2017-06-19 at 06:00 -0400, Marc-André Lureau wrote:
> 
> - Original Message -
> > 
> > 
> > - Original Message -
> > > Avoids a critical to be logged when closing remote-viewer:
> > >  "gl_make_current: assertion 'd->egl.context_ready' failed"
> > 
> > ack, thanks
> 
> actually, why not check egl.context_ready?

In which cases you want to test the precondition added in
422572c37793bf6141bc58d441bcda37090c74f3 ?

>  (you might be switch back to 2d, and still have egl context to
> clean up)

Yes. (btw I am not sure the switch's worked - eg in rebooting)

Pavel
> 
> > 
> > > ---
> > >  src/spice-widget-egl.c | 3 +++
> > >  1 file changed, 3 insertions(+)
> > > 
> > > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > > index 7c21113..5951ae6 100644
> > > --- a/src/spice-widget-egl.c
> > > +++ b/src/spice-widget-egl.c
> > > @@ -374,6 +374,9 @@ void
> > > spice_egl_unrealize_display(SpiceDisplay *display)
> > >  
> > >  DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
> > >  
> > > +if (!d->egl.enabled)
> > > +return;
> > > +
> > >  if (!gl_make_current(display, NULL))
> > >  return;
> > >  
> > > --
> > > 2.13.0
> > > 
> > > ___
> > > Spice-devel mailing list
> > > Spice-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> > > 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] unplug USB Device, guest Desktop will unresponsive

2017-06-19 Thread Christophe Fergeau 
On Mon, Jun 12, 2017 at 05:44:45PM +0800, leaboy wrote:
> hi, everyone.
> when I unplug a USB Storage from client machine,  the guest desktop 
> will unresponsive at thus case:
> 
> 1. the USB Storage device with 16G or 32G has redir to the guest desktop, and 
> coping some big file.
> then unplug the USB Storage device from the client machine.
> 
> 2. when the USB Storage device is being identified in the guest os, then 
> unplug from the client machine.
> 
> 3. when the guest is check on the auto_redir, then plugin and unplug the USB 
> Storage Device frequently.
> 
> 
> I don’t know whether the patch code is correct, but the desktop not 
> unresponsive at upon cases.
> 
> I debugged the code, when into coroutine_yield and the device is
> unplugged, sometimes, this usbredir-channel will not be unlocked.

More specifically (I'd add these details to the commit log), when an
error occurs, we queue a call to device_error in an idle, and switch to
the main context. device_error() calls
spice_usbredir_channel_disconnect_device() which needs the channel to be
unlocked as it calls spice_usbredir_channel_lock().
The current code deadlocks when a USB error occurs, releasing the
channel lock before the idle is called fixes this problem.

Thanks for the patch,

Christophe

> 
> 
> diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
> index fef62ce..1f791bc 100644
> --- a/src/channel-usbredir.c
> +++ b/src/channel-usbredir.c
> @@ -927,15 +927,16 @@ static void usbredir_handle_msg(SpiceChannel *c, 
> SpiceMsgIn *in)
>  err_data.caller = coroutine_self();
>  err_data.spice_device = g_boxed_copy(spice_usb_device_get_type(), 
> spice_device);
>  err_data.error = err;
> +spice_usbredir_channel_unlock(channel);
>  g_idle_add(device_error, _data);
>  coroutine_yield(NULL);
>  
>  g_boxed_free(spice_usb_device_get_type(), err_data.spice_device);
>  
>  g_error_free(err);
> +} else {
> +spice_usbredir_channel_unlock(channel);
>  }
> -
> -spice_usbredir_channel_unlock(channel);
>  }
>  
>  #endif /* USE_USBREDIR */
> 

> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel



signature.asc
Description: PGP signature
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server v2] gitignore: Reduce html files exclusion

2017-06-19 Thread Frediano Ziglio 
> 
> On 06/19/2017 09:40 AM, Pavel Grunt wrote:
> > Hi,
> > 
> > On Sun, 2017-06-18 at 05:06 -0400, Frediano Ziglio wrote:
> >> ping
> > 
> > no reply to Uri's questions?
> 
> Specifically, it's not clear why not ignore all .html files.
> 
> Uri.
> 

Because html files are common and you want to ignore only
autogenerated one.

> > 
> >>
> >> - Original Message -
> >>> From: "Uri Lublin" 
> >>> To: "Frediano Ziglio" , spice-de...@lists.free
> >>> desktop.org
> >>> Sent: Thursday, January 26, 2017 1:22:39 PM
> >>> Subject: Re: [Spice-devel] [PATCH spice-server v2] gitignore:
> >>> Reduce html files exclusion
> >>>
> >>> On 01/26/2017 12:52 PM, Frediano Ziglio wrote:
>  ping
> 
> >
> > Limit the html files ignored.
> > Can happen that you are working on some html files on your
> > main
> > spice-server directory and it's not desirable to ignore them.
> >>>
> >>> Hi Frediano,
> >>>
> >>> How can that happen ?  What html files one may work on ?
> >>>
> >>> I'd add in the commit log that html files under docs/ are still
> >>> ignored (be more specific with above "Limit").
> >>>
> >>> Uri.
> >>>
> >>>
> >
> > Signed-off-by: Frediano Ziglio 
> > ---
> >   .gitignore | 3 +--
> >   1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > Changes since v1:
> > - remove redundant ignore;
> > - move exclusion to get better order.
> >
> > diff --git a/.gitignore b/.gitignore
> > index cac10f9..85f922b 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -4,7 +4,6 @@
> >   *.tar.bz2
> >   *.tar.gz
> >   *.pyc
> > -*.html
> >   aclocal.m4
> >   autom4te.cache
> >   compile
> > @@ -34,7 +33,7 @@ INSTALL
> >   .version
> >   .tarball-version
> >   docs/manual/manual.chunked/
> > -docs/manual/manual.html
> > +docs/**/*.html
> >   .dirstamp
> >   .deps
> >   .libs
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [qxl] qxl: call provider init

2017-06-19 Thread Christophe Fergeau 
From: Dave Airlie 

This prevents crashes when multiple QXL devices are configured in a VM.

https://bugzilla.redhat.com/show_bug.cgi?id=1428340
---
 src/qxl_drmmode.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/qxl_drmmode.c b/src/qxl_drmmode.c
index ff164cd..a2f84b1 100644
--- a/src/qxl_drmmode.c
+++ b/src/qxl_drmmode.c
@@ -938,6 +938,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr 
drmmode, int cpp)
for (i = 0; i < drmmode->mode_res->count_connectors; i++)
drmmode_output_init(pScrn, drmmode, i);
 
+#if XF86_CRTC_VERSION >= 5
+   xf86ProviderSetup(pScrn, NULL, "qxl");
+#endif
xf86InitialConfiguration(pScrn, TRUE);
 
return TRUE;
-- 
2.13.0

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Victor Toso 
Hi,

On Mon, Jun 19, 2017 at 11:50:45AM +0200, Pavel Grunt wrote:
> Avoids a critical to be logged when closing remote-viewer:
>  "gl_make_current: assertion 'd->egl.context_ready' failed"
> ---
>  src/spice-widget-egl.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> index 7c21113..5951ae6 100644
> --- a/src/spice-widget-egl.c
> +++ b/src/spice-widget-egl.c
> @@ -374,6 +374,9 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>
>  DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
>
> +if (!d->egl.enabled)
> +return;
> +

Although your patch is fine, spice_egl_unrealize_display() should not be
called, I think. Maybe use egl_enabled(d) before
spice_egl_unrealize_display() on spice-widget as well?

Cheers,


>  if (!gl_make_current(display, NULL))
>  return;
>  
> -- 
> 2.13.0
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel


signature.asc
Description: PGP signature
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Marc-André Lureau 


- Original Message -
> 
> 
> - Original Message -
> > Avoids a critical to be logged when closing remote-viewer:
> >  "gl_make_current: assertion 'd->egl.context_ready' failed"
> 
> ack, thanks

actually, why not check egl.context_ready? (you might be switch back to 2d, and 
still have egl context to clean up)

> 
> > ---
> >  src/spice-widget-egl.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> > index 7c21113..5951ae6 100644
> > --- a/src/spice-widget-egl.c
> > +++ b/src/spice-widget-egl.c
> > @@ -374,6 +374,9 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
> >  
> >  DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
> >  
> > +if (!d->egl.enabled)
> > +return;
> > +
> >  if (!gl_make_current(display, NULL))
> >  return;
> >  
> > --
> > 2.13.0
> > 
> > ___
> > Spice-devel mailing list
> > Spice-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> > 
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server v2] gitignore: Reduce html files exclusion

2017-06-19 Thread Uri Lublin 

On 06/19/2017 09:40 AM, Pavel Grunt wrote:

Hi,

On Sun, 2017-06-18 at 05:06 -0400, Frediano Ziglio wrote:

ping


no reply to Uri's questions?


Specifically, it's not clear why not ignore all .html files.

Uri.





- Original Message -

From: "Uri Lublin" 
To: "Frediano Ziglio" , spice-de...@lists.free
desktop.org
Sent: Thursday, January 26, 2017 1:22:39 PM
Subject: Re: [Spice-devel] [PATCH spice-server v2] gitignore:
Reduce html files exclusion

On 01/26/2017 12:52 PM, Frediano Ziglio wrote:

ping



Limit the html files ignored.
Can happen that you are working on some html files on your
main
spice-server directory and it's not desirable to ignore them.


Hi Frediano,

How can that happen ?  What html files one may work on ?

I'd add in the commit log that html files under docs/ are still
ignored (be more specific with above "Limit").

Uri.




Signed-off-by: Frediano Ziglio 
---
  .gitignore | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

Changes since v1:
- remove redundant ignore;
- move exclusion to get better order.

diff --git a/.gitignore b/.gitignore
index cac10f9..85f922b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
  *.tar.bz2
  *.tar.gz
  *.pyc
-*.html
  aclocal.m4
  autom4te.cache
  compile
@@ -34,7 +33,7 @@ INSTALL
  .version
  .tarball-version
  docs/manual/manual.chunked/
-docs/manual/manual.html
+docs/**/*.html
  .dirstamp
  .deps
  .libs


___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel






___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel


___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Marc-André Lureau 


- Original Message -
> Avoids a critical to be logged when closing remote-viewer:
>  "gl_make_current: assertion 'd->egl.context_ready' failed"

ack, thanks

> ---
>  src/spice-widget-egl.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
> index 7c21113..5951ae6 100644
> --- a/src/spice-widget-egl.c
> +++ b/src/spice-widget-egl.c
> @@ -374,6 +374,9 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
>  
>  DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
>  
> +if (!d->egl.enabled)
> +return;
> +
>  if (!gl_make_current(display, NULL))
>  return;
>  
> --
> 2.13.0
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-gtk] Do not unrealize disabled egl

2017-06-19 Thread Pavel Grunt 
Avoids a critical to be logged when closing remote-viewer:
 "gl_make_current: assertion 'd->egl.context_ready' failed"
---
 src/spice-widget-egl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
index 7c21113..5951ae6 100644
--- a/src/spice-widget-egl.c
+++ b/src/spice-widget-egl.c
@@ -374,6 +374,9 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
 
 DISPLAY_DEBUG(display, "egl unrealize %p", d->egl.surface);
 
+if (!d->egl.enabled)
+return;
+
 if (!gl_make_current(display, NULL))
 return;
 
-- 
2.13.0

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-protocol v3] agent: Add new file-xfer statuses

2017-06-19 Thread Pavel Grunt 
On Tue, 2017-06-06 at 23:21 +0200, Jakub Janků wrote:
> Introduce new error statuses to report more info to clients:
> VD_AGENT_FILE_XFER_STATUS_SESSION_LOCKED,
> VD_AGENT_FILE_XFER_STATUS_VDAGENT_NOT_CONNECTED,
> VD_AGENT_FILE_XFER_STATUS_DISABLED
> 
> These are only sent to clients that feature
> VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS capability.

Acked-by: Pavel Grunt 

Thanks!
Pavel

> ---
>  spice/vd_agent.h | 8 +++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/spice/vd_agent.h b/spice/vd_agent.h
> index 2a168d0..7109ede 100644
> --- a/spice/vd_agent.h
> +++ b/spice/vd_agent.h
> @@ -100,6 +100,9 @@ enum {
>  VD_AGENT_FILE_XFER_STATUS_ERROR,
>  VD_AGENT_FILE_XFER_STATUS_SUCCESS,
>  VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE,
> +VD_AGENT_FILE_XFER_STATUS_SESSION_LOCKED,
> +VD_AGENT_FILE_XFER_STATUS_VDAGENT_NOT_CONNECTED,
> +VD_AGENT_FILE_XFER_STATUS_DISABLED,
>  };
>  
>  typedef struct SPICE_ATTR_PACKED VDAgentFileXferStatusMessage {
> @@ -108,8 +111,11 @@ typedef struct SPICE_ATTR_PACKED
> VDAgentFileXferStatusMessage {
> /* Used to send additional data for detailed error messages
>  * to clients with VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS
> capability.
>  * Type of data varies with the result:
> -* result : data type
> +* result : data type (NULL if no data)
>  * VD_AGENT_FILE_XFER_STATUS_NOT_ENOUGH_SPACE : uint64_t
> +* VD_AGENT_FILE_XFER_STATUS_SESSION_LOCKED : NULL
> +* VD_AGENT_FILE_XFER_STATUS_VDAGENT_NOT_CONNECTED : NULL
> +* VD_AGENT_FILE_XFER_STATUS_DISABLED : NULL
>  */
> uint8_t data[0];
>  } VDAgentFileXferStatusMessage;
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server v3] gitignore: Reduce html files exclusion

2017-06-19 Thread Christophe Fergeau 
On Mon, Jun 19, 2017 at 08:15:24AM +0100, Frediano Ziglio wrote:
> Limit html files ignored.  Html files under docs/ are still ignored.
> Can happen that you are working on some html files on your main
> spice-server directory and it's not desirable to ignore them.
> For instance this can happen if you download a patch from patchwork.

I don't think this rationale is really compelling, I could use a very
simiar wording to say that we should not have *.tar.bz2/*.tar.gz in
.gitignore for example, and I don't think we should go out of our way to
support everyone's workflows.
However, in this case since we are only generating .html files in
docs/, it indeed makes sense/makes things clearer to be more specific in
what we are ignoring.

Acked-by: Christophe Fergeau 

Christophe


signature.asc
Description: PGP signature
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-common 0/2] Remove obsolete environment usage

2017-06-19 Thread Frediano Ziglio 
> Hi

> On Tue, Jun 13, 2017 at 5:56 PM Jonathon Jongsma < jjong...@redhat.com >
> wrote:

> > On Tue, 2017-06-13 at 16:53 +0200, Victor Toso wrote:
> 
> > > Hi,
> 
> > >
> 
> > > On Tue, Jun 13, 2017 at 03:47:52PM +0100, Frediano Ziglio wrote:
> 
> > > > Following log discussion and Victor suggestion about removing
> 
> > > > these variable as already enough obsolete and documented
> 
> > > > proposed a patch to remove them.
> 
> > > > Mainly to get some consent and votes.
> 

> > Also note that these env variables (or at least the DEBUG_LEVEL one)
> 
> > only ever worked (partially) on spice-server, and not on spice-gtk,
> 
> > since it only enabled logging for the "Spice" domain.
> 

> > >
> 
> > > +1, it would remove good amount of changes from Marc-André first
> 
> > > patch.
> 
> > > Did not test it yet ;)
> 

> What's the plan? can we move ahead and remove those environment variables or
> delay ? until when ?

> I think those variables create more confusion than help and are mostly there
> for legacy reasons, so I vote for removing them asap.

As far as I understood somebody wants a couple of RHEL stable release which 
could take 2/3 years. 

Frediano 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-common 0/2] Remove obsolete environment usage

2017-06-19 Thread Marc-André Lureau 
Hi

On Tue, Jun 13, 2017 at 5:56 PM Jonathon Jongsma 
wrote:

> On Tue, 2017-06-13 at 16:53 +0200, Victor Toso wrote:
> > Hi,
> >
> > On Tue, Jun 13, 2017 at 03:47:52PM +0100, Frediano Ziglio wrote:
> > > Following log discussion and Victor suggestion about removing
> > > these variable as already enough obsolete and documented
> > > proposed a patch to remove them.
> > > Mainly to get some consent and votes.
>
> Also note that these env variables (or at least the DEBUG_LEVEL one)
> only ever worked (partially) on spice-server, and not on spice-gtk,
> since it only enabled logging for the "Spice" domain.
>
> >
> > +1, it would remove good amount of changes from Marc-André first
> > patch.
> > Did not test it yet ;)
>


What's the plan? can we move ahead and remove those environment variables
or delay ? until when ?

I think those variables create more confusion than help and are mostly
there for legacy reasons, so I vote for removing them asap.


> >
> > >
> > > Frediano Ziglio (2):
> > >   log: remove deprecated SPICE_ABORT_LEVEL support
> > >   log: remove deprecated SPICE_DEBUG_LEVEL support
> > >
> > >  common/log.c | 107 +
> > > --
> > >  tests/test-logging.c |  95 -
> > > 
> > >  2 files changed, 1 insertion(+), 201 deletions(-)
> > >
> > > --
> > > 2.9.4
> > >
> > > ___
> > > Spice-devel mailing list
> > > Spice-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> >
> > ___
> > Spice-devel mailing list
> > Spice-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
>
-- 
Marc-André Lureau
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-common 1/2] log: Forbid the usage of obsolete SPICE_LOG_DOMAIN

2017-06-19 Thread Marc-André Lureau 

Hi

- Original Message -
> As we decided to not use GLib domains do not allow the usage of
> this obsolete macro to use different logging domains.
> Will be replaced by some different categorization.
> 
> Signed-off-by: Frediano Ziglio 
> ---
>  common/log.c |  7 ---
>  common/log.h | 25 -
>  tests/test-logging.c |  2 +-
>  3 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/common/log.c b/common/log.c
> index 92f5bc0..a440ddf 100644
> --- a/common/log.c
> +++ b/common/log.c
> @@ -41,6 +41,8 @@ static int abort_mask = 0;
>  #endif
>  #endif
>  
> +#define SPICE_LOG_DOMAIN "Spice"
> +

I would remove all references to SPICE_LOG_DOMAIN to avoid confusion. I would 
simply use G_LOG_DOMAIN
 
>  typedef enum {
>  SPICE_LOG_LEVEL_ERROR,
>  SPICE_LOG_LEVEL_CRITICAL,
> @@ -182,8 +184,7 @@ static void spice_logv(const char *log_domain,
>  }
>  }
>  
> -void spice_log(const char *log_domain,
> -   GLogLevelFlags log_level,
> +void spice_log(GLogLevelFlags log_level,
> const char *strloc,
> const char *function,
> const char *format,
> @@ -192,6 +193,6 @@ void spice_log(const char *log_domain,
>  va_list args;
>  
>  va_start (args, format);
> -spice_logv (log_domain, log_level, strloc, function, format, args);
> +spice_logv (SPICE_LOG_DOMAIN, log_level, strloc, function, format,
> args);
>  va_end (args);
>  }
> diff --git a/common/log.h b/common/log.h
> index 1ea2313..ed701ca 100644
> --- a/common/log.h
> +++ b/common/log.h
> @@ -27,35 +27,34 @@
>  
>  SPICE_BEGIN_DECLS
>  
> -#ifndef SPICE_LOG_DOMAIN
> -#define SPICE_LOG_DOMAIN "Spice"
> +#ifdef SPICE_LOG_DOMAIN
> +#error Do not use obsolete SPICE_LOG_DOMAIN macro, is currently unused
>  #endif
>  
>  #define SPICE_STRLOC  __FILE__ ":" G_STRINGIFY (__LINE__)
>  
> -void spice_log(const char *log_domain,
> -   GLogLevelFlags log_level,
> +void spice_log(GLogLevelFlags log_level,
> const char *strloc,
> const char *function,
> const char *format,
> -   ...) SPICE_ATTR_PRINTF(5, 6);
> +   ...) SPICE_ATTR_PRINTF(4, 5);
>  
>  #define spice_return_if_fail(x) G_STMT_START {  \
>  if G_LIKELY(x) { } else {   \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC,
> G_STRFUNC, "condition `%s' failed", #x); \
> +spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, G_STRFUNC, "condition
> `%s' failed", #x); \
>  return; \
>  }   \
>  } G_STMT_END
>  
>  #define spice_return_val_if_fail(x, val) G_STMT_START { \
>  if G_LIKELY(x) { } else {   \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC,
> __FUNCTION__, "condition `%s' failed", #x); \
> +spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__,
> "condition `%s' failed", #x); \
>  return (val);   \
>  }   \
>  } G_STMT_END
>  
>  #define spice_warn_if_reached() G_STMT_START {  \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_WARNING, SPICE_STRLOC,
> __FUNCTION__, "should not be reached"); \
> +spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "should not
> be reached"); \
>  } G_STMT_END
>  
>  #define spice_printerr(format, ...) G_STMT_START {  \
> @@ -63,23 +62,23 @@ void spice_log(const char *log_domain,
>  } G_STMT_END
>  
>  #define spice_info(format, ...) G_STMT_START { \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_INFO, SPICE_STRLOC,
> __FUNCTION__, format, ## __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_debug(format, ...) G_STMT_START { \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, SPICE_STRLOC,
> __FUNCTION__, format, ## __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_warning(format, ...) G_STMT_START {   \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_WARNING, SPICE_STRLOC,
> __FUNCTION__, format, ## __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_critical(format, ...) G_STMT_START {
>  \
> -spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC,
> __FUNCTION__, format, ## __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ##
>

Re: [Spice-devel] [PATCH spice-common 2/2] log: Force format in log macro to be a string

2017-06-19 Thread Marc-André Lureau 
Hi

- Original Message -
> Make sure format is a string and not a pointer.
> 
> Signed-off-by: Frediano Ziglio 

Reviewed-by: Marc-André Lureau 

> ---
>  common/log.h | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/common/log.h b/common/log.h
> index ed701ca..c6d260c 100644
> --- a/common/log.h
> +++ b/common/log.h
> @@ -62,23 +62,23 @@ void spice_log(GLogLevelFlags log_level,
>  } G_STMT_END
>  
>  #define spice_info(format, ...) G_STMT_START { \
> -spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, "" format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_debug(format, ...) G_STMT_START { \
> -spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, "" format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_warning(format, ...) G_STMT_START {   \
> -spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "" format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_critical(format, ...) G_STMT_START {
>  \
> -spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, "" format,
> ## __VA_ARGS__); \
>  } G_STMT_END
>  
>  #define spice_error(format, ...) G_STMT_START { \
> -spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, format, ##
> __VA_ARGS__); \
> +spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, "" format, ##
> __VA_ARGS__); \
>  } G_STMT_END
>  
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-common 2/2] log: Force format in log macro to be a string

2017-06-19 Thread Frediano Ziglio 
Make sure format is a string and not a pointer.

Signed-off-by: Frediano Ziglio 
---
 common/log.h | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/log.h b/common/log.h
index ed701ca..c6d260c 100644
--- a/common/log.h
+++ b/common/log.h
@@ -62,23 +62,23 @@ void spice_log(GLogLevelFlags log_level,
 } G_STMT_END
 
 #define spice_info(format, ...) G_STMT_START { \
-spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
+spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, "" format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_debug(format, ...) G_STMT_START { \
-spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
+spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, "" format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_warning(format, ...) G_STMT_START {   \
-spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
+spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "" format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_critical(format, ...) G_STMT_START {  \
-spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
+spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, "" format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_error(format, ...) G_STMT_START { \
-spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
+spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, "" format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_warn_if_fail(x) G_STMT_START {\
-- 
2.9.4

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-common 1/2] log: Forbid the usage of obsolete SPICE_LOG_DOMAIN

2017-06-19 Thread Frediano Ziglio 
As we decided to not use GLib domains do not allow the usage of
this obsolete macro to use different logging domains.
Will be replaced by some different categorization.

Signed-off-by: Frediano Ziglio 
---
 common/log.c |  7 ---
 common/log.h | 25 -
 tests/test-logging.c |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/log.c b/common/log.c
index 92f5bc0..a440ddf 100644
--- a/common/log.c
+++ b/common/log.c
@@ -41,6 +41,8 @@ static int abort_mask = 0;
 #endif
 #endif
 
+#define SPICE_LOG_DOMAIN "Spice"
+
 typedef enum {
 SPICE_LOG_LEVEL_ERROR,
 SPICE_LOG_LEVEL_CRITICAL,
@@ -182,8 +184,7 @@ static void spice_logv(const char *log_domain,
 }
 }
 
-void spice_log(const char *log_domain,
-   GLogLevelFlags log_level,
+void spice_log(GLogLevelFlags log_level,
const char *strloc,
const char *function,
const char *format,
@@ -192,6 +193,6 @@ void spice_log(const char *log_domain,
 va_list args;
 
 va_start (args, format);
-spice_logv (log_domain, log_level, strloc, function, format, args);
+spice_logv (SPICE_LOG_DOMAIN, log_level, strloc, function, format, args);
 va_end (args);
 }
diff --git a/common/log.h b/common/log.h
index 1ea2313..ed701ca 100644
--- a/common/log.h
+++ b/common/log.h
@@ -27,35 +27,34 @@
 
 SPICE_BEGIN_DECLS
 
-#ifndef SPICE_LOG_DOMAIN
-#define SPICE_LOG_DOMAIN "Spice"
+#ifdef SPICE_LOG_DOMAIN
+#error Do not use obsolete SPICE_LOG_DOMAIN macro, is currently unused
 #endif
 
 #define SPICE_STRLOC  __FILE__ ":" G_STRINGIFY (__LINE__)
 
-void spice_log(const char *log_domain,
-   GLogLevelFlags log_level,
+void spice_log(GLogLevelFlags log_level,
const char *strloc,
const char *function,
const char *format,
-   ...) SPICE_ATTR_PRINTF(5, 6);
+   ...) SPICE_ATTR_PRINTF(4, 5);
 
 #define spice_return_if_fail(x) G_STMT_START {  \
 if G_LIKELY(x) { } else {   \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, 
G_STRFUNC, "condition `%s' failed", #x); \
+spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, G_STRFUNC, "condition 
`%s' failed", #x); \
 return; \
 }   \
 } G_STMT_END
 
 #define spice_return_val_if_fail(x, val) G_STMT_START { \
 if G_LIKELY(x) { } else {   \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, 
__FUNCTION__, "condition `%s' failed", #x); \
+spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, "condition 
`%s' failed", #x); \
 return (val);   \
 }   \
 } G_STMT_END
 
 #define spice_warn_if_reached() G_STMT_START {  \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_WARNING, SPICE_STRLOC, 
__FUNCTION__, "should not be reached"); \
+spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "should not be 
reached"); \
 } G_STMT_END
 
 #define spice_printerr(format, ...) G_STMT_START {  \
@@ -63,23 +62,23 @@ void spice_log(const char *log_domain,
 } G_STMT_END
 
 #define spice_info(format, ...) G_STMT_START { \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, 
format, ## __VA_ARGS__); \
+spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_debug(format, ...) G_STMT_START { \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, 
format, ## __VA_ARGS__); \
+spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_warning(format, ...) G_STMT_START {   \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_WARNING, SPICE_STRLOC, 
__FUNCTION__, format, ## __VA_ARGS__); \
+spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_critical(format, ...) G_STMT_START {  \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, 
__FUNCTION__, format, ## __VA_ARGS__); \
+spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_error(format, ...) G_STMT_START { \
-spice_log(SPICE_LOG_DOMAIN, G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, 
format, ## __VA_ARGS__); \
+spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, format, ## 
__VA_ARGS__); \
 } G_STMT_END
 
 #define spice_warn_if_fail(x)

[Spice-devel] [PATCH spice-server v3] gitignore: Reduce html files exclusion

2017-06-19 Thread Frediano Ziglio 
Limit html files ignored.  Html files under docs/ are still ignored.
Can happen that you are working on some html files on your main
spice-server directory and it's not desirable to ignore them.
For instance this can happen if you download a patch from patchwork.

Signed-off-by: Frediano Ziglio 
---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Changes since v2:
- better comment.

diff --git a/.gitignore b/.gitignore
index cac10f9..85f922b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.tar.bz2
 *.tar.gz
 *.pyc
-*.html
 aclocal.m4
 autom4te.cache
 compile
@@ -34,7 +33,7 @@ INSTALL
 .version
 .tarball-version
 docs/manual/manual.chunked/
-docs/manual/manual.html
+docs/**/*.html
 .dirstamp
 .deps
 .libs
-- 
2.9.4

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server v2] gitignore: Reduce html files exclusion

2017-06-19 Thread Pavel Grunt 
Hi,

On Sun, 2017-06-18 at 05:06 -0400, Frediano Ziglio wrote:
> ping

no reply to Uri's questions?

> 
> - Original Message -
> > From: "Uri Lublin" 
> > To: "Frediano Ziglio" , spice-de...@lists.free
> > desktop.org
> > Sent: Thursday, January 26, 2017 1:22:39 PM
> > Subject: Re: [Spice-devel] [PATCH spice-server v2] gitignore:
> > Reduce html files exclusion
> > 
> > On 01/26/2017 12:52 PM, Frediano Ziglio wrote:
> > > ping
> > > 
> > > > 
> > > > Limit the html files ignored.
> > > > Can happen that you are working on some html files on your
> > > > main
> > > > spice-server directory and it's not desirable to ignore them.
> > 
> > Hi Frediano,
> > 
> > How can that happen ?  What html files one may work on ?
> > 
> > I'd add in the commit log that html files under docs/ are still
> > ignored (be more specific with above "Limit").
> > 
> > Uri.
> > 
> > 
> > > > 
> > > > Signed-off-by: Frediano Ziglio 
> > > > ---
> > > >  .gitignore | 3 +--
> > > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > > > 
> > > > Changes since v1:
> > > > - remove redundant ignore;
> > > > - move exclusion to get better order.
> > > > 
> > > > diff --git a/.gitignore b/.gitignore
> > > > index cac10f9..85f922b 100644
> > > > --- a/.gitignore
> > > > +++ b/.gitignore
> > > > @@ -4,7 +4,6 @@
> > > >  *.tar.bz2
> > > >  *.tar.gz
> > > >  *.pyc
> > > > -*.html
> > > >  aclocal.m4
> > > >  autom4te.cache
> > > >  compile
> > > > @@ -34,7 +33,7 @@ INSTALL
> > > >  .version
> > > >  .tarball-version
> > > >  docs/manual/manual.chunked/
> > > > -docs/manual/manual.html
> > > > +docs/**/*.html
> > > >  .dirstamp
> > > >  .deps
> > > >  .libs
> > > 
> > > ___
> > > Spice-devel mailing list
> > > Spice-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> > > 
> > 
> > 
> 
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel