Testing and plugins for rc1
- add plugin API versioning - tests/vm add netbsd autoinstall - disable ipmi-bt-test for non-Linux - single-thread make check -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl3KwvYACgkQ+9DbCVqe KkT/gQf/SWEZrH4q+3yjW+QblK9R5VP4l0LNfCkP8wqPQrYj+85KFswyOhKczH81 8aExg+P8zvjKkBTN1xQWBuOqWAUAfo2Nv2EwwCU784qZSi/R5DY9Dzw3kRBWF10V j81kX9tUSDVAzQ98RVHvQtMe9yjpuyYOX5x+fD3zjpGmgp3it4+2y4+dHQQVDo3P PM4xXYrn3OhtDyYR919ydCZb7gwk74Hf6VQQBc99QfAJOwiddLPH66fTpuaXcBXH GUayxplo/zTTrgmdSfgg8lirYJhrZ0nnE0aK05rtPgc5k//WmVAgkSzDM9A0ZIT4 Tryt8Ww7uJ96OwoSjlQ8+kS5ejLlSg== =wSRI -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-tcg-121119-1' into staging Testing and plugins for rc1 - add plugin API versioning - tests/vm add netbsd autoinstall - disable ipmi-bt-test for non-Linux - single-thread make check # gpg: Signature made Tue 12 Nov 2019 14:34:30 GMT # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full] # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * remotes/stsquad/tags/pull-testing-and-tcg-121119-1: tcg plugins: expose an API version concept .travis.yml: don't run make check with multiple jobs tests/vm: support sites with sha512 checksums tests: only run ipmi-bt-test if CONFIG_LINUX tests/vm: update netbsd to version 8.1 tests/vm: use console_consume for netbsd tests/vm: add console_consume helper tests/vm: netbsd autoinstall, using serial console Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
2a7e7c3e10
|
|
@ -77,7 +77,7 @@ env:
|
|||
- SRC_DIR="."
|
||||
- BUILD_DIR="."
|
||||
- BASE_CONFIG="--disable-docs --disable-tools"
|
||||
- TEST_CMD="make check -j3 V=1"
|
||||
- TEST_CMD="make check V=1"
|
||||
# This is broadly a list of "mainline" softmmu targets which have support across the major distros
|
||||
- MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
|
||||
- CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"
|
||||
|
|
|
|||
|
|
@ -38,9 +38,28 @@
|
|||
|
||||
typedef uint64_t qemu_plugin_id_t;
|
||||
|
||||
/*
|
||||
* Versioning plugins:
|
||||
*
|
||||
* The plugin API will pass a minimum and current API version that
|
||||
* QEMU currently supports. The minimum API will be incremented if an
|
||||
* API needs to be deprecated.
|
||||
*
|
||||
* The plugins export the API they were built against by exposing the
|
||||
* symbol qemu_plugin_version which can be checked.
|
||||
*/
|
||||
|
||||
extern QEMU_PLUGIN_EXPORT int qemu_plugin_version;
|
||||
|
||||
#define QEMU_PLUGIN_VERSION 0
|
||||
|
||||
typedef struct {
|
||||
/* string describing architecture */
|
||||
const char *target_name;
|
||||
struct {
|
||||
int min;
|
||||
int cur;
|
||||
} version;
|
||||
/* is this a full system emulation? */
|
||||
bool system_emulation;
|
||||
union {
|
||||
|
|
|
|||
|
|
@ -178,6 +178,25 @@ static int plugin_load(struct qemu_plugin_desc *desc, const qemu_info_t *info)
|
|||
goto err_symbol;
|
||||
}
|
||||
|
||||
if (!g_module_symbol(ctx->handle, "qemu_plugin_version", &sym)) {
|
||||
error_report("TCG plugin %s does not declare API version %s",
|
||||
desc->path, g_module_error());
|
||||
goto err_symbol;
|
||||
} else {
|
||||
int version = *(int *)sym;
|
||||
if (version < QEMU_PLUGIN_MIN_VERSION) {
|
||||
error_report("TCG plugin %s requires API version %d, but "
|
||||
"this QEMU supports only a minimum version of %d",
|
||||
desc->path, version, QEMU_PLUGIN_MIN_VERSION);
|
||||
goto err_symbol;
|
||||
} else if (version > QEMU_PLUGIN_VERSION) {
|
||||
error_report("TCG plugin %s requires API version %d, but "
|
||||
"this QEMU supports only up to version %d",
|
||||
desc->path, version, QEMU_PLUGIN_VERSION);
|
||||
goto err_symbol;
|
||||
}
|
||||
}
|
||||
|
||||
qemu_rec_mutex_lock(&plugin.lock);
|
||||
|
||||
/* find an unused random id with &ctx as the seed */
|
||||
|
|
@ -248,6 +267,8 @@ int qemu_plugin_load_list(QemuPluginList *head)
|
|||
g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1);
|
||||
|
||||
info->target_name = TARGET_NAME;
|
||||
info->version.min = QEMU_PLUGIN_MIN_VERSION;
|
||||
info->version.cur = QEMU_PLUGIN_VERSION;
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
MachineState *ms = MACHINE(qdev_get_machine());
|
||||
info->system_emulation = true;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#include <gmodule.h>
|
||||
|
||||
#define QEMU_PLUGIN_MIN_VERSION 0
|
||||
|
||||
/* global state */
|
||||
struct qemu_plugin_state {
|
||||
QTAILQ_HEAD(, qemu_plugin_ctx) ctxs;
|
||||
|
|
|
|||
|
|
@ -177,7 +177,9 @@ check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF)
|
|||
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
||||
check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF)
|
||||
ifdef CONFIG_LINUX
|
||||
check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += tests/ipmi-bt-test$(EXESUF)
|
||||
endif
|
||||
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/device-plug-test$(EXESUF)
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
static uint64_t bb_count;
|
||||
static uint64_t insn_count;
|
||||
static bool do_inline;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
/*
|
||||
* Empty TB translation callback.
|
||||
* This allows us to measure the overhead of injecting and then
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
static bool do_inline;
|
||||
|
||||
/* Plugins need to take care of their own locking */
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||
|
||||
static uint64_t page_size = 4096;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
static uint64_t insn_count;
|
||||
static bool do_inline;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#include <qemu-plugin.h>
|
||||
|
||||
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
|
||||
|
||||
static uint64_t mem_count;
|
||||
static uint64_t io_count;
|
||||
static bool do_inline;
|
||||
|
|
|
|||
|
|
@ -95,19 +95,25 @@ class BaseVM(object):
|
|||
logging.info("KVM not available, not using -enable-kvm")
|
||||
self._data_args = []
|
||||
|
||||
def _download_with_cache(self, url, sha256sum=None):
|
||||
def _download_with_cache(self, url, sha256sum=None, sha512sum=None):
|
||||
def check_sha256sum(fname):
|
||||
if not sha256sum:
|
||||
return True
|
||||
checksum = subprocess.check_output(["sha256sum", fname]).split()[0]
|
||||
return sha256sum == checksum.decode("utf-8")
|
||||
|
||||
def check_sha512sum(fname):
|
||||
if not sha512sum:
|
||||
return True
|
||||
checksum = subprocess.check_output(["sha512sum", fname]).split()[0]
|
||||
return sha512sum == checksum.decode("utf-8")
|
||||
|
||||
cache_dir = os.path.expanduser("~/.cache/qemu-vm/download")
|
||||
if not os.path.exists(cache_dir):
|
||||
os.makedirs(cache_dir)
|
||||
fname = os.path.join(cache_dir,
|
||||
hashlib.sha1(url.encode("utf-8")).hexdigest())
|
||||
if os.path.exists(fname) and check_sha256sum(fname):
|
||||
if os.path.exists(fname) and check_sha256sum(fname) and check_sha512sum(fname):
|
||||
return fname
|
||||
logging.debug("Downloading %s to %s...", url, fname)
|
||||
subprocess.check_call(["wget", "-c", url, "-O", fname + ".download"],
|
||||
|
|
@ -242,6 +248,25 @@ class BaseVM(object):
|
|||
return False
|
||||
return True
|
||||
|
||||
def console_consume(self):
|
||||
vm = self._guest
|
||||
output = ""
|
||||
vm.console_socket.setblocking(0)
|
||||
while True:
|
||||
try:
|
||||
chars = vm.console_socket.recv(1)
|
||||
except:
|
||||
break
|
||||
output += chars.decode("latin1")
|
||||
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)
|
||||
vm.console_socket.setblocking(1)
|
||||
|
||||
def console_send(self, command):
|
||||
vm = self._guest
|
||||
if self.debug:
|
||||
|
|
|
|||
188
tests/vm/netbsd
188
tests/vm/netbsd
|
|
@ -2,10 +2,11 @@
|
|||
#
|
||||
# NetBSD VM image
|
||||
#
|
||||
# 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,20 +14,54 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import subprocess
|
||||
import basevm
|
||||
|
||||
class NetBSDVM(basevm.BaseVM):
|
||||
name = "netbsd"
|
||||
arch = "x86_64"
|
||||
|
||||
link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8.1-amd64.iso"
|
||||
csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f"
|
||||
size = "20G"
|
||||
pkgs = [
|
||||
# tools
|
||||
"git-base",
|
||||
"pkgconf",
|
||||
"xz",
|
||||
"python37",
|
||||
|
||||
# gnu tools
|
||||
"bash",
|
||||
"gmake",
|
||||
"gsed",
|
||||
"flex", "bison",
|
||||
|
||||
# libs: crypto
|
||||
"gnutls",
|
||||
|
||||
# libs: images
|
||||
"jpeg",
|
||||
"png",
|
||||
|
||||
# libs: ui
|
||||
"SDL2",
|
||||
"gtk3+",
|
||||
"libxkbcommon",
|
||||
]
|
||||
|
||||
BUILD_SCRIPT = """
|
||||
set -e;
|
||||
rm -rf /var/tmp/qemu-test.*
|
||||
cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
|
||||
rm -rf /home/qemu/qemu-test.*
|
||||
cd $(mktemp -d /home/qemu/qemu-test.XXXXXX);
|
||||
mkdir src build; cd src;
|
||||
tar -xf /dev/rld1a;
|
||||
./configure --python=python2.7 {configure_opts};
|
||||
cd ../build
|
||||
../src/configure --python=python3.7 --disable-opengl {configure_opts};
|
||||
gmake --output-sync -j{jobs} {target} {verbose};
|
||||
"""
|
||||
poweroff = "/sbin/poweroff"
|
||||
|
||||
# Workaround for NetBSD + IPv6 + slirp issues.
|
||||
# NetBSD seems to ignore the ICMPv6 Destination Unreachable
|
||||
|
|
@ -36,14 +71,147 @@ class NetBSDVM(basevm.BaseVM):
|
|||
ipv6 = False
|
||||
|
||||
def build_image(self, img):
|
||||
cimg = self._download_with_cache("http://download.patchew.org/netbsd-7.1-amd64.img.xz",
|
||||
sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732')
|
||||
img_tmp_xz = img + ".tmp.xz"
|
||||
cimg = self._download_with_cache(self.link, sha512sum=self.csum)
|
||||
img_tmp = img + ".tmp"
|
||||
sys.stderr.write("Extracting the image...\n")
|
||||
subprocess.check_call(["ln", "-f", cimg, img_tmp_xz])
|
||||
subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz])
|
||||
iso = img + ".install.iso"
|
||||
|
||||
self.print_step("Preparing iso and disk image")
|
||||
subprocess.check_call(["ln", "-f", cimg, iso])
|
||||
subprocess.check_call(["qemu-img", "create", "-f", "qcow2",
|
||||
img_tmp, self.size])
|
||||
|
||||
self.print_step("Booting installer")
|
||||
self.boot(img_tmp, extra_args = [
|
||||
"-bios", "pc-bios/bios-256k.bin",
|
||||
"-machine", "graphics=off",
|
||||
"-cdrom", iso
|
||||
])
|
||||
self.console_init()
|
||||
self.console_wait("Primary Bootstrap")
|
||||
|
||||
# serial console boot menu output doesn't work for some
|
||||
# reason, so we have to fly blind ...
|
||||
for char in list("5consdev com0\n"):
|
||||
time.sleep(0.2)
|
||||
self.console_send(char)
|
||||
self.console_consume()
|
||||
self.console_wait_send("> ", "boot\n")
|
||||
|
||||
self.console_wait_send("Terminal type", "xterm\n")
|
||||
self.console_wait_send("a: Installation messages", "a\n")
|
||||
self.console_wait_send("b: US-English", "b\n")
|
||||
self.console_wait_send("a: Install NetBSD", "a\n")
|
||||
self.console_wait("Shall we continue?")
|
||||
self.console_wait_send("b: Yes", "b\n")
|
||||
|
||||
self.console_wait_send("a: ld0", "a\n")
|
||||
self.console_wait_send("a: This is the correct", "a\n")
|
||||
self.console_wait_send("b: Use the entire disk", "b\n")
|
||||
self.console_wait("NetBSD bootcode")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
self.console_wait_send("b: Use existing part", "b\n")
|
||||
self.console_wait_send("x: Partition sizes ok", "x\n")
|
||||
self.console_wait_send("for your NetBSD disk", "\n")
|
||||
self.console_wait("Shall we continue?")
|
||||
self.console_wait_send("b: Yes", "b\n")
|
||||
|
||||
self.console_wait_send("b: Use serial port com0", "b\n")
|
||||
self.console_wait_send("f: Set serial baud rate", "f\n")
|
||||
self.console_wait_send("a: 9600", "a\n")
|
||||
self.console_wait_send("x: Exit", "x\n")
|
||||
|
||||
self.console_wait_send("a: Full installation", "a\n")
|
||||
self.console_wait_send("a: CD-ROM", "a\n")
|
||||
|
||||
self.print_step("Installation started now, this will take a while")
|
||||
self.console_wait_send("Hit enter to continue", "\n")
|
||||
|
||||
self.console_wait_send("d: Change root password", "d\n")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
self.console_wait("New password:")
|
||||
self.console_send("%s\n" % self.ROOT_PASS)
|
||||
self.console_wait("New password:")
|
||||
self.console_send("%s\n" % self.ROOT_PASS)
|
||||
self.console_wait("Retype new password:")
|
||||
self.console_send("%s\n" % self.ROOT_PASS)
|
||||
|
||||
self.console_wait_send("o: Add a user", "o\n")
|
||||
self.console_wait("username")
|
||||
self.console_send("%s\n" % self.GUEST_USER)
|
||||
self.console_wait("to group wheel")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
self.console_wait_send("a: /bin/sh", "a\n")
|
||||
self.console_wait("New password:")
|
||||
self.console_send("%s\n" % self.GUEST_PASS)
|
||||
self.console_wait("New password:")
|
||||
self.console_send("%s\n" % self.GUEST_PASS)
|
||||
self.console_wait("Retype new password:")
|
||||
self.console_send("%s\n" % self.GUEST_PASS)
|
||||
|
||||
self.console_wait_send("a: Configure network", "a\n")
|
||||
self.console_wait_send("a: vioif0", "a\n")
|
||||
self.console_wait_send("Network media type", "\n")
|
||||
self.console_wait("autoconfiguration")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
self.console_wait_send("DNS domain", "localnet\n")
|
||||
self.console_wait("Are they OK?")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
self.console_wait("installed in /etc")
|
||||
self.console_wait_send("a: Yes", "a\n")
|
||||
|
||||
self.console_wait_send("e: Enable install", "e\n")
|
||||
proxy = os.environ.get("http_proxy")
|
||||
if not proxy is None:
|
||||
self.console_wait_send("f: Proxy", "f\n")
|
||||
self.console_wait("Proxy")
|
||||
self.console_send("%s\n" % proxy)
|
||||
self.console_wait_send("x: Install pkgin", "x\n")
|
||||
self.console_init(1200)
|
||||
self.console_wait_send("Hit enter to continue", "\n")
|
||||
self.console_init()
|
||||
|
||||
self.console_wait_send("g: Enable sshd", "g\n")
|
||||
self.console_wait_send("x: Finished conf", "x\n")
|
||||
self.console_wait_send("Hit enter to continue", "\n")
|
||||
|
||||
self.print_step("Installation finished, rebooting")
|
||||
self.console_wait_send("d: Reboot the computer", "d\n")
|
||||
|
||||
# setup qemu user
|
||||
prompt = "localhost$"
|
||||
self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS)
|
||||
self.console_wait_send(prompt, "exit\n")
|
||||
|
||||
# setup root user
|
||||
prompt = "localhost#"
|
||||
self.console_ssh_init(prompt, "root", self.ROOT_PASS)
|
||||
self.console_sshd_config(prompt)
|
||||
|
||||
# setup virtio-blk #1 (tarfile)
|
||||
self.console_wait(prompt)
|
||||
self.console_send("echo 'chmod 666 /dev/rld1a' >> /etc/rc.local\n")
|
||||
|
||||
# turn off mprotect (conflicts with tcg)
|
||||
self.console_wait(prompt)
|
||||
self.console_send("echo security.pax.mprotect.enabled=0 >> /etc/sysctl.conf\n")
|
||||
|
||||
self.print_step("Configuration finished, rebooting")
|
||||
self.console_wait_send(prompt, "reboot\n")
|
||||
self.console_wait("login:")
|
||||
self.wait_ssh()
|
||||
|
||||
self.print_step("Installing packages")
|
||||
self.ssh_root_check("pkgin update\n")
|
||||
self.ssh_root_check("pkgin -y install %s\n" % " ".join(self.pkgs))
|
||||
|
||||
# shutdown
|
||||
self.ssh_root(self.poweroff)
|
||||
self.console_wait("entering state S5")
|
||||
self.wait()
|
||||
|
||||
os.rename(img_tmp, img)
|
||||
os.remove(iso)
|
||||
self.print_step("All done")
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(basevm.main(NetBSDVM))
|
||||
|
|
|
|||
Loading…
Reference in a new issue