From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1D6-0008K1-94 for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:01:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yj1D3-0001lS-7D for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:01:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yj1D3-0001lM-2y for qemu-devel@nongnu.org; Fri, 17 Apr 2015 04:01:09 -0400 From: Fam Zheng Date: Fri, 17 Apr 2015 15:59:33 +0800 Message-Id: <1429257573-7359-19-git-send-email-famz@redhat.com> In-Reply-To: <1429257573-7359-1-git-send-email-famz@redhat.com> References: <1429257573-7359-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 18/18] qtest: virtio-blk: Suppress virtio error messages in "make check" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , "Michael S. Tsirkin" , "Aneesh Kumar K.V" , Stefan Hajnoczi , Amit Shah , Paolo Bonzini Signed-off-by: Fam Zheng --- 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