virsh: add support for VIR_DOMAIN_CONSOLE_* flags

This patch adds support for the newly introduced
VIR_DOMAIN_CONSOLE_FORCE and VIR_DOMAIN_CONSOLE_SAFE flags. The console
command now has an optional parameter --force that specifies that the
user wants to forcibly interrupt an ongoing console session and create
a new one. Flag --safe requests that the console should be opened only
if the hypervisor driver supports safe console handling.

The behaviour to this point was that the daemon opened two streams to
the console, that competed for data from the pipe, and the result was
that both of the consoles ended up scrambled.

This patch doesn't modify operation of other commands dealing with
console connections (start, create) as those open connections to newly
started domains making it virtually impossible for another client to race
for the console and steal it.

* tools/console.c:
        - add support for flag passthrough
* tools/console.h:
        - modify function prototypes to match impl.
* tools/virsh.c:
        - add flag --force for the console command

diff --git a/tools/console.c b/tools/console.c
index 4a32522e74c2f41e6525453e51f6767a9abf9cbb..ca226c3356fc958d89e3d300fad11019a12d6f33 100644 (file)
--- a/tools/console.c
+++ b/tools/console.c
@@ -299,7 +299,8 @@ vshGetEscapeChar(const char *s)
 
 int vshRunConsole(virDomainPtr dom,
                   const char *dev_name,
-                  const char *escape_seq)
+                  const char *escape_seq,
+                  unsigned int flags)
 {
     int ret = -1;
     struct termios ttyattr, rawattr;
@@ -353,7 +354,7 @@ int vshRunConsole(virDomainPtr dom,
     if (!con->st)
         goto cleanup;
 
-    if (virDomainOpenConsole(dom, dev_name, con->st, 0) < 0)
+    if (virDomainOpenConsole(dom, dev_name, con->st, flags) < 0)
         goto cleanup;
 
     if (virCondInit(&con->cond) < 0 || virMutexInit(&con->lock) < 0)

diff --git a/tools/console.h b/tools/console.h
index 8cca08fb9f3a40a6eb4ebde2b4a90ea60fd4b464..2b5440c65244bb38bc901d2c399f00e777595503 100644 (file)
--- a/tools/console.h
+++ b/tools/console.h
@@ -27,7 +27,8 @@
 
 int vshRunConsole(virDomainPtr dom,
                   const char *dev_name,
-                  const char *escape_seq);
+                  const char *escape_seq,
+                  unsigned int flags);
 
 # endif /* !WIN32 */
 

diff --git a/tools/virsh.c b/tools/virsh.c
index f5a1cb4339779235a82eac39cf47981ff94e8956..3c085dd5c7357634db962e18fa0f890a2c341b10 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -819,11 +819,17 @@ static const vshCmdInfo info_console[] = {
 static const vshCmdOptDef opts_console[] = {
     {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {"devname", VSH_OT_STRING, 0, N_("character device name")},
+    {"force", VSH_OT_BOOL, 0,
+      N_("force console connection (disconnect already connected sessions)")},
+    {"safe", VSH_OT_BOOL, 0,
+      N_("only connect if safe console handling is supported")},
     {NULL, 0, 0, NULL}
 };
 
 static bool
-cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name)
+cmdRunConsole(vshControl *ctl, virDomainPtr dom,
+              const char *name,
+              unsigned int flags)
 {
     bool ret = false;
     int state;
@@ -846,7 +852,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name)
     vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom));
     vshPrintExtra(ctl, _("Escape character is %s\n"), ctl->escapeChar);
     fflush(stdout);
-    if (vshRunConsole(dom, name, ctl->escapeChar) == 0)
+    if (vshRunConsole(dom, name, ctl->escapeChar, flags) == 0)
         ret = true;
 
  cleanup:
@@ -859,6 +865,9 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainPtr dom;
     bool ret = false;
+    bool force = vshCommandOptBool(cmd, "force");
+    bool safe = vshCommandOptBool(cmd, "safe");
+    unsigned int flags = 0;
     const char *name = NULL;
 
     if (!vshConnectionUsability(ctl, ctl->conn))
@@ -872,7 +881,12 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }
 
-    ret = cmdRunConsole(ctl, dom, name);
+    if (force)
+        flags |= VIR_DOMAIN_CONSOLE_FORCE;
+    if (safe)
+        flags |= VIR_DOMAIN_CONSOLE_SAFE;
+
+    ret = cmdRunConsole(ctl, dom, name, flags);
 
 cleanup:
     virDomainFree(dom);
@@ -2626,7 +2640,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd)
                  virDomainGetName(dom), from);
 #ifndef WIN32
         if (console)
-            cmdRunConsole(ctl, dom, NULL);
+            cmdRunConsole(ctl, dom, NULL, 0);
 #endif
         virDomainFree(dom);
     } else {
@@ -3131,7 +3145,7 @@ started:
     vshPrint(ctl, _("Domain %s started\n"),
              virDomainGetName(dom));
 #ifndef WIN32
-    if (console && !cmdRunConsole(ctl, dom, NULL))
+    if (console && !cmdRunConsole(ctl, dom, NULL, 0))
         goto cleanup;
 #endif
 

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 6f06b16179ff8d826fe8368e9a6b41d17721817d..cb0d9b9cf04f1667543d465e0ec5f7491e14b254 100644 (file)
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -421,13 +421,19 @@ Configure a domain to be automatically started at boot.
 
 The option I<--disable> disables autostarting.
 
-=item B<console> I<domain-id> [I<devname>]
+=item B<console> I<domain-id> [I<devname>] [I<--safe>] [I<--force>]
 
 Connect the virtual serial console for the guest. The optional
 I<devname> parameter refers to the device alias of an alternate
 console, serial or parallel device configured for the guest.
 If omitted, the primary console will be opened.
 
+If the flag I<--safe> is specified, the connection is only attempted
+if the driver supports safe console handling. This flag specifies that
+the server has to ensure exclusive access to console devices. Optionally
+the I<--force> flag may be specified, requesting to disconnect any existing
+sessions, such as in a case of a broken connection.
+
 =item B<create> I<FILE> [I<--console>] [I<--paused>] [I<--autodestroy>]
 
 Create a domain from an XML <file>. An easy way to create the XML