From c243fc8af6dcf8843f78bd7f5890966396dfd828 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 31 Jul 2013 07:37:09 +0200
Subject: [PATCH] implement 'qm terminal' to open terminal via serial device

---
 control.in |  2 +-
 qm         | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/control.in b/control.in
index e48439dc..40492f15 100644
--- a/control.in
+++ b/control.in
@@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
 Section: admin
 Priority: optional
 Architecture: @@ARCH@@
-Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 1.4-16), netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl
+Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 1.4-16), netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve, libjson-perl, libjson-xs-perl, libio-multiplex-perl, libnet-ssleay-perl, socat
 Conflicts: netcat-openbsd
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Description: Qemu Server Tools
diff --git a/qm b/qm
index 879c477e..8a1b29e5 100755
--- a/qm
+++ b/qm
@@ -326,6 +326,58 @@ __PACKAGE__->register_method ({
 	return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'terminal', 
+    path => 'terminal', 
+    method => 'POST',
+    description => "Open a terminal using a serial device (The VM need to have a serial device configured, for example 'serial0: socket')",
+    parameters => {
+    	additionalProperties => 0,
+	properties => {
+	    vmid => get_standard_option('pve-vmid'),
+	    iface => {
+		type => 'string',
+		optional => 1,
+		enum => [qw(serial0 serial1 serial2 serial3)], 
+	    }
+	},
+    },
+    returns => { type => 'null'},
+    code => sub {
+	my ($param) = @_;
+
+	my $vmid = $param->{vmid};
+
+	my $conf = PVE::QemuServer::load_config ($vmid); # check if VM exists
+
+	my $iface = $param->{iface};
+
+	if ($iface) { 
+	    die "serial interface '$iface' is not configured\n" if !$conf->{$iface};
+	    die "wrong serial type on interface '$iface'\n" if $conf->{$iface} ne 'socket';
+	} else {
+	    foreach my $opt (qw(serial0 serial1 serial2 serial3)) {
+		if ($conf->{$opt} && ($conf->{$opt} eq 'socket')) {
+		    $iface = $opt;
+		    last;
+		}
+	    }
+	    die "unable to find a serial interface\n" if !$iface;
+	}
+
+	die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
+
+	my $socket = "/var/run/qemu-server/${vmid}.$iface";
+
+	my $cmd = "socat UNIX-CONNECT:$socket STDIO,raw,echo=0,escape=0x0f";
+
+	print "starting serial terminal on interface $iface (press control-O to exit)\n";
+
+	system($cmd);
+
+	return undef;
+    }});
+
 my $cmddef = {
     list => [ "PVE::API2::Qemu", 'vmlist', [],
 	     { node => $nodename }, sub {
@@ -413,6 +465,8 @@ my $cmddef = {
     monitor  => [ __PACKAGE__, 'monitor', ['vmid']],
 
     mtunnel => [ __PACKAGE__, 'mtunnel', []],	
+
+    terminal => [ __PACKAGE__, 'terminal', ['vmid']],
 };
 
 my $cmd = shift;