From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Fri, 13 Nov 2009 18:36:47 +0000 (+0000)
Subject: switcher: Remove the fd from qemu handling system when the input
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=41ff3d294fb2ffc408ec03cd6a18643a0a809935;p=xenclient%2Fioemu-pq.git

switcher: Remove the fd from qemu handling system when the input
        server dies.
---

diff --git a/master/switcher b/master/switcher
index 0a87466..10b4dfa 100644
--- a/master/switcher
+++ b/master/switcher
@@ -11,10 +11,10 @@ index 7883718..0b6214c 100644
  #endif /*QEMU_XEN_H*/
 diff --git a/switcher.c b/switcher.c
 new file mode 100644
-index 0000000..bca96f0
+index 0000000..3cb96cf
 --- /dev/null
 +++ b/switcher.c
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,268 @@
 +/*
 + * QEMU dom0_driver
 + *
@@ -255,6 +255,7 @@ index 0000000..bca96f0
 +    if ((read_sz = recv(switcher_socket, buff + left_over, 128, 0)) <= 0)
 +    {
 +        switcher_connected = 0;
++        qemu_set_fd_handler(switcher_socket, NULL, NULL, NULL);
 +        return;
 +    }
 +    read_sz += left_over;
@@ -283,7 +284,7 @@ index 0000000..bca96f0
 +    switcher_connect(NULL);
 +}
 diff --git a/vl.c b/vl.c
-index a4b8bd8..6350384 100644
+index 93e401c..e5c0447 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -234,6 +234,7 @@ CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
@@ -331,7 +332,7 @@ index a4b8bd8..6350384 100644
  #if defined(CONFIG_XEN) && !defined(CONFIG_DM)
      { "xen-domid", HAS_ARG, QEMU_OPTION_xen_domid },
      { "xen-create", 0, QEMU_OPTION_xen_create },
-@@ -5298,6 +5315,9 @@ int main(int argc, char **argv, char **envp)
+@@ -5299,6 +5316,9 @@ int main(int argc, char **argv, char **envp)
                  cirrus_vga_enabled = 0;
                  vmsvga_enabled = 0;
                  break;
@@ -341,7 +342,7 @@ index a4b8bd8..6350384 100644
              case QEMU_OPTION_direct_pci:
                 direct_pci = optarg;
                  break;
-@@ -6066,6 +6086,9 @@ int main(int argc, char **argv, char **envp)
+@@ -6067,6 +6087,9 @@ int main(int argc, char **argv, char **envp)
          close(fd);
      }