*/
#include "qemu/osdep.h"
-#include "libqtest.h"
+#include "libqtest-single.h"
+#include "qemu/module.h"
#include "hw/9pfs/9p.h"
#include "hw/9pfs/9p-synth.h"
#include "libqos/virtio-9p.h"
#define P9_MAX_SIZE 4096 /* Max size of a T-message or R-message */
typedef struct {
+ QTestState *qts;
QVirtio9P *v9p;
uint16_t tag;
uint64_t t_msg;
static void v9fs_memwrite(P9Req *req, const void *addr, size_t len)
{
- memwrite(req->t_msg + req->t_off, addr, len);
+ qtest_memwrite(req->qts, req->t_msg + req->t_off, addr, len);
req->t_off += len;
}
static void v9fs_memread(P9Req *req, void *addr, size_t len)
{
- memread(req->r_msg + req->r_off, addr, len);
+ qtest_memread(req->qts, req->r_msg + req->r_off, addr, len);
req->r_off += len;
}
g_assert_cmpint(total_size, <=, P9_MAX_SIZE);
+ req->qts = global_qtest;
req->v9p = v9p;
req->t_size = total_size;
req->t_msg = guest_alloc(alloc, req->t_size);
QVirtio9P *v9p = req->v9p;
req->r_msg = guest_alloc(alloc, P9_MAX_SIZE);
- 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_kick(v9p->vdev, v9p->vq, req->free_head);
+ req->free_head = qvirtqueue_add(req->qts, v9p->vq, req->t_msg, req->t_size,
+ false, true);
+ qvirtqueue_add(req->qts, v9p->vq, req->r_msg, P9_MAX_SIZE, true, false);
+ qvirtqueue_kick(req->qts, v9p->vdev, v9p->vq, req->free_head);
req->t_off = 0;
}
{
QVirtio9P *v9p = req->v9p;
- qvirtio_wait_used_elem(v9p->vdev, v9p->vq, req->free_head, len,
+ qvirtio_wait_used_elem(req->qts, v9p->vdev, v9p->vq, req->free_head, len,
QVIRTIO_9P_TIMEOUT_US);
}