Re: [Spice-devel] [vdagentd] Add an explicit switch to signal fake uinput devices.
On 07/07/2014 09:08 AM, Alon Levy wrote: On 06/23/2014 11:41 PM, Jeremy White wrote: ACK Thanks; note that I don't have push access to vd_agent, so I need someone to do that for me. Cheers, Jeremy ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel
[Spice-devel] [PATCH (v2)] Make sure the child is able to connect to the X server before exiting the mainline.
This allows the vdagent to be used in the Xsetup phase of an xdm session;
otherwise, it's X11 connection fails because of the greeter display grab.
The issue is that we daemonize before attempting the X connection.
We then immediately exit the main process; xdm then goes on to invoke the
greeter which performs an exclusive grab on the X server, so the child
connection fails.
The change is to have the main process wait for up to 10 seconds for an 'all
clear'
message from the client. This lets us return a correct status on a real X
error, as well as letting our child successfully connect to the X server.
Signed-off-by: Jeremy White
---
src/vdagent.c | 50 --
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/vdagent.c b/src/vdagent.c
index d7f7aba..905ff5b 100644
--- a/src/vdagent.c
+++ b/src/vdagent.c
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include "udscs.h"
#include "vdagentd-proto.h"
@@ -151,9 +152,34 @@ static void quit_handler(int sig)
quit = 1;
}
-void daemonize(void)
+/* When we daemonize, it is useful to have the main process
+ wait to make sure the X connection worked. We wait up
+ to 10 seconds to get an 'all clear' from the child
+ before we exit. If we don't, we're able to exit with a
+ status that indicates an error occured */
+void wait_and_exit(int s)
{
-int x, retval = 0;
+char buf[4];
+struct pollfd p;
+p.fd = s;
+p.events = POLLIN;
+
+if (poll(&p, 1, 1) > 0)
+if (read(s, buf, sizeof(buf)) > 0)
+exit(0);
+
+exit(1);
+}
+
+int daemonize(void)
+{
+int x;
+int fd[2];
+
+if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fd)) {
+syslog(LOG_ERR, "socketpair : %s", strerror(errno));
+exit(1);
+}
/* detach from terminal */
switch (fork()) {
@@ -161,13 +187,17 @@ void daemonize(void)
close(0); close(1); close(2);
setsid();
x = open("/dev/null", O_RDWR); x = dup(x); x = dup(x);
-break;
+close(fd[0]);
+return fd[1];
case -1:
syslog(LOG_ERR, "fork: %s", strerror(errno));
-retval = 1;
+exit(1);
default:
-exit(retval);
+close(fd[1]);
+wait_and_exit(fd[0]);
}
+
+return 0;
}
static int file_test(const char *path)
@@ -182,6 +212,7 @@ int main(int argc, char *argv[])
fd_set readfds, writefds;
int c, n, nfds, x11_fd;
int do_daemonize = 1;
+int parent_socket = 0;
int x11_sync = 0;
struct sigaction act;
@@ -236,7 +267,7 @@ int main(int argc, char *argv[])
}
if (do_daemonize)
-daemonize();
+parent_socket = daemonize();
reconnect:
if (version_mismatch) {
@@ -275,6 +306,13 @@ reconnect:
vdagent_file_xfers = vdagent_file_xfers_create(client, fx_dir,
fx_open_dir, debug);
+if (parent_socket) {
+if (write(parent_socket, "OK", 2) != 2)
+syslog(LOG_WARNING, "Parent already gone.");
+close(parent_socket);
+parent_socket = 0;
+}
+
while (client && !quit) {
FD_ZERO(&readfds);
FD_ZERO(&writefds);
--
1.7.10.4
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH] qxl_image.c: fix compilation break
ack
On Wed, Jun 25, 2014 at 1:54 PM, Alon Levy wrote:
> Since 3d511c30206bd8c9a207c436186a03af0bb02962 Xspice building is broken
> due to undefined MAX_RELOCS when not building with XF86DRM_MODE.
> ---
> src/qxl_image.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/src/qxl_image.c b/src/qxl_image.c
> index eb66b63..8927fd4 100644
> --- a/src/qxl_image.c
> +++ b/src/qxl_image.c
> @@ -159,6 +159,7 @@ qxl_image_create (qxl_screen_t *qxl, const uint8_t
> *data,
>
> chunk_size = MAX (512 * 512, dest_stride);
>
> +#ifdef XF86DRM_MODE
> /* ensure we will not create too many pieces and overflow
> * the command buffer (MAX_RELOCS). if so, increase the
> chunk_size.
> * each loop creates at least 2 cmd buffer entries, and
> @@ -170,6 +171,7 @@ qxl_image_create (qxl_screen_t *qxl, const uint8_t
> *data,
> ErrorF ("adjusted chunk_size to %d\n", chunk_size);
> #endif
> }
> +#endif
>
> while (h)
> {
> --
> 1.9.3
>
> ___
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>
--
Marc-André Lureau
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] Spice-devel Digest, Vol 54, Issue 4
How do you starting the vm? qemu?libvirt?ovirt?... If you have already builded spice-gtk with '--enable-usbredir', then check the parameters of qemu, xml of libvirt, or configuration of the vm in ovirt. On Tue, Jul 8, 2014 at 5:10 PM, 力波 王 wrote: > Hi,everyone: > > When I use virtviewer on windows to connect a VM(VM running in > oVirt), > “USB device selection” is disable. Is it support on windows? > Or, how could I resolve it? > > > > ___ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel > ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] Spice-devel Digest, Vol 54, Issue 4
On 07/08/2014 12:10 PM, 力波 王 wrote: > Hi,everyone: > > When I use virtviewer on windows to connect a VM(VM running in oVirt), > “USB device selection” is disable. Is it support on windows? > Or, how could I resolve it? Hi, Does your VM have usb devices for usbredir ? Did you configure spice-gtk with --enable-usbredir ? Uri. ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel
