qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	qemu-devel@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PULL 20/52] tests/vm: serial console support helpers
Date: Fri,  7 Jun 2019 10:05:19 +0100	[thread overview]
Message-ID: <20190607090552.12434-21-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org>

From: Gerd Hoffmann <kraxel@redhat.com>

Add a bunch of helpers to talk to the guest using the
serial console.

Also drop the hard-coded -serial parameter for the vm
so QEMUMachine.set_console() actually works.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190520124716.30472-10-kraxel@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index f27178f3c7..8894267f07 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -2,10 +2,11 @@
 #
 # VM testing base class
 #
-# Copyright 2017 Red Hat Inc.
+# Copyright 2017-2019 Red Hat Inc.
 #
 # Authors:
 #  Fam Zheng <famz@redhat.com>
+#  Gerd Hoffmann <kraxel@redhat.com>
 #
 # This code is licensed under the GPL version 2 or later.  See
 # the COPYING file in the top-level directory.
@@ -13,7 +14,9 @@
 
 from __future__ import print_function
 import os
+import re
 import sys
+import socket
 import logging
 import time
 import datetime
@@ -79,8 +82,7 @@ class BaseVM(object):
             "-cpu", "max",
             "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
             "-device", "virtio-net-pci,netdev=vnet",
-            "-vnc", "127.0.0.1:0,to=20",
-            "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")]
+            "-vnc", "127.0.0.1:0,to=20"]
         if vcpus and vcpus > 1:
             self._args += ["-smp", "%d" % vcpus]
         if kvm_available(self.arch):
@@ -162,6 +164,8 @@ class BaseVM(object):
         logging.debug("QEMU args: %s", " ".join(args))
         qemu_bin = os.environ.get("QEMU", "qemu-system-" + self.arch)
         guest = QEMUMachine(binary=qemu_bin, args=args)
+        guest.set_machine('pc')
+        guest.set_console()
         try:
             guest.launch()
         except:
@@ -184,6 +188,81 @@ class BaseVM(object):
             raise Exception("Cannot find ssh port from 'info usernet':\n%s" % \
                             usernet_info)
 
+    def console_init(self, timeout = 120):
+        vm = self._guest
+        vm.console_socket.settimeout(timeout)
+
+    def console_log(self, text):
+        for line in re.split("[\r\n]", text):
+            # filter out terminal escape sequences
+            line = re.sub("\x1b\[[0-9;?]*[a-zA-Z]", "", line)
+            line = re.sub("\x1b\([0-9;?]*[a-zA-Z]", "", line)
+            # replace unprintable chars
+            line = re.sub("\x1b", "<esc>", line)
+            line = re.sub("[\x00-\x1f]", ".", line)
+            if line == "":
+                continue
+            # log console line
+            sys.stderr.write("con recv: %s\n" % line)
+
+    def console_wait(self, expect):
+        vm = self._guest
+        output = ""
+        while True:
+            try:
+                chars = vm.console_socket.recv(1024)
+            except socket.timeout:
+                sys.stderr.write("console: *** read timeout ***\n")
+                sys.stderr.write("console: waiting for: '%s'\n" % expect)
+                sys.stderr.write("console: line buffer:\n")
+                sys.stderr.write("\n")
+                self.console_log(output.rstrip())
+                sys.stderr.write("\n")
+                raise
+            output += chars.decode("latin1")
+            if expect in output:
+                break
+            if "\r" in output or "\n" in output:
+                lines = re.split("[\r\n]", output)
+                output = lines.pop()
+                if self.debug:
+                    self.console_log("\n".join(lines))
+        if self.debug:
+            self.console_log(output)
+
+    def console_send(self, command):
+        vm = self._guest
+        if self.debug:
+            logline = re.sub("\n", "<enter>", command)
+            logline = re.sub("[\x00-\x1f]", ".", logline)
+            sys.stderr.write("con send: %s\n" % logline)
+        for char in list(command):
+            vm.console_socket.send(char.encode("utf-8"))
+            time.sleep(0.01)
+
+    def console_wait_send(self, wait, command):
+        self.console_wait(wait)
+        self.console_send(command)
+
+    def console_ssh_init(self, prompt, user, pw):
+        sshkey_cmd = "echo '%s' > .ssh/authorized_keys\n" % SSH_PUB_KEY.rstrip()
+        self.console_wait_send("login:",    "%s\n" % user)
+        self.console_wait_send("Password:", "%s\n" % pw)
+        self.console_wait_send(prompt,      "mkdir .ssh\n")
+        self.console_wait_send(prompt,      sshkey_cmd)
+        self.console_wait_send(prompt,      "chmod 755 .ssh\n")
+        self.console_wait_send(prompt,      "chmod 644 .ssh/authorized_keys\n")
+
+    def console_sshd_config(self, prompt):
+        self.console_wait(prompt)
+        self.console_send("echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config\n")
+        for var in self.envvars:
+            self.console_wait(prompt)
+            self.console_send("echo 'AcceptEnv %s' >> /etc/ssh/sshd_config\n" % var)
+
+    def print_step(self, text):
+        sys.stderr.write("### %s ...\n" % text)
+
     def wait_ssh(self, seconds=300):
         starttime = datetime.datetime.now()
         endtime = starttime + datetime.timedelta(seconds=seconds)
-- 
2.20.1



  parent reply	other threads:[~2019-06-07 10:09 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-07  9:04 [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 01/52] editorconfig: add setting for shell scripts Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 02/52] qemu-io-cmds: use clock_gettime for benchmarking Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 03/52] tests/docker: Update the Fedora image to Fedora 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 04/52] tests/docker: Update the Fedora cross compile images to 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 05/52] tests/docker: Update the Ubuntu image to 19.04 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 06/52] .travis.yml: bump gcc sanitiser job to gcc-9 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 07/52] .travis.yml: add clang ubsan job Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 08/52] tests/vm: Use python configured on build Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 10/52] tests/vm: Fix build-centos docker-based tests run Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 11/52] tests/vm: Add missing variables on help Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 12/52] scripts: use git archive in archive-source Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 13/52] tests/vm: python3 fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 14/52] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 15/52] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 16/52] tests/vm: run test builds on snapshot Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 17/52] tests/vm: proper guest shutdown Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 18/52] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 19/52] tests/vm: add DEBUG=1 to help text Alex Bennée
2019-06-07  9:05 ` Alex Bennée [this message]
2019-06-07  9:05 ` [Qemu-devel] [PULL 21/52] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 22/52] tests/vm: freebsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 23/52] tests/vm: netbsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 24/52] tests/vm: fedora " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 25/52] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 26/52] semihosting: split console_out into string and char versions Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 27/52] cputlb: use uint64_t for interim values for unaligned load Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 28/52] tests/tcg: better detect truncated reads Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 30/52] tests/tcg/x86_64: add a PVH crt.o for x86_64 system tests Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 31/52] MAINTAINERS: put myself forward for gdbstub Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 32/52] cputlb: cast size_t to target_ulong before using for address masks Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 33/52] gdbstub: Add infrastructure to parse cmd packets Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 34/52] gdbstub: Implement deatch (D pkt) with new infra Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 35/52] gdbstub: Implement thread_alive (T " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 36/52] gdbstub: Implement continue (c " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 37/52] gdbstub: Implement continue with signal (C " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 38/52] gdbstub: Implement set_thread (H " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 39/52] gdbstub: Implement breakpoint commands (Z/z " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 40/52] gdbstub: Implement set register (P " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 41/52] gdbstub: Implement get register (p " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 42/52] gdbstub: Implement write memory (M " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 43/52] gdbstub: Implement read memory (m " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 44/52] gdbstub: Implement write all registers (G " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 45/52] gdbstub: Implement read all registers (g " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 46/52] gdbstub: Implement file io (F " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 47/52] gdbstub: Implement step (s " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 48/52] gdbstub: Implement v commands " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 49/52] gdbstub: Implement generic set/query (Q/q pkt) " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 50/52] gdbstub: Implement target halted (? " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 51/52] gdbstub: Clear unused variables in gdb_handle_packet Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 52/52] gdbstub: Implement qemu physical memory mode Alex Bennée
2019-06-07  9:50 ` [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Peter Maydell
2019-06-07 13:25   ` Alex Bennée
2019-06-11 14:18   ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190607090552.12434-21-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=kraxel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).