From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUuSO-0001cH-FT for qemu-devel@nongnu.org; Thu, 27 Aug 2015 06:30:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUuSL-0007Vu-NE for qemu-devel@nongnu.org; Thu, 27 Aug 2015 06:30:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUuSL-0007VQ-IG for qemu-devel@nongnu.org; Thu, 27 Aug 2015 06:30:53 -0400 Date: Thu, 27 Aug 2015 13:30:50 +0300 From: "Michael S. Tsirkin" Message-ID: <1440671349-7106-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pci-testdev: add nodata test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang , Gonglei , Markus Armbruster Add nodata test where data length is ignored. Skip it for port IO since kvm does not support it there. Signed-off-by: Michael S. Tsirkin --- hw/misc/pci-testdev.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index 26b9b86..b6e11d6 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -45,6 +45,7 @@ typedef struct IOTest { #define IOTEST_DATAMATCH 0xFA #define IOTEST_NOMATCH 0xCE +#define IOTEST_NODATA 0xAB #define IOTEST_IOSIZE 128 #define IOTEST_MEMSIZE 2048 @@ -52,7 +53,8 @@ typedef struct IOTest { static const char *iotest_test[] = { "no-eventfd", "wildcard-eventfd", - "datamatch-eventfd" + "datamatch-eventfd", + "nodata-eventfd" }; static const char *iotest_type[] = { @@ -261,12 +263,19 @@ static void pci_testdev_realize(PCIDevice *pci_dev, Error **errp) memcpy(test->hdr->name, name, strlen(name) + 1); g_free(name); test->hdr->offset = cpu_to_le32(IOTEST_SIZE(i) + i * IOTEST_ACCESS_WIDTH); - test->size = IOTEST_ACCESS_WIDTH; - test->match_data = strcmp(IOTEST_TEST(i), "wildcard-eventfd"); + test->size = strcmp(IOTEST_TEST(i), "nodata-eventfd") ? IOTEST_ACCESS_WIDTH : 0; + + test->match_data = strcmp(IOTEST_TEST(i), "wildcard-eventfd") && + strcmp(IOTEST_TEST(i), "nodata-eventfd"); test->hdr->test = i; test->hdr->data = test->match_data ? IOTEST_DATAMATCH : IOTEST_NOMATCH; test->hdr->width = IOTEST_ACCESS_WIDTH; test->mr = IOTEST_REGION(d, i); + + if (!test->size && !IOTEST_IS_MEM(i)) { + test->hasnotifier = false; + continue; + } if (!strcmp(IOTEST_TEST(i), "no-eventfd")) { test->hasnotifier = false; continue; -- MST