[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/18] qtest: virtio-blk: Suppress virtio error mess
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 18/18] qtest: virtio-blk: Suppress virtio error messages in "make check" |
Date: |
Fri, 17 Apr 2015 15:59:33 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
tests/virtio-blk-test.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index c5a599d..17eb33d 100644
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -76,7 +76,7 @@ static char *drive_create(void)
return tmp_path;
}
-static QPCIBus *pci_test_start(void)
+static QPCIBus *pci_test_start_common(const char *extra)
{
char *cmdline;
char *tmp_path;
@@ -86,8 +86,8 @@ static QPCIBus *pci_test_start(void)
cmdline = g_strdup_printf("-drive if=none,id=drive0,file=%s,format=raw "
"-drive if=none,id=drive1,file=/dev/null,format=raw "
"-device virtio-blk-pci,id=drv0,drive=drive0,"
- "addr=%x.%x",
- tmp_path, PCI_SLOT, PCI_FN);
+ "addr=%x.%x %s",
+ tmp_path, PCI_SLOT, PCI_FN, extra);
qtest_start(cmdline);
unlink(tmp_path);
g_free(tmp_path);
@@ -96,6 +96,16 @@ static QPCIBus *pci_test_start(void)
return qpci_init_pc();
}
+static QPCIBus *pci_test_start(void)
+{
+ return pci_test_start_common("");
+}
+
+static QPCIBus *pci_test_start_silient(void)
+{
+ return pci_test_start_common("&>/dev/null");
+}
+
static void arm_test_start(void)
{
char *cmdline;
@@ -746,7 +756,7 @@ static void test_pci_needs_reset(err_func ef)
QGuestAllocator *alloc;
void *addr;
- bus = pci_test_start();
+ bus = pci_test_start_silient();
dev = virtio_blk_pci_init(bus, PCI_SLOT);
vdev = &dev->vdev;
--
1.9.3
- [Qemu-devel] [PATCH 07/18] virtio: Return error from virtqueue_avail_bytes, (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, 2015/04/17
- [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 <=
- [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