From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRKtH-0002Ta-9M for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:28:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRKtC-0003dJ-A0 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:28:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRKtC-0003dE-4X for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:28:06 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A909870D9C for ; Thu, 4 Feb 2016 14:28:05 +0000 (UTC) From: Paolo Bonzini Date: Thu, 4 Feb 2016 15:28:03 +0100 Message-Id: <1454596083-4931-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] vhost-user-test: speed up a lot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com The mechanism to get the option ROM for virtio-net does not block the PCI ROM from being loaded. For out of tree builds, the PCI ROM being loaded might actually be the system one. If the system PCI ROM has a timeout for the "Press Ctrl-B" banner, the guest takes 3-4 seconds more to initialize the virtqueues and the test sometimes fails with a timeout in wait_for_fds. Fix this by using the romfile property instead of -option-rom. Signed-off-by: Paolo Bonzini --- tests/vhost-user-test.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 95f35af..6778cc1 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -35,11 +35,10 @@ "mem-path=%s,share=on -numa node,memdev=mem" #define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=%s,vhostforce" -#define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0 " -#define QEMU_CMD_ROM " -option-rom ../pc-bios/pxe-virtio.rom" +#define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0,romfile=../pc-bios/pxe-virtio.rom" #define QEMU_CMD QEMU_CMD_ACCEL QEMU_CMD_MEM QEMU_CMD_CHR \ - QEMU_CMD_NETDEV QEMU_CMD_NET QEMU_CMD_ROM + QEMU_CMD_NETDEV QEMU_CMD_NET #define HUGETLBFS_MAGIC 0x958458f6 -- 2.5.0