On 05/10/2016 14:52, Thomas Huth wrote: > 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 <[email protected]> > Signed-off-by: Thomas Huth <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]> > --- > Note: This patch goes on top of my ipv6/ppc64 pxe-test > patch that is currently queued in David's ppc-for-2.8 > branch. > > David: Since you did not send a pull request for the patch > that introduces the ipv6/ppc64 test yet, feel free to > squash this patch into that original patch in your > queue if you prefer that instead of two separate patches. in this case you can drop my R-b. Thanks, Laurent > 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 0bdb7a1..5d3ddbe 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[]) >
