The spapr capability framework was introduced in QEMU 2.12. It allows to have an explicit control on how host features are exposed to the guest. This is especially needed to handle migration between hetero- geneous hosts (eg, POWER8 to POWER9). It is also used to expose fixes/ workarounds against speculative execution vulnerabilities to guests. The framework was hence backported to QEMU 2.11.1, especially these commits:0fac4aa930spapr: Add pseries-2.12 machine type9070f408f4spapr: Treat Hardware Transactional Memory (HTM) as an optional capability0fac4aa930has the confusing effect of making pseries-2.12 the default machine type for QEMU 2.11.1, instead of the expected pseries-2.11. This patch changes the default machine back to pseries-2.11. Unfortunately,9070f408f4enforces the HTM capability for pseries-2.11 to be enabled by default, ie, when not passing cap-htm on the command line. This breaks several 'make check' testcases that run qemu-system-ppc64 with TCG. The only sane way to fix this is to adapt the impacted testcases so that they all pass cap-htm=off in this case. This patch does that as well. Signed-off-by: Greg Kurz <groug@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
117 lines
3.5 KiB
C
117 lines
3.5 KiB
C
/*
|
|
* Test serial output of some machines.
|
|
*
|
|
* Copyright 2016 Thomas Huth, Red Hat Inc.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2
|
|
* or later. See the COPYING file in the top-level directory.
|
|
*
|
|
* This test is used to check that the serial output of the firmware
|
|
* (that we provide for some machines) contains an expected string.
|
|
* Thus we check that the firmware still boots at least to a certain
|
|
* point and so we know that the machine is not completely broken.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "libqtest.h"
|
|
|
|
typedef struct testdef {
|
|
const char *arch; /* Target architecture */
|
|
const char *machine; /* Name of the machine */
|
|
const char *extra; /* Additional parameters */
|
|
const char *expect; /* Expected string in the serial output */
|
|
} testdef_t;
|
|
|
|
static testdef_t tests[] = {
|
|
{ "alpha", "clipper", "", "PCI:" },
|
|
{ "ppc", "ppce500", "", "U-Boot" },
|
|
{ "ppc", "prep", "", "Open Hack'Ware BIOS" },
|
|
{ "ppc64", "ppce500", "", "U-Boot" },
|
|
{ "ppc64", "prep", "", "Open Hack'Ware BIOS" },
|
|
{ "ppc64", "pseries", "", "Open Firmware" },
|
|
{ "ppc64", "powernv", "-cpu POWER8", "SkiBoot" },
|
|
{ "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
{ "i386", "pc", "-device sga", "SGABIOS" },
|
|
{ "i386", "q35", "-device sga", "SGABIOS" },
|
|
{ "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
{ "x86_64", "q35", "-device sga", "SGABIOS" },
|
|
{ "s390x", "s390-ccw-virtio",
|
|
"-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },
|
|
{ NULL }
|
|
};
|
|
|
|
static void check_guest_output(const testdef_t *test, int fd)
|
|
{
|
|
bool output_ok = false;
|
|
int i, nbr, pos = 0;
|
|
char ch;
|
|
|
|
/* Poll serial output... Wait at most 60 seconds */
|
|
for (i = 0; i < 6000; ++i) {
|
|
while ((nbr = read(fd, &ch, 1)) == 1) {
|
|
if (ch == test->expect[pos]) {
|
|
pos += 1;
|
|
if (test->expect[pos] == '\0') {
|
|
/* We've reached the end of the expected string! */
|
|
output_ok = true;
|
|
goto done;
|
|
}
|
|
} else {
|
|
pos = 0;
|
|
}
|
|
}
|
|
g_assert(nbr >= 0);
|
|
g_usleep(10000);
|
|
}
|
|
|
|
done:
|
|
g_assert(output_ok);
|
|
}
|
|
|
|
static void test_machine(const void *data)
|
|
{
|
|
const testdef_t *test = data;
|
|
char tmpname[] = "/tmp/qtest-boot-serial-XXXXXX";
|
|
int fd;
|
|
const char *machine_props;
|
|
|
|
fd = mkstemp(tmpname);
|
|
g_assert(fd != -1);
|
|
|
|
machine_props = strcmp(test->machine, "pseries") == 0 ? ",cap-htm=off" : "";
|
|
|
|
/*
|
|
* Make sure that this test uses tcg if available: It is used as a
|
|
* fast-enough smoketest for that.
|
|
*/
|
|
global_qtest = qtest_startf("-M %s%s,accel=tcg:kvm "
|
|
"-chardev file,id=serial0,path=%s "
|
|
"-no-shutdown -serial chardev:serial0 %s",
|
|
test->machine, machine_props, tmpname,
|
|
test->extra);
|
|
unlink(tmpname);
|
|
|
|
check_guest_output(test, fd);
|
|
qtest_quit(global_qtest);
|
|
|
|
close(fd);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
const char *arch = qtest_get_arch();
|
|
int i;
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
for (i = 0; tests[i].arch != NULL; i++) {
|
|
if (strcmp(arch, tests[i].arch) == 0) {
|
|
char *name = g_strdup_printf("boot-serial/%s", tests[i].machine);
|
|
qtest_add_data_func(name, &tests[i], test_machine);
|
|
g_free(name);
|
|
}
|
|
}
|
|
|
|
return g_test_run();
|
|
}
|