From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkIZy-00062V-Ds for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:18:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkIZw-0007RZ-9r for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:18:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkIZw-0007RV-3J for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:18:20 -0400 Date: Fri, 9 Oct 2015 00:18:15 +0300 From: "Michael S. Tsirkin" Message-ID: <1444338957-15293-23-git-send-email-mst@redhat.com> References: <1444338957-15293-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1444338957-15293-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 22/25] vhost-user-test: learn to tweak various qemu arguments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Yuanhan Liu , Igor Mammedov , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 Lureau Add a new macro to make the qemu command line with other values of memory size, and specific chardev id. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/vhost-user-test.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 034d89b..791d849 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -30,10 +30,10 @@ #endif =20 #define QEMU_CMD_ACCEL " -machine accel=3Dtcg" -#define QEMU_CMD_MEM " -m 512 -object memory-backend-file,id=3Dmem,si= ze=3D512M,"\ +#define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=3Dmem,siz= e=3D%dM,"\ "mem-path=3D%s,share=3Don -numa node,memdev=3Dme= m" -#define QEMU_CMD_CHR " -chardev socket,id=3Dchr0,path=3D%s" -#define QEMU_CMD_NETDEV " -netdev vhost-user,id=3Dnet0,chardev=3Dchr0,vh= ostforce" +#define QEMU_CMD_CHR " -chardev socket,id=3D%s,path=3D%s" +#define QEMU_CMD_NETDEV " -netdev vhost-user,id=3Dnet0,chardev=3D%s,vhos= tforce" #define QEMU_CMD_NET " -device virtio-net-pci,netdev=3Dnet0 " #define QEMU_CMD_ROM " -option-rom ../pc-bios/pxe-virtio.rom" =20 @@ -132,6 +132,9 @@ static gboolean g_cond_wait_until(CompatGCond cond, C= ompatGMutex mutex, } #endif =20 +static const char *tmpfs; +static const char *root; + static void wait_for_fds(TestServer *s) { gint64 end_time; @@ -317,7 +320,7 @@ static const char *init_hugepagefs(const char *path) return path; } =20 -static TestServer *test_server_new(const gchar *tmpfs, const gchar *name= ) +static TestServer *test_server_new(const gchar *name) { TestServer *server =3D g_new0(TestServer, 1); gchar *chr_path; @@ -337,9 +340,13 @@ static TestServer *test_server_new(const gchar *tmpf= s, const gchar *name) return server; } =20 -#define GET_QEMU_CMD(s, root) \ - g_strdup_printf(QEMU_CMD, (root), (s)->socket_path) +#define GET_QEMU_CMD(s) = \ + g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name, = \ + (s)->socket_path, (s)->chr_name) =20 +#define GET_QEMU_CMDE(s, mem, extra, ...) = \ + g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name,= \ + (s)->socket_path, (s)->chr_name, ##__VA_ARGS__) =20 static void test_server_free(TestServer *server) { @@ -365,8 +372,6 @@ int main(int argc, char **argv) char *qemu_cmd =3D NULL; int ret; char template[] =3D "/tmp/vhost-test-XXXXXX"; - const char *tmpfs; - const char *root; =20 g_test_init(&argc, &argv, NULL); =20 @@ -387,12 +392,12 @@ int main(int argc, char **argv) root =3D tmpfs; } =20 - server =3D test_server_new(tmpfs, "test"); + server =3D test_server_new("test"); =20 /* run the main loop thread so the chardev may operate */ g_thread_new(NULL, thread_function, NULL); =20 - qemu_cmd =3D GET_QEMU_CMD(server, root); + qemu_cmd =3D GET_QEMU_CMD(server); =20 s =3D qtest_start(qemu_cmd); g_free(qemu_cmd); --=20 MST