git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.13.26.
[libguestfs.git]
/
daemon
/
guestfsd.c
diff --git
a/daemon/guestfsd.c
b/daemon/guestfsd.c
index
116a6b9
..
51bb0b7
100644
(file)
--- 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";
/* 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)
{
static void
usage (void)
{
@@
-237,8
+240,7
@@
main (int argc, char *argv[])
#endif
/* Connect to virtio-serial channel. */
#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"
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");
"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);
}
exit (EXIT_FAILURE);
}
@@
-689,7
+691,7
@@
commandrvf (char **stdoutput, char **stderror, int flags,
close (stdin_fd[1]);
} else {
/* Set stdin to /dev/null (ignore failure) */
close (stdin_fd[1]);
} else {
/* Set stdin to /dev/null (ignore failure) */
-
open ("/dev/null", O_RDONLY
);
+
ignore_value (open ("/dev/null", O_RDONLY)
);
}
close (so_fd[0]);
close (se_fd[0]);
}
close (so_fd[0]);
close (se_fd[0]);