[PATCH v2 2/6] virsh: add support for VIR_DOMAIN_CONSOLE_FORCE flag

[Peter Krempa <pkrempa@xxxxxxxxxx>]

This patch adds support for the newly introduced VIR_DOMAIN_CONSOLE
flag. 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. The behaviour to this point was, that the
daemon openend two streams to the console, that competed for data from
the pipe and the result was, that both of the consoles ended up
scrambled.

* 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
---
 tools/console.c |    5 +++--
 tools/console.h |    3 ++-
 tools/virsh.c   |   18 +++++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/console.c b/tools/console.c
index e6118a0..475fd7b 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -297,7 +297,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;
@@ -351,7 +352,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 8cca08f..2b5440c 100644
--- 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 d02be5c..985bed0 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -787,11 +787,14 @@ 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)")},
     {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;
@@ -808,7 +811,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);
-    if (vshRunConsole(dom, name, ctl->escapeChar) == 0)
+    if (vshRunConsole(dom, name, ctl->escapeChar, flags) == 0)
         ret = true;

  cleanup:
@@ -821,6 +824,8 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainPtr dom;
     bool ret = false;
+    bool force = vshCommandOptBool(cmd, "force");
+    unsigned int flags = 0;
     const char *name = NULL;

     if (!vshConnectionUsability(ctl, ctl->conn))
@@ -834,7 +839,10 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }

-    ret = cmdRunConsole(ctl, dom, name);
+    if (force)
+        flags = VIR_DOMAIN_CONSOLE_FORCE;
+
+    ret = cmdRunConsole(ctl, dom, name, flags);

 cleanup:
     virDomainFree(dom);
@@ -1851,7 +1859,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 {
@@ -2174,7 +2182,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

-- 
1.7.3.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list