motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: virtio-9p: fix ISR dependence

Browse source 
Like other virtio tests, use the used ring APIs instead of assuming ISR
being set means the request has completed.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Greg Kurz 2018-01-08 11:18:23 +01:00
parent 7567359094
commit 65b70fc7de
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/virtio-9p-test.c
View file

@ -18,6 +18,8 @@
#include "standard-headers/linux/virtio_pci.h" #include "standard-headers/linux/virtio_pci.h"
#include "hw/9pfs/9p.h" #include "hw/9pfs/9p.h"
#define QVIRTIO_9P_TIMEOUT_US (10 * 1000 * 1000)
static const char mount_tag[] = "qtest"; static const char mount_tag[] = "qtest";
typedef struct { typedef struct {
@ -111,6 +113,7 @@ typedef struct {
/* No r_size, it is hardcoded to P9_MAX_SIZE */ /* No r_size, it is hardcoded to P9_MAX_SIZE */
size_t t_off; size_t t_off;
size_t r_off; size_t r_off;
uint32_t free_head;
} P9Req; } P9Req;
static void v9fs_memwrite(P9Req *req, const void *addr, size_t len) static void v9fs_memwrite(P9Req *req, const void *addr, size_t len)
@ -124,11 +127,6 @@ static void v9fs_memskip(P9Req *req, size_t len)
req->r_off += len; req->r_off += len;
} }
static void v9fs_memrewind(P9Req *req, size_t len)
{
req->r_off -= len;
}
static void v9fs_memread(P9Req *req, void *addr, size_t len) static void v9fs_memread(P9Req *req, void *addr, size_t len)
{ {
memread(req->r_msg + req->r_off, addr, len); memread(req->r_msg + req->r_off, addr, len);
@ -227,12 +225,12 @@ static P9Req *v9fs_req_init(QVirtIO9P *v9p, uint32_t size, uint8_t id,
static void v9fs_req_send(P9Req *req) static void v9fs_req_send(P9Req *req)
{ {
QVirtIO9P *v9p = req->v9p; QVirtIO9P *v9p = req->v9p;
uint32_t free_head;
req->r_msg = guest_alloc(v9p->qs->alloc, P9_MAX_SIZE); req->r_msg = guest_alloc(v9p->qs->alloc, P9_MAX_SIZE);
free_head = qvirtqueue_add(v9p->vq, req->t_msg, req->t_size, false, true); req->free_head = qvirtqueue_add(v9p->vq, req->t_msg, req->t_size, false,
true);
qvirtqueue_add(v9p->vq, req->r_msg, P9_MAX_SIZE, true, false); qvirtqueue_add(v9p->vq, req->r_msg, P9_MAX_SIZE, true, false);
qvirtqueue_kick(v9p->dev, v9p->vq, free_head); qvirtqueue_kick(v9p->dev, v9p->vq, req->free_head);
req->t_off = 0; req->t_off = 0;
} }
@ -250,19 +248,13 @@ static void v9fs_req_recv(P9Req *req, uint8_t id)
{ {
QVirtIO9P *v9p = req->v9p; QVirtIO9P *v9p = req->v9p;
P9Hdr hdr; P9Hdr hdr;
int i;
for (i = 0; i < 10; i++) { qvirtio_wait_used_elem(v9p->dev, v9p->vq, req->free_head,
qvirtio_wait_queue_isr(v9p->dev, v9p->vq, 1000 * 1000); QVIRTIO_9P_TIMEOUT_US);
v9fs_memread(req, &hdr, 7); v9fs_memread(req, &hdr, 7);
hdr.size = ldl_le_p(&hdr.size); hdr.size = ldl_le_p(&hdr.size);
hdr.tag = lduw_le_p(&hdr.tag); hdr.tag = lduw_le_p(&hdr.tag);
if (hdr.size >= 7) {
break;
}
v9fs_memrewind(req, 7);
}
g_assert_cmpint(hdr.size, >=, 7); g_assert_cmpint(hdr.size, >=, 7);
g_assert_cmpint(hdr.size, <=, P9_MAX_SIZE); g_assert_cmpint(hdr.size, <=, P9_MAX_SIZE);