From d3e6c37f68e7e4573a47b0540f626a2add0d05e4 Mon Sep 17 00:00:00 2001

From: Alon Levy <alevy@redhat.com>

Date: Sun, 18 Mar 2012 13:46:13 +0100

Subject: [PATCH 424/434] qxl: init_pipe_signaling: exit on failure

If pipe creation fails, exit, don't log and continue. Fix indentation at

the same time.

Signed-off-by: Alon Levy <alevy@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/qxl.c |   21 +++++++++++----------

 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c

index 73be115..9ad5807 100644

--- a/hw/qxl.c

+++ b/hw/qxl.c

@@ -1453,16 +1453,17 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)

 static void init_pipe_signaling(PCIQXLDevice *d)

 {

-   if (pipe(d->pipe) < 0) {

-       dprint(d, 1, "%s: pipe creation failed\n", __FUNCTION__);

-       return;

-   }

-   fcntl(d->pipe[0], F_SETFL, O_NONBLOCK);

-   fcntl(d->pipe[1], F_SETFL, O_NONBLOCK);

-   fcntl(d->pipe[0], F_SETOWN, getpid());

-

-   qemu_thread_get_self(&d->main);

-   qemu_set_fd_handler(d->pipe[0], pipe_read, NULL, d);

+    if (pipe(d->pipe) < 0) {

+        fprintf(stderr, "%s:%s: qxl pipe creation failed\n",

+                __FILE__, __func__);

+        exit(1);

+    }

+    fcntl(d->pipe[0], F_SETFL, O_NONBLOCK);

+    fcntl(d->pipe[1], F_SETFL, O_NONBLOCK);

+    fcntl(d->pipe[0], F_SETOWN, getpid());

+

+    qemu_thread_get_self(&d->main);

+    qemu_set_fd_handler(d->pipe[0], pipe_read, NULL, d);

 }

 /* graphics console */

-- 

1.7.10