[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/18] qtest: virtio-blk: Extract "setup" for future
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 15/18] qtest: virtio-blk: Extract "setup" for future reuse |
Date: |
Fri, 17 Apr 2015 15:59:30 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
tests/virtio-blk-test.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index 4078321..866415a 100644
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -168,16 +168,11 @@ static uint64_t virtio_blk_request(QGuestAllocator
*alloc, QVirtioBlkReq *req,
return addr;
}
-static void test_basic(const QVirtioBus *bus, QVirtioDevice *dev,
- QGuestAllocator *alloc, QVirtQueue *vq, uint64_t device_specific)
+static uint32_t setup(const QVirtioBus *bus, QVirtioDevice *dev,
+ uint64_t device_specific)
{
- QVirtioBlkReq req;
- uint64_t req_addr;
uint64_t capacity;
uint32_t features;
- uint32_t free_head;
- uint8_t status;
- char *data;
capacity = qvirtio_config_readq(bus, dev, device_specific);
@@ -187,10 +182,25 @@ static void test_basic(const QVirtioBus *bus,
QVirtioDevice *dev,
features = features & ~(QVIRTIO_F_BAD_FEATURE |
QVIRTIO_F_RING_INDIRECT_DESC | QVIRTIO_F_RING_EVENT_IDX |
QVIRTIO_BLK_F_SCSI);
+
qvirtio_set_features(bus, dev, features);
-
qvirtio_set_driver_ok(bus, dev);
+ return features;
+}
+
+static void test_basic(const QVirtioBus *bus, QVirtioDevice *dev,
+ QGuestAllocator *alloc, QVirtQueue *vq, uint64_t device_specific)
+{
+ QVirtioBlkReq req;
+ uint64_t req_addr;
+ uint32_t features;
+ uint32_t free_head;
+ uint8_t status;
+ char *data;
+
+ features = setup(bus, dev, device_specific);
+
/* Write and read with 3 descriptor layout */
/* Write request */
req.type = QVIRTIO_BLK_T_OUT;
--
1.9.3
- Re: [Qemu-devel] [PATCH 06/18] virtio: Return error from virtqueue_pop, (continued)
[Qemu-devel] [PATCH 07/18] virtio: Return error from virtqueue_avail_bytes, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 09/18] virtio: Return error from virtio_del_queue, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 10/18] virtio: Add macro for VIRTIO_CONFIG_S_NEEDS_RESET, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 11/18] virtio: Add "needs_reset" flag to virtio device, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 12/18] virtio: Return -EINVAL if the vdev needs reset in virtqueue_pop, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 13/18] virtio-blk: Graceful error handling of virtqueue_pop, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 14/18] qtest: Add "QTEST_FILTER" to filter test cases, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 15/18] qtest: virtio-blk: Extract "setup" for future reuse,
Fam Zheng <=
[Qemu-devel] [PATCH 16/18] libqos: Add qvirtio_needs_reset, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 17/18] qtest: Add test case for "needs reset" of virtio-blk, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 18/18] qtest: virtio-blk: Suppress virtio error messages in "make check", Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 04/18] virtio: Return error from virtqueue_next_desc, Fam Zheng, 2015/04/17
[Qemu-devel] [PATCH 08/18] virtio: Return error from virtio_add_queue, Fam Zheng, 2015/04/17
Re: [Qemu-devel] [PATCH 00/18] virtio-blk: Support "VIRTIO_CONFIG_S_NEEDS_RESET", Cornelia Huck, 2015/04/20