From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWNwE-0006FZ-Vl for qemu-devel@nongnu.org; Wed, 25 Jan 2017 08:48:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWNwB-0007DH-Ly for qemu-devel@nongnu.org; Wed, 25 Jan 2017 08:48:39 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:46453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cWNwB-0007D2-CN for qemu-devel@nongnu.org; Wed, 25 Jan 2017 08:48:35 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v0PDmVM2056707 for ; Wed, 25 Jan 2017 08:48:34 -0500 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0a-001b2d01.pphosted.com with ESMTP id 286dq49ueu-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 25 Jan 2017 08:48:34 -0500 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jan 2017 13:48:22 -0000 From: Greg Kurz Date: Wed, 25 Jan 2017 14:47:59 +0100 In-Reply-To: <1485352082-16830-1-git-send-email-groug@kaod.org> References: <1485352082-16830-1-git-send-email-groug@kaod.org> Message-Id: <1485352082-16830-3-git-send-email-groug@kaod.org> Subject: [Qemu-devel] [PULL 2/5] tests: virtio-9p: improve error reporting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Aneesh Kumar K.V" , Greg Kurz Signed-off-by: Greg Kurz --- tests/virtio-9p-test.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index 060407b20e39..9556291567a4 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -236,6 +236,16 @@ static void v9fs_req_send(P9Req *req) req->t_off = 0; } +static const char *rmessage_name(uint8_t id) +{ + return + id == P9_RLERROR ? "RLERROR" : + id == P9_RVERSION ? "RVERSION" : + id == P9_RATTACH ? "RATTACH" : + id == P9_RWALK ? "RWALK" : + ""; +} + static void v9fs_req_recv(P9Req *req, uint8_t id) { QVirtIO9P *v9p = req->v9p; @@ -258,11 +268,15 @@ static void v9fs_req_recv(P9Req *req, uint8_t id) g_assert_cmpint(hdr.size, <=, P9_MAX_SIZE); g_assert_cmpint(hdr.tag, ==, req->tag); - if (hdr.id != id && hdr.id == P9_RLERROR) { - uint32_t err; - v9fs_uint32_read(req, &err); - g_printerr("Received Rlerror (%d) instead of Response %d\n", err, id); - g_assert_not_reached(); + if (hdr.id != id) { + g_printerr("Received response %d (%s) instead of %d (%s)\n", + hdr.id, rmessage_name(hdr.id), id, rmessage_name(id)); + + if (hdr.id == P9_RLERROR) { + uint32_t err; + v9fs_uint32_read(req, &err); + g_printerr("Rlerror has errno %d (%s)\n", err, strerror(err)); + } } g_assert_cmpint(hdr.id, ==, id); } -- 2.7.4