454590916c
Commit 29cb418749 ("spapr: Set VSMT to smp_threads by default")
has introduced a new default value for VSMT that is not supported
by old kernels (before 4.13 kernel) and this breaks "make check"
on these kernels.
To fix that, explicitly set in the involved tests the value that was
used as the default value before the change.
Cc: Greg Kurz <groug@kaod.org>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20191120142539.236279-1-lvivier@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Tested-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
153 lines
3.7 KiB
C
153 lines
3.7 KiB
C
/*
|
|
* PXE test cases.
|
|
*
|
|
* Copyright (c) 2016, 2017 Red Hat Inc.
|
|
*
|
|
* Authors:
|
|
* Michael S. Tsirkin <mst@redhat.com>,
|
|
* Victor Kaplansky <victork@redhat.com>
|
|
* Thomas Huth <thuth@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include <glib/gstdio.h>
|
|
#include "qemu-common.h"
|
|
#include "libqtest.h"
|
|
#include "boot-sector.h"
|
|
|
|
#define NETNAME "net0"
|
|
|
|
static char disk[] = "tests/pxe-test-disk-XXXXXX";
|
|
|
|
typedef struct testdef {
|
|
const char *machine; /* Machine type */
|
|
const char *model; /* NIC device model */
|
|
const char *extra; /* Any additional parameters */
|
|
} testdef_t;
|
|
|
|
static testdef_t x86_tests[] = {
|
|
{ "pc", "e1000" },
|
|
{ "pc", "virtio-net-pci" },
|
|
{ "q35", "e1000e" },
|
|
{ "q35", "virtio-net-pci", },
|
|
{ NULL },
|
|
};
|
|
|
|
static testdef_t x86_tests_slow[] = {
|
|
{ "pc", "ne2k_pci", },
|
|
{ "pc", "i82550", },
|
|
{ "pc", "rtl8139" },
|
|
{ "pc", "vmxnet3" },
|
|
{ NULL },
|
|
};
|
|
|
|
static testdef_t ppc64_tests[] = {
|
|
{ "pseries", "spapr-vlan",
|
|
"-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
|
|
{ "pseries", "virtio-net-pci",
|
|
"-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
|
|
{ NULL },
|
|
};
|
|
|
|
static testdef_t ppc64_tests_slow[] = {
|
|
{ "pseries", "e1000",
|
|
"-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
|
|
{ NULL },
|
|
};
|
|
|
|
static testdef_t s390x_tests[] = {
|
|
{ "s390-ccw-virtio", "virtio-net-ccw" },
|
|
{ NULL },
|
|
};
|
|
|
|
static void test_pxe_one(const testdef_t *test, bool ipv6)
|
|
{
|
|
QTestState *qts;
|
|
char *args;
|
|
const char *extra = test->extra;
|
|
|
|
if (!extra) {
|
|
extra = "";
|
|
}
|
|
|
|
args = g_strdup_printf(
|
|
"-machine %s,accel=kvm:tcg -nodefaults -boot order=n "
|
|
"-netdev user,id=" NETNAME ",tftp=./,bootfile=%s,ipv4=%s,ipv6=%s "
|
|
"-device %s,bootindex=1,netdev=" NETNAME " %s",
|
|
test->machine, disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off",
|
|
test->model, extra);
|
|
|
|
qts = qtest_init(args);
|
|
boot_sector_test(qts);
|
|
qtest_quit(qts);
|
|
g_free(args);
|
|
}
|
|
|
|
static void test_pxe_ipv4(gconstpointer data)
|
|
{
|
|
const testdef_t *test = data;
|
|
|
|
test_pxe_one(test, false);
|
|
}
|
|
|
|
static void test_pxe_ipv6(gconstpointer data)
|
|
{
|
|
const testdef_t *test = data;
|
|
|
|
test_pxe_one(test, true);
|
|
}
|
|
|
|
static void test_batch(const testdef_t *tests, bool ipv6)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; tests[i].machine; i++) {
|
|
const testdef_t *test = &tests[i];
|
|
char *testname;
|
|
|
|
testname = g_strdup_printf("pxe/ipv4/%s/%s",
|
|
test->machine, test->model);
|
|
qtest_add_data_func(testname, test, test_pxe_ipv4);
|
|
g_free(testname);
|
|
|
|
if (ipv6) {
|
|
testname = g_strdup_printf("pxe/ipv6/%s/%s",
|
|
test->machine, test->model);
|
|
qtest_add_data_func(testname, test, test_pxe_ipv6);
|
|
g_free(testname);
|
|
}
|
|
}
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int ret;
|
|
const char *arch = qtest_get_arch();
|
|
|
|
ret = boot_sector_init(disk);
|
|
if(ret)
|
|
return ret;
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
|
test_batch(x86_tests, false);
|
|
if (g_test_slow()) {
|
|
test_batch(x86_tests_slow, false);
|
|
}
|
|
} else if (strcmp(arch, "ppc64") == 0) {
|
|
test_batch(ppc64_tests, g_test_slow());
|
|
if (g_test_slow()) {
|
|
test_batch(ppc64_tests_slow, true);
|
|
}
|
|
} else if (g_str_equal(arch, "s390x")) {
|
|
test_batch(s390x_tests, g_test_slow());
|
|
}
|
|
ret = g_test_run();
|
|
boot_sector_cleanup(disk);
|
|
return ret;
|
|
}
|