From ef6c47f1d7c242cb0ce66fcaab4ebcd94ad2a134 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 5 Oct 2016 14:52:09 +0200 Subject: [PATCH] tests/pxe: Use -nodefaults to speed up ppc64/ipv6 pxe test SLOF is unfortunately quite slow when running with TCG, so the pxe test is also performing rather slow here. By using "-nodefaults" we can disable some devices (vscsi) that we are not interested in here, so that SLOF does not have to scan them during boot and thus starts up a little bit faster. The ppc64 pxe-test now only takes 27 seconds on my laptop instead of 33 seconds. The "-nodefaults" flag seems to work fine for the x86 tests, too, so it is added here unconditionally here (though there is no speed-up on x86 by using this flag). Suggested-by: Paolo Bonzini Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier Signed-off-by: David Gibson --- tests/pxe-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 0bdb7a170a..5d3ddbe5e9 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -25,7 +25,7 @@ static void test_pxe_one(const char *params, bool ipv6) { char *args; - args = g_strdup_printf("-machine accel=tcg -boot order=n " + args = g_strdup_printf("-machine accel=tcg -nodefaults -boot order=n " "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s," "ipv4=%s,ipv6=%s %s", disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off", params); @@ -48,7 +48,7 @@ static void test_pxe_virtio_pci(void) static void test_pxe_spapr_vlan(void) { - test_pxe_one("-vga none -device spapr-vlan,netdev=" NETNAME, true); + test_pxe_one("-device spapr-vlan,netdev=" NETNAME, true); } int main(int argc, char *argv[])