From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 1 Sep 2011 11:59:15 +0000 (+0100)
Subject: daemon: Factor out name of virtio serial channel.
X-Git-Tag: 1.12.6~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5f33ec2b98db61bf26d31752a815b4e5e392c1e9;p=libguestfs.git

daemon: Factor out name of virtio serial channel.

This is just code motion.
(cherry picked from commit 73be6db9bf1c0ae96262a5f4fa9328bb4e648637)
---

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index eb1e82b..51bb0b7 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -111,6 +111,9 @@ int autosync_umount = 1;
 /* Not used explicitly, but required by the gnulib 'error' module. */
 const char *program_name = "guestfsd";
 
+/* Name of the virtio-serial channel. */
+#define VIRTIO_SERIAL_CHANNEL "/dev/virtio-ports/org.libguestfs.channel.0"
+
 static void
 usage (void)
 {
@@ -237,8 +240,7 @@ main (int argc, char *argv[])
 #endif
 
   /* Connect to virtio-serial channel. */
-  int sock = open ("/dev/virtio-ports/org.libguestfs.channel.0",
-                   O_RDWR | O_CLOEXEC);
+  int sock = open (VIRTIO_SERIAL_CHANNEL, O_RDWR | O_CLOEXEC);
   if (sock == -1) {
     fprintf (stderr,
              "\n"
@@ -253,7 +255,7 @@ main (int argc, char *argv[])
              "output to the libguestfs developers, either in a bug report\n"
              "or on the libguestfs redhat com mailing list.\n"
              "\n");
-    perror ("/dev/virtio-ports/org.libguestfs.channel.0");
+    perror (VIRTIO_SERIAL_CHANNEL);
     exit (EXIT_FAILURE);
   }