From patchwork Mon Feb 5 19:28:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 869517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NnvpKZWy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZz7K3VCgz9ryr for ; Tue, 6 Feb 2018 07:03:57 +1100 (AEDT) Received: from localhost ([::1]:55072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimzb-0002Au-Ke for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 15:03:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimSk-0004wi-05 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimSg-0005Aw-GT for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:58 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimSg-0005AZ-8W for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:54 -0500 Received: by mail-wm0-x243.google.com with SMTP id 141so27960598wme.3 for ; Mon, 05 Feb 2018 11:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zc9F7o8UIA7P05BR6PSLeC5O+xN14PD1ZSyL2lQIm3A=; b=NnvpKZWy+tgaMh9gD+sMZXgQrZQXQpHduCNwU7aOMsx/qMzAV4QbS3IZjrW3u67lUP tJlaN0Y7HcSAtXB8pENLD1o9O1EZIByN0IKugx0fPCkapiAnr+zdBiG4w86qp7YNaL/C 1Ehl/10Mcn9uqw1INKCTK+fPc5RKO1ZNg5PwCmorKH1e6DXDy6qEOYr+V5eVzDkPhPY7 hAK4LgTLG4m9VrEXkVgPFVOI4+rNj5OKPk/MRBd8/KHuTCoJRMXsoINwepdDYIA5kya9 j/i7w9ystiQdx46IRQDHyh0cqoewMrU/KAmpe42wTgMwhTSQlLjy1AELUXQ9q9dF29OQ g0/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Zc9F7o8UIA7P05BR6PSLeC5O+xN14PD1ZSyL2lQIm3A=; b=avbHBTG6BJ8ZNA9opvLLS5EcEeq3qOAncuarFoAQqOSbhK8Ydl39A5sj81NnrtUlfn tP/8mwJinBKn7repI8c4wdW0KiZ5Uh3F0xrhDcOFyLp16nwyG7v3kugkbH2zkL2nx1nw 3yskw8Kh9HNWv2HyAHcWvq8kHvLBL2D3n4YE6aRmZhXRJrdLwacswKsQJ8yvOKgX26Dj GaDZmK2TV7KWnrTx68MGusMFBpRPEx7fgFFynOF/kULj9z2FJrdlzSTcPwhIGyLEM5JK vaCAG0ljvL/a3gHks5BqQTXkuFZR2qIPW75QI6J7W/f6WOgItUTPI5STcAOmknlBYWKz fP3w== X-Gm-Message-State: APf1xPAxohDMISeCqHFhwB6EE2gMxb+LgOAL2FMvo8celtJ1TkuOPOk6 UZdVKuljYgTKdVBhJfoEnAQyXek2 X-Google-Smtp-Source: AH8x225sYLzYdwxxLV9VCSZKLVUVQShuN37SJMJqLEoSNhNDExPMG1Im2Ighslf4rcDf+ieJJ+0muA== X-Received: by 10.28.234.200 with SMTP id g69mr273444wmi.137.1517858992817; Mon, 05 Feb 2018 11:29:52 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:55 +0100 Message-Id: <1517858941-5538-42-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 41/47] vhost-user-test: make read-guest-mem setup its own qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Message-Id: <20180201132757.23063-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/vhost-user-test.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 713ff5c..a22075f 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -48,6 +48,14 @@ #define QEMU_CMD QEMU_CMD_MEM QEMU_CMD_CHR \ QEMU_CMD_NETDEV QEMU_CMD_NET +#define GET_QEMU_CMD(s) \ + g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name, \ + (s)->socket_path, "", (s)->chr_name) + +#define GET_QEMU_CMDE(s, mem, chr_opts, extra, ...) \ + g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name, \ + (s)->socket_path, (chr_opts), (s)->chr_name, ##__VA_ARGS__) + #define HUGETLBFS_MAGIC 0x958458f6 /*********** FROM hw/virtio/vhost-user.c *************************************/ @@ -159,6 +167,10 @@ typedef struct TestServer { QGuestAllocator *alloc; } TestServer; +static TestServer *test_server_new(const gchar *name); +static void test_server_free(TestServer *server); +static void test_server_listen(TestServer *server); + static const char *tmpfs; static const char *root; @@ -225,9 +237,8 @@ static void wait_for_fds(TestServer *s) g_mutex_unlock(&s->data_mutex); } -static void read_guest_mem(const void *data) +static void read_guest_mem_server(TestServer *s) { - TestServer *s = (void *)data; uint32_t *guest_mem; int i, j; size_t size; @@ -492,14 +503,6 @@ static void test_server_listen(TestServer *server) test_server_create_chr(server, ",server,nowait"); } -#define GET_QEMU_CMD(s) \ - g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name, \ - (s)->socket_path, "", (s)->chr_name) - -#define GET_QEMU_CMDE(s, mem, chr_opts, extra, ...) \ - g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name, \ - (s)->socket_path, (chr_opts), (s)->chr_name, ##__VA_ARGS__) - static gboolean _test_server_free(TestServer *server) { int i; @@ -652,7 +655,7 @@ static void test_read_guest_mem(void) init_virtio_dev(server, 1u << VIRTIO_NET_F_MAC); - read_guest_mem(server); + read_guest_mem_server(server); uninit_virtio_dev(server); @@ -730,7 +733,7 @@ static void test_migrate(void) global_qtest = to; qmp_eventwait("RESUME"); - read_guest_mem(dest); + read_guest_mem_server(dest); uninit_virtio_dev(s);