diff --git a/cfg.mk b/cfg.mk
index 9a9616c5ec..f153e312af 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -913,7 +913,7 @@ exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock
exclude_file_name_regexp--sc_avoid_write = \
- ^(src/($(_src1))|daemon/libvirtd|tools/console|tests/($(_test1)))\.c$$
+ ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$
exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a830691ea..aa604fd60a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -213,10 +213,10 @@ src/xenapi/xenapi_driver.c
src/xenapi/xenapi_utils.c
src/xenxs/xen_sxpr.c
src/xenxs/xen_xm.c
-tools/console.c
tools/libvirt-guests.sh.in
tools/virsh.c
tools/virsh.h
+tools/virsh-console.c
tools/virsh-domain-monitor.c
tools/virsh-domain.c
tools/virsh-edit.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4a3338fd3d..d9532dd306 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -169,8 +169,8 @@ virt_login_shell_CFLAGS = \
$(COVERAGE_CFLAGS)
virsh_SOURCES = \
- console.c console.h \
virsh.c virsh.h \
+ virsh-console.c virsh-console.h \
virsh-domain.c virsh-domain.h \
virsh-domain-monitor.c virsh-domain-monitor.h \
virsh-host.c virsh-host.h \
diff --git a/tools/console.c b/tools/virsh-console.c
similarity index 90%
rename from tools/console.c
rename to tools/virsh-console.c
index 6c24fcfa59..9e5d66489f 100644
--- a/tools/console.c
+++ b/tools/virsh-console.c
@@ -1,7 +1,7 @@
/*
- * console.c: A dumb serial console client
+ * virsh-console.c: A dumb serial console client
*
- * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc.
+ * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,8 @@
* License along with this library. If not, see
* .
*
- * Daniel Berrange
+ * Authors:
+ * Daniel Berrange
*/
#include
@@ -37,7 +38,7 @@
# include
# include "internal.h"
-# include "console.h"
+# include "virsh-console.h"
# include "virlog.h"
# include "virfile.h"
# include "viralloc.h"
@@ -58,6 +59,7 @@ struct virConsoleBuffer {
char *data;
};
+
typedef struct virConsole virConsole;
typedef virConsole *virConsolePtr;
struct virConsole {
@@ -75,11 +77,15 @@ struct virConsole {
char escapeChar;
};
+
static int got_signal = 0;
-static void do_signal(int sig ATTRIBUTE_UNUSED) {
+static void
+virConsoleHandleSignal(int sig ATTRIBUTE_UNUSED)
+{
got_signal = 1;
}
+
# ifndef HAVE_CFMAKERAW
static void
cfmakeraw(struct termios *attr)
@@ -93,6 +99,7 @@ cfmakeraw(struct termios *attr)
}
# endif /* !HAVE_CFMAKERAW */
+
static void
virConsoleShutdown(virConsolePtr con)
{
@@ -114,6 +121,21 @@ virConsoleShutdown(virConsolePtr con)
virCondSignal(&con->cond);
}
+
+static void
+virConsoleFree(virConsolePtr con)
+{
+ if (!con)
+ return;
+
+ if (con->st)
+ virStreamFree(con->st);
+ virMutexDestroy(&con->lock);
+ virCondDestroy(&con->cond);
+ VIR_FREE(con);
+}
+
+
static void
virConsoleEventOnStream(virStreamPtr st,
int events, void *opaque)
@@ -171,9 +193,8 @@ virConsoleEventOnStream(virStreamPtr st,
avail = con->terminalToStream.length - con->terminalToStream.offset;
if (avail > 1024) {
- if (VIR_REALLOC_N(con->terminalToStream.data,
- con->terminalToStream.offset + 1024) < 0)
- {}
+ ignore_value(VIR_REALLOC_N(con->terminalToStream.data,
+ con->terminalToStream.offset + 1024));
con->terminalToStream.length = con->terminalToStream.offset + 1024;
}
}
@@ -187,6 +208,7 @@ virConsoleEventOnStream(virStreamPtr st,
}
}
+
static void
virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED,
int fd ATTRIBUTE_UNUSED,
@@ -242,6 +264,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED,
}
}
+
static void
virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED,
int fd,
@@ -270,9 +293,8 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED,
avail = con->streamToTerminal.length - con->streamToTerminal.offset;
if (avail > 1024) {
- if (VIR_REALLOC_N(con->streamToTerminal.data,
- con->streamToTerminal.offset + 1024) < 0)
- {}
+ ignore_value(VIR_REALLOC_N(con->streamToTerminal.data,
+ con->streamToTerminal.offset + 1024));
con->streamToTerminal.length = con->streamToTerminal.offset + 1024;
}
}
@@ -296,6 +318,7 @@ vshGetEscapeChar(const char *s)
return *s;
}
+
int
vshMakeStdinRaw(struct termios *ttyattr, bool report_errors)
{
@@ -322,10 +345,12 @@ vshMakeStdinRaw(struct termios *ttyattr, bool report_errors)
return 0;
}
-int vshRunConsole(virDomainPtr dom,
- const char *dev_name,
- const char *escape_seq,
- unsigned int flags)
+
+int
+vshRunConsole(virDomainPtr dom,
+ const char *dev_name,
+ const char *escape_seq,
+ unsigned int flags)
{
int ret = -1;
struct termios ttyattr;
@@ -348,11 +373,11 @@ int vshRunConsole(virDomainPtr dom,
the original terminal settings on STDIN before the
process exits - people don't like being left with a
messed up terminal ! */
- old_sigquit = signal(SIGQUIT, do_signal);
- old_sigterm = signal(SIGTERM, do_signal);
- old_sigint = signal(SIGINT, do_signal);
- old_sighup = signal(SIGHUP, do_signal);
- old_sigpipe = signal(SIGPIPE, do_signal);
+ old_sigquit = signal(SIGQUIT, virConsoleHandleSignal);
+ old_sigterm = signal(SIGTERM, virConsoleHandleSignal);
+ old_sigint = signal(SIGINT, virConsoleHandleSignal);
+ old_sighup = signal(SIGHUP, virConsoleHandleSignal);
+ old_sigpipe = signal(SIGPIPE, virConsoleHandleSignal);
got_signal = 0;
if (VIR_ALLOC(con) < 0)
@@ -396,15 +421,8 @@ int vshRunConsole(virDomainPtr dom,
ret = 0;
- cleanup:
-
- if (con) {
- if (con->st)
- virStreamFree(con->st);
- virMutexDestroy(&con->lock);
- virCondDestroy(&con->cond);
- VIR_FREE(con);
- }
+cleanup:
+ virConsoleFree(con);
/* Restore original signal handlers */
signal(SIGPIPE, old_sigpipe);
diff --git a/tools/console.h b/tools/virsh-console.h
similarity index 86%
rename from tools/console.h
rename to tools/virsh-console.h
index 46255b82a6..1e3160f0fe 100644
--- a/tools/console.h
+++ b/tools/virsh-console.h
@@ -1,7 +1,7 @@
/*
- * console.c: A dumb serial console client
+ * virsh-console.h: A dumb serial console client
*
- * Copyright (C) 2007, 2010, 2012 Red Hat, Inc.
+ * Copyright (C) 2007, 2010, 2012-2013 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,8 @@
* License along with this library. If not, see
* .
*
- * Daniel Berrange
+ * Authors:
+ * Daniel Berrange
*/
#ifndef __VIR_CONSOLE_H__
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 88bdb52106..9932ce8125 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -41,7 +41,6 @@
#include "virbuffer.h"
#include "c-ctype.h"
#include "conf/domain_conf.h"
-#include "console.h"
#include "viralloc.h"
#include "vircommand.h"
#include "virfile.h"
@@ -50,6 +49,7 @@
#include "virmacaddr.h"
#include "virprocess.h"
#include "virstring.h"
+#include "virsh-console.h"
#include "virsh-domain-monitor.h"
#include "virerror.h"
#include "virtypedparam.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 2f04e6a695..0cc9bdd3b8 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -57,7 +57,6 @@
#include "virerror.h"
#include "base64.h"
#include "virbuffer.h"
-#include "console.h"
#include "viralloc.h"
#include "virxml.h"
#include
@@ -73,6 +72,7 @@
#include "virtypedparam.h"
#include "virstring.h"
+#include "virsh-console.h"
#include "virsh-domain.h"
#include "virsh-domain-monitor.h"
#include "virsh-host.h"