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 ppc64_tests[] = {
- { "pseries", "spapr-vlan" },
+ { "pseries", "spapr-vlan",
+ "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
+ { "pseries", "virtio-net-pci",
+ "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
{ NULL },
};
static testdef_t ppc64_tests_slow[] = {
- { "pseries", "virtio-net-pci", },
- { "pseries", "e1000" },
+ { "pseries", "e1000",
+ "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
{ 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,
+ "-device %s,bootindex=1,netdev=" NETNAME " %s",
test->machine, disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off",
- test->model);
+ test->model, extra);
- qtest_start(args);
- boot_sector_test();
- qtest_quit(global_qtest);
+ qts = qtest_init(args);
+ boot_sector_test(qts);
+ qtest_quit(qts);
g_free(args);
}
test_pxe_one(test, false);
}
-static void test_batch(const testdef_t *tests)
+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;
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);
+ }
}
}
g_test_init(&argc, &argv, NULL);
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
- test_batch(x86_tests);
+ test_batch(x86_tests, false);
if (g_test_slow()) {
- test_batch(x86_tests_slow);
+ test_batch(x86_tests_slow, false);
}
} else if (strcmp(arch, "ppc64") == 0) {
- test_batch(ppc64_tests);
+ test_batch(ppc64_tests, g_test_slow());
if (g_test_slow()) {
- test_batch(ppc64_tests_slow);
+ test_batch(ppc64_tests_slow, true);
}
} else if (g_str_equal(arch, "s390x")) {
- test_batch(s390x_tests);
+ test_batch(s390x_tests, g_test_slow());
}
ret = g_test_run();
boot_sector_cleanup(disk);