[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] tests: Add scsi-disk test
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 5/7] tests: Add scsi-disk test |
Date: |
Fri, 25 Sep 2015 14:39:46 +0200 |
Test scsi-{disk,hd,cd} wwn properties for correct 64-bit parsing.
For now piggyback on virtio-scsi.
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
MAINTAINERS | 1 +
tests/Makefile | 3 ++
tests/scsi-disk-test.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
create mode 100644 tests/scsi-disk-test.c
diff --git a/MAINTAINERS b/MAINTAINERS
index a941cfd..2078f7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -688,6 +688,7 @@ M: Paolo Bonzini <address@hidden>
S: Supported
F: include/hw/scsi*
F: hw/scsi/*
+F: tests/scsi-disk-test.c
T: git git://github.com/bonzini/qemu.git scsi-next
LSI53C895A
diff --git a/tests/Makefile b/tests/Makefile
index 93116a2..e9cf3cc 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -106,6 +106,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
gcov-files-virtio-y += hw/virtio/virtio-rng.c
check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF)
gcov-files-virtio-y += i386-softmmu/hw/scsi/virtio-scsi.c
+check-qtest-virtio-y += tests/scsi-disk-test$(EXESUF)
+gcov-files-virtio-y += i386-softmmu/hw/scsi/scsi-disk.c
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
check-qtest-virtio-y += tests/virtio-9p-test$(EXESUF)
gcov-files-virtio-y += hw/9pfs/virtio-9p.c
@@ -435,6 +437,7 @@ tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o
$(libqos-usb-obj-y)
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o
tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o
qemu-timer.o $(qtest-obj-y)
+tests/scsi-disk-test$(EXESUF): tests/scsi-disk-test.o
tests/qemu-iotests/socket_scm_helper$(EXESUF):
tests/qemu-iotests/socket_scm_helper.o
tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o
$(test-block-obj-y)
diff --git a/tests/scsi-disk-test.c b/tests/scsi-disk-test.c
new file mode 100644
index 0000000..618fec9
--- /dev/null
+++ b/tests/scsi-disk-test.c
@@ -0,0 +1,83 @@
+/*
+ * QTest testcase for SCSI disks
+ * See virtio-scsi-test for more integrated tests.
+ *
+ * Copyright (c) 2015 SUSE Linux GmbH
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include <glib.h>
+#include <string.h>
+#include "libqtest.h"
+#include "qemu/osdep.h"
+#include "qapi/qmp/qint.h"
+
+static void test_scsi_disk_common(const char *type, const char *id)
+{
+ char *cmdline, *path;
+ QDict *response;
+ QInt *value;
+
+ cmdline = g_strdup_printf(
+ "-drive id=drv0,if=none,file=/dev/null,format=raw "
+ "-device virtio-scsi-pci,id=scsi0 "
+ "-device %s,id=%s,bus=scsi0.0,drive=drv0"
+ ",wwn=0x%" PRIx64 ",port_wwn=0x%" PRIx64,
+ type, id, UINT64_MAX, UINT64_C(1) << 63);
+ qtest_start(cmdline);
+ g_free(cmdline);
+
+ path = g_strdup_printf("/machine/peripheral/%s", id);
+
+ response = qmp("{ 'execute': 'qom-get',"
+ " 'arguments': { 'path': %s,"
+ " 'property': 'wwn' } }",
+ path);
+ g_assert(response);
+ g_assert(qdict_haskey(response, "return"));
+ value = qobject_to_qint(qdict_get(response, "return"));
+ g_assert_cmpint(qint_get_int(value), ==, UINT64_MAX);
+
+ response = qmp("{ 'execute': 'qom-get',"
+ " 'arguments': { 'path': %s,"
+ " 'property': 'port_wwn' } }",
+ path);
+ g_assert(response);
+ g_assert(qdict_haskey(response, "return"));
+ value = qobject_to_qint(qdict_get(response, "return"));
+ g_assert_cmpint(qint_get_int(value), ==, UINT64_C(1) << 63);
+
+ g_free(path);
+ qtest_end();
+}
+
+static void test_scsi_disk(void)
+{
+ test_scsi_disk_common("scsi-disk", "disk0");
+}
+
+static void test_scsi_hd(void)
+{
+ test_scsi_disk_common("scsi-hd", "hd0");
+}
+
+static void test_scsi_cd(void)
+{
+ test_scsi_disk_common("scsi-cd", "cd0");
+}
+
+int main(int argc, char **argv)
+{
+ int ret;
+
+ g_test_init(&argc, &argv, NULL);
+ qtest_add_func("/scsi-disk/props", test_scsi_disk);
+ qtest_add_func("/scsi-hd/props", test_scsi_hd);
+ qtest_add_func("/scsi-cd/props", test_scsi_cd);
+
+ ret = g_test_run();
+
+ return ret;
+}
--
2.1.4
- [Qemu-devel] [PATCH 0/7] visitor: Fix uint64 parsing for scsi-disk wwn, Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 3/7] test-string-input-visitor: Add uint64 test, Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 7/7] string-input-visitor: Use qemu_strto[u]ll(), Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 2/7] test-string-input-visitor: Add int test case, Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 1/7] string-input-visitor: Fix uint64 parsing, Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 5/7] tests: Add scsi-disk test,
Andreas Färber <=
- [Qemu-devel] [PATCH 4/7] tests: Add QOM property unit tests, Andreas Färber, 2015/09/25
- [Qemu-devel] [PATCH 6/7] cutils: Normalize qemu_strto[u]ll() signature, Andreas Färber, 2015/09/25
Re: [Qemu-devel] [PATCH 6/7] cutils: Normalize qemu_strto[u]ll() signature, Eric Blake, 2015/09/25