2012-03-08 15:29:00 +04:00
|
|
|
export SRC_PATH
|
|
|
|
|
|
2015-09-02 13:35:52 +03:00
|
|
|
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
|
|
|
|
|
|
2014-01-23 20:22:59 +04:00
|
|
|
# Get the list of all supported sysemu targets
|
|
|
|
|
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
|
|
|
|
|
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
|
|
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y = tests/check-qdict$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qdict-y = qobject/qdict.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/check-qfloat$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qfloat-y = qobject/qfloat.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/check-qint$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qint-y = qobject/qint.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/check-qstring$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qstring-y = qobject/qstring.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/check-qlist$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qlist-y = qobject/qlist.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/check-qjson$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-check-qjson-y = qobject/qjson.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-qmp-output-visitor$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-qmp-output-visitor-y = qapi/qmp-output-visitor.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-qmp-input-visitor$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-qmp-input-visitor-y = qapi/qmp-input-visitor.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-qmp-input-strict$(EXESUF)
|
|
|
|
|
check-unit-y += tests/test-qmp-commands$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-qmp-commands-y = qapi/qmp-dispatch.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-string-input-visitor$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-string-input-visitor-y = qapi/string-input-visitor.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-string-output-visitor$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-string-output-visitor-y = qapi/string-output-visitor.c
|
2014-06-18 10:43:29 +04:00
|
|
|
check-unit-y += tests/test-qmp-event$(EXESUF)
|
|
|
|
|
gcov-files-test-qmp-event-y += qapi/qmp-event.c
|
2013-08-20 02:35:40 +04:00
|
|
|
check-unit-y += tests/test-opts-visitor$(EXESUF)
|
|
|
|
|
gcov-files-test-opts-visitor-y = qapi/opts-visitor.c
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit-y += tests/test-coroutine$(EXESUF)
|
2013-04-08 15:11:27 +04:00
|
|
|
gcov-files-test-coroutine-y = coroutine-$(CONFIG_COROUTINE_BACKEND).c
|
2012-02-22 07:05:07 +04:00
|
|
|
check-unit-y += tests/test-visitor-serialization$(EXESUF)
|
rewrite iov_* functions
This changes implementations of all iov_*
functions, completing the previous step.
All iov_* functions now ensure that this offset
argument is within the iovec (using assertion),
but lets to specify `bytes' value larger than
actual length of the iovec - in this case they
stops at the actual end of iovec. It is also
suggested to use convinient `-1' value as `bytes'
to mean just this -- "up to the end".
There's one very minor semantic change here: new
requiriment is that `offset' points to inside of
iovec. This is checked just at the end of functions
(assert()), it does not actually need to be enforced,
but using any of these functions with offset pointing
past the end of iovec is wrong anyway.
Note: the new code in iov.c uses arithmetic with
void pointers. I thought this is not supported
everywhere and is a GCC extension (indeed, the C
standard does not define void arithmetic). However,
the original code already use void arith in
iov_from_buf() function:
(memcpy(..., buf + buf_off,...)
which apparently works well so far (it is this
way in qemu 1.0). So I left it this way and used
it in other places.
While at it, add a unit-test file test-iov.c,
to check various corner cases with iov_from_buf(),
iov_to_buf() and iov_memset().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-06-07 20:08:19 +04:00
|
|
|
check-unit-y += tests/test-iov$(EXESUF)
|
2013-01-15 12:49:35 +04:00
|
|
|
gcov-files-test-iov-y = util/iov.c
|
2012-11-23 19:13:23 +04:00
|
|
|
check-unit-y += tests/test-aio$(EXESUF)
|
2014-03-28 13:55:53 +04:00
|
|
|
check-unit-$(CONFIG_POSIX) += tests/test-rfifolock$(EXESUF)
|
2013-09-02 16:14:38 +04:00
|
|
|
check-unit-y += tests/test-throttle$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-aio-$(CONFIG_WIN32) = aio-win32.c
|
|
|
|
|
gcov-files-test-aio-$(CONFIG_POSIX) = aio-posix.c
|
2012-11-23 19:13:24 +04:00
|
|
|
check-unit-y += tests/test-thread-pool$(EXESUF)
|
2012-05-01 22:45:39 +04:00
|
|
|
gcov-files-test-thread-pool-y = thread-pool.c
|
add hierarchical bitmap data type and test cases
HBitmaps provides an array of bits. The bits are stored as usual in an
array of unsigned longs, but HBitmap is also optimized to provide fast
iteration over set bits; going from one bit to the next is O(logB n)
worst case, with B = sizeof(long) * CHAR_BIT: the result is low enough
that the number of levels is in fact fixed.
In order to do this, it stacks multiple bitmaps with progressively coarser
granularity; in all levels except the last, bit N is set iff the N-th
unsigned long is nonzero in the immediately next level. When iteration
completes on the last level it can examine the 2nd-last level to quickly
skip entire words, and even do so recursively to skip blocks of 64 words or
powers thereof (32 on 32-bit machines).
Given an index in the bitmap, it can be split in group of bits like
this (for the 64-bit case):
bits 0-57 => word in the last bitmap | bits 58-63 => bit in the word
bits 0-51 => word in the 2nd-last bitmap | bits 52-57 => bit in the word
bits 0-45 => word in the 3rd-last bitmap | bits 46-51 => bit in the word
So it is easy to move up simply by shifting the index right by
log2(BITS_PER_LONG) bits. To move down, you shift the index left
similarly, and add the word index within the group. Iteration uses
ffs (find first set bit) to find the next word to examine; this
operation can be done in constant time in most current architectures.
Setting or clearing a range of m bits on all levels, the work to perform
is O(m + m/W + m/W^2 + ...), which is O(m) like on a regular bitmap.
When iterating on a bitmap, each bit (on any level) is only visited
once. Hence, The total cost of visiting a bitmap with m bits in it is
the number of bits that are set in all bitmaps. Unless the bitmap is
extremely sparse, this is also O(m + m/W + m/W^2 + ...), so the amortized
cost of advancing from one bit to the next is usually constant.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2013-01-21 20:09:40 +04:00
|
|
|
gcov-files-test-hbitmap-y = util/hbitmap.c
|
|
|
|
|
check-unit-y += tests/test-hbitmap$(EXESUF)
|
2013-01-23 21:58:27 +04:00
|
|
|
check-unit-y += tests/test-x86-cpuid$(EXESUF)
|
|
|
|
|
# all code tested by test-x86-cpuid is inside topology.h
|
|
|
|
|
gcov-files-test-x86-cpuid-y =
|
2014-12-12 14:13:38 +03:00
|
|
|
ifeq ($(CONFIG_SOFTMMU),y)
|
2013-01-31 11:12:16 +04:00
|
|
|
check-unit-y += tests/test-xbzrle$(EXESUF)
|
2014-12-12 14:13:38 +03:00
|
|
|
gcov-files-test-xbzrle-y = migration/xbzrle.c
|
|
|
|
|
check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF)
|
|
|
|
|
endif
|
2013-02-04 22:27:45 +04:00
|
|
|
check-unit-y += tests/test-cutils$(EXESUF)
|
|
|
|
|
gcov-files-test-cutils-y += util/cutils.c
|
2013-02-17 00:47:01 +04:00
|
|
|
check-unit-y += tests/test-mul64$(EXESUF)
|
|
|
|
|
gcov-files-test-mul64-y = util/host-utils.c
|
2013-06-20 18:19:32 +04:00
|
|
|
check-unit-y += tests/test-int128$(EXESUF)
|
|
|
|
|
# all code tested by test-int128 is inside int128.h
|
|
|
|
|
gcov-files-test-int128-y =
|
2013-06-21 11:09:34 +04:00
|
|
|
check-unit-y += tests/rcutorture$(EXESUF)
|
|
|
|
|
gcov-files-rcutorture-y = util/rcu.c
|
2013-08-27 19:38:45 +04:00
|
|
|
check-unit-y += tests/test-rcu-list$(EXESUF)
|
|
|
|
|
gcov-files-test-rcu-list-y = util/rcu.c
|
2013-06-28 15:40:32 +04:00
|
|
|
check-unit-y += tests/test-bitops$(EXESUF)
|
2014-09-18 21:46:45 +04:00
|
|
|
check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += tests/test-qdev-global-props$(EXESUF)
|
2013-12-21 01:14:40 +04:00
|
|
|
check-unit-y += tests/check-qom-interface$(EXESUF)
|
|
|
|
|
gcov-files-check-qom-interface-y = qom/object.c
|
qom: Add object_new_with_props() / object_new_withpropv() helpers
It is reasonably common to want to create an object, set a
number of properties, register it in the hierarchy and then
mark it as complete (if a user creatable type). This requires
quite a lot of error prone, verbose, boilerplate code to achieve.
First a pair of functions object_set_props() / object_set_propv()
are added which allow for a list of objects to be set in
one single API call.
Then object_new_with_props() / object_new_with_propv() constructors
are added which simplify the sequence of calls to create an
object, populate properties, register in the object composition
tree and mark the object complete, into a single method call.
Usage would be:
Error *err = NULL;
Object *obj;
obj = object_new_with_propv(TYPE_MEMORY_BACKEND_FILE,
object_get_objects_root(),
"hostmem0",
&err,
"share", "yes",
"mem-path", "/dev/shm/somefile",
"prealloc", "yes",
"size", "1048576",
NULL);
Note all property values are passed in string form and will
be parsed into their required data types, using normal QOM
semantics for parsing from string format.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2015-05-13 19:14:06 +03:00
|
|
|
check-unit-y += tests/check-qom-proplist$(EXESUF)
|
|
|
|
|
gcov-files-check-qom-proplist-y = qom/object.c
|
2014-05-20 01:53:55 +04:00
|
|
|
check-unit-y += tests/test-qemu-opts$(EXESUF)
|
|
|
|
|
gcov-files-test-qemu-opts-y = qom/test-qemu-opts.c
|
block: add event when disk usage exceeds threshold
Managing applications, like oVirt (http://www.ovirt.org), make extensive
use of thin-provisioned disk images.
To let the guest run smoothly and be not unnecessarily paused, oVirt sets
a disk usage threshold (so called 'high water mark') based on the occupation
of the device, and automatically extends the image once the threshold
is reached or exceeded.
In order to detect the crossing of the threshold, oVirt has no choice but
aggressively polling the QEMU monitor using the query-blockstats command.
This lead to unnecessary system load, and is made even worse under scale:
deployments with hundreds of VMs are no longer rare.
To fix this, this patch adds:
* A new monitor command `block-set-write-threshold', to set a mark for
a given block device.
* A new event `BLOCK_WRITE_THRESHOLD', to report if a block device
usage exceeds the threshold.
* A new `write_threshold' field into the `BlockDeviceInfo' structure,
to report the configured threshold.
This will allow the managing application to use smarter and more
efficient monitoring, greatly reducing the need of polling.
[Updated qemu-iotests 067 output to add the new 'write_threshold'
property. --Stefan]
[Changed g_assert_false() to !g_assert() to fix the build on older glib
versions. --Kevin]
Signed-off-by: Francesco Romani <fromani@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1421068273-692-1-git-send-email-fromani@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2015-01-12 16:11:13 +03:00
|
|
|
check-unit-y += tests/test-write-threshold$(EXESUF)
|
|
|
|
|
gcov-files-test-write-threshold-y = block/write-threshold.c
|
2015-07-01 20:10:29 +03:00
|
|
|
check-unit-$(CONFIG_GNUTLS_HASH) += tests/test-crypto-hash$(EXESUF)
|
2015-07-01 20:10:32 +03:00
|
|
|
check-unit-y += tests/test-crypto-cipher$(EXESUF)
|
2015-04-13 16:01:39 +03:00
|
|
|
check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF)
|
2015-03-02 20:23:31 +03:00
|
|
|
check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF)
|
2012-03-28 17:42:01 +04:00
|
|
|
|
|
|
|
|
check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
|
|
|
|
|
|
2012-03-28 17:42:07 +04:00
|
|
|
# All QTests for now are POSIX-only, but the dependencies are
|
|
|
|
|
# really in libqtest, not in the testcases themselves.
|
2013-11-07 21:25:10 +04:00
|
|
|
|
2015-10-01 11:59:56 +03:00
|
|
|
check-qtest-generic-y = tests/device-introspect-test$(EXESUF)
|
|
|
|
|
gcov-files-generic-y = qdev-monitor.c qmp.c
|
tests: Fix how qom-test is run
We want to run qom-test for every architecture, without having to
manually add it to every architecture's list of tests. Commit 3687d53
accomplished this by adding it to every architecture's list
automatically.
However, some architectures inherit their tests from others, like this:
check-qtest-x86_64-y = $(check-qtest-i386-y)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
For such architectures, we ended up running the (slow!) test twice.
Commit 2b8419c attempted to avoid this by adding the test only when
it's not already present. Works only as long as we consider adding
the test to the architectures on the left hand side *after* the ones
on the right hand side: x86_64 after i386, microblazeel after
microblaze, xtensaeb after xtensa.
Turns out we consider them in $(SYSEMU_TARGET_LIST) order. Defined as
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
On my machine, this results in the oder xtensa, x86_64, microblazeel,
microblaze, i386. Consequently, qom-test runs twice for microblazeel
and x86_64.
Replace this complex and flawed machinery with a much simpler one: add
generic tests (currently just qom-test) to check-qtest-generic-y
instead of check-qtest-$(target)-y for every target, then run
$(check-qtest-generic-y) for every target.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Message-Id: <1443689999-12182-5-git-send-email-armbru@redhat.com>
2015-10-01 11:59:53 +03:00
|
|
|
|
2013-08-02 02:48:40 +04:00
|
|
|
gcov-files-ipack-y += hw/ipack/ipack.c
|
2014-02-09 15:24:15 +04:00
|
|
|
check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
|
|
|
|
gcov-files-ipack-y += hw/char/ipoctal232.c
|
|
|
|
|
|
2014-02-21 20:49:12 +04:00
|
|
|
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)
|
|
|
|
|
gcov-files-virtioserial-y += hw/char/virtio-console.c
|
|
|
|
|
|
2014-02-09 07:13:37 +04:00
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio.c
|
|
|
|
|
check-qtest-virtio-y += tests/virtio-net-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/net/virtio-net.c
|
2014-02-09 07:39:47 +04:00
|
|
|
check-qtest-virtio-y += tests/virtio-balloon-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio-balloon.c
|
2014-02-09 07:32:55 +04:00
|
|
|
check-qtest-virtio-y += tests/virtio-blk-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/block/virtio-blk.c
|
2014-02-09 07:43:10 +04:00
|
|
|
check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += hw/virtio/virtio-rng.c
|
2014-02-21 19:42:15 +04:00
|
|
|
check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/scsi/virtio-scsi.c
|
2014-02-21 20:15:21 +04:00
|
|
|
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
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/9pfs/virtio-9p-device.c
|
|
|
|
|
endif
|
2014-02-21 20:36:57 +04:00
|
|
|
check-qtest-virtio-y += tests/virtio-serial-test$(EXESUF)
|
|
|
|
|
gcov-files-virtio-y += i386-softmmu/hw/char/virtio-serial-bus.c
|
2014-02-21 20:49:12 +04:00
|
|
|
check-qtest-virtio-y += $(check-qtest-virtioserial-y)
|
|
|
|
|
gcov-files-virtio-y += $(gcov-files-virtioserial-y)
|
2014-02-09 07:13:37 +04:00
|
|
|
|
2013-11-07 21:25:10 +04:00
|
|
|
check-qtest-pci-y += tests/e1000-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/net/e1000.c
|
2013-11-07 21:43:09 +04:00
|
|
|
check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/net/rtl8139.c
|
2013-11-07 21:53:28 +04:00
|
|
|
check-qtest-pci-y += tests/pcnet-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/net/pcnet.c
|
|
|
|
|
gcov-files-pci-y += hw/net/pcnet-pci.c
|
2013-11-07 22:18:46 +04:00
|
|
|
check-qtest-pci-y += tests/eepro100-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/net/eepro100.c
|
2014-02-09 07:01:37 +04:00
|
|
|
check-qtest-pci-y += tests/ne2000-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/net/ne2000.c
|
2014-02-22 01:19:43 +04:00
|
|
|
check-qtest-pci-y += tests/nvme-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/block/nvme.c
|
2014-03-30 21:00:05 +04:00
|
|
|
check-qtest-pci-y += tests/ac97-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/audio/ac97.c
|
2014-03-30 21:05:20 +04:00
|
|
|
check-qtest-pci-y += tests/es1370-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/audio/es1370.c
|
2014-02-09 07:13:37 +04:00
|
|
|
check-qtest-pci-y += $(check-qtest-virtio-y)
|
|
|
|
|
gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
|
2014-02-09 06:48:44 +04:00
|
|
|
check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
2014-02-21 19:29:17 +04:00
|
|
|
gcov-files-pci-y += hw/ipack/tpci200.c
|
2014-02-09 15:24:15 +04:00
|
|
|
check-qtest-pci-y += $(check-qtest-ipack-y)
|
2014-02-21 19:29:17 +04:00
|
|
|
gcov-files-pci-y += $(gcov-files-ipack-y)
|
2014-04-28 13:01:13 +04:00
|
|
|
check-qtest-pci-y += tests/display-vga-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/display/vga.c
|
|
|
|
|
gcov-files-pci-y += hw/display/cirrus_vga.c
|
|
|
|
|
gcov-files-pci-y += hw/display/vga-pci.c
|
2014-04-28 13:10:12 +04:00
|
|
|
gcov-files-pci-y += hw/display/virtio-gpu.c
|
|
|
|
|
gcov-files-pci-y += hw/display/virtio-gpu-pci.c
|
|
|
|
|
gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
|
2014-03-30 21:22:48 +04:00
|
|
|
check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
|
|
|
|
|
gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
|
2013-11-07 21:25:10 +04:00
|
|
|
|
2013-07-22 17:54:34 +04:00
|
|
|
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
2014-02-14 18:09:28 +04:00
|
|
|
gcov-files-i386-y = hw/block/fdc.c
|
2013-05-08 13:18:41 +04:00
|
|
|
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
2014-08-21 21:44:32 +04:00
|
|
|
check-qtest-i386-y += tests/ahci-test$(EXESUF)
|
2012-07-10 13:12:30 +04:00
|
|
|
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
|
2014-02-14 18:09:28 +04:00
|
|
|
gcov-files-i386-y += hw/block/hd-geometry.c
|
2013-06-26 17:52:13 +04:00
|
|
|
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
2014-05-27 23:03:14 +04:00
|
|
|
check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
2012-05-15 20:19:45 +04:00
|
|
|
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
2013-04-16 18:45:19 +04:00
|
|
|
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
2013-04-16 18:45:21 +04:00
|
|
|
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
2014-10-02 18:51:31 +04:00
|
|
|
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
|
2014-07-15 16:57:06 +04:00
|
|
|
check-qtest-i386-y += tests/wdt_ib700-test$(EXESUF)
|
2015-07-08 10:06:15 +03:00
|
|
|
check-qtest-i386-y += tests/tco-test$(EXESUF)
|
2014-07-15 16:57:06 +04:00
|
|
|
gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
2013-11-07 21:25:10 +04:00
|
|
|
check-qtest-i386-y += $(check-qtest-pci-y)
|
|
|
|
|
gcov-files-i386-y += $(gcov-files-pci-y)
|
2013-11-07 21:37:34 +04:00
|
|
|
check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/net/vmxnet3.c
|
|
|
|
|
gcov-files-i386-y += hw/net/vmxnet_rx_pkt.c
|
|
|
|
|
gcov-files-i386-y += hw/net/vmxnet_tx_pkt.c
|
2014-02-21 23:38:48 +04:00
|
|
|
check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
|
2014-02-22 01:43:43 +04:00
|
|
|
check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/pci-bridge/i82801b11.c
|
2014-03-30 22:02:00 +04:00
|
|
|
check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/pci-bridge/ioh3420.c
|
2014-06-23 15:53:51 +04:00
|
|
|
check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/usb/hcd-ohci.c
|
2014-06-23 15:53:52 +04:00
|
|
|
check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/usb/hcd-uhci.c
|
2014-03-30 22:25:38 +04:00
|
|
|
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/usb/hcd-ehci.c
|
2014-05-07 18:39:11 +04:00
|
|
|
gcov-files-i386-y += hw/usb/dev-hid.c
|
|
|
|
|
gcov-files-i386-y += hw/usb/dev-storage.c
|
2014-06-23 15:53:53 +04:00
|
|
|
check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/usb/hcd-xhci.c
|
2015-03-13 19:21:11 +03:00
|
|
|
check-qtest-i386-y += tests/pc-cpu-test$(EXESUF)
|
2015-04-14 16:11:36 +03:00
|
|
|
check-qtest-i386-y += tests/q35-test$(EXESUF)
|
|
|
|
|
gcov-files-i386-y += hw/pci-host/q35.c
|
2015-10-06 12:17:55 +03:00
|
|
|
ifeq ($(CONFIG_VHOST_NET),y)
|
2014-07-15 21:30:41 +04:00
|
|
|
check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
|
2015-10-06 12:17:55 +03:00
|
|
|
endif
|
2012-03-28 17:42:07 +04:00
|
|
|
check-qtest-x86_64-y = $(check-qtest-i386-y)
|
2014-02-14 18:09:28 +04:00
|
|
|
gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
|
2013-01-26 15:45:14 +04:00
|
|
|
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
|
2013-07-22 17:54:34 +04:00
|
|
|
check-qtest-mips-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-mips64-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-mips64el-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-ppc-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-ppc64-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-sh4-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
|
|
|
|
|
check-qtest-sparc64-y = tests/endianness-test$(EXESUF)
|
2013-01-30 01:42:45 +04:00
|
|
|
#check-qtest-sparc-y = tests/m48t59-test$(EXESUF)
|
2013-07-22 17:54:34 +04:00
|
|
|
#check-qtest-sparc64-y += tests/m48t59-test$(EXESUF)
|
2014-02-14 18:09:28 +04:00
|
|
|
gcov-files-sparc-y += hw/timer/m48t59.c
|
|
|
|
|
gcov-files-sparc64-y += hw/timer/m48t59.c
|
2013-01-16 04:57:57 +04:00
|
|
|
check-qtest-arm-y = tests/tmp105-test$(EXESUF)
|
2015-09-07 12:39:31 +03:00
|
|
|
check-qtest-arm-y = tests/ds1338-test$(EXESUF)
|
2014-02-14 18:09:28 +04:00
|
|
|
gcov-files-arm-y += hw/misc/tmp105.c
|
2015-02-25 00:21:55 +03:00
|
|
|
check-qtest-arm-y += tests/virtio-blk-test$(EXESUF)
|
|
|
|
|
gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
|
2013-06-26 17:52:16 +04:00
|
|
|
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
|
|
|
|
check-qtest-ppc64-y += tests/boot-order-test$(EXESUF)
|
2014-02-10 07:52:56 +04:00
|
|
|
check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
|
|
|
|
|
gcov-files-ppc64-y += ppc64-softmmu/hw/ppc/spapr_pci.c
|
2013-07-29 07:44:47 +04:00
|
|
|
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
|
|
|
|
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
|
2012-03-28 17:42:07 +04:00
|
|
|
|
tests: Fix how qom-test is run
We want to run qom-test for every architecture, without having to
manually add it to every architecture's list of tests. Commit 3687d53
accomplished this by adding it to every architecture's list
automatically.
However, some architectures inherit their tests from others, like this:
check-qtest-x86_64-y = $(check-qtest-i386-y)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
For such architectures, we ended up running the (slow!) test twice.
Commit 2b8419c attempted to avoid this by adding the test only when
it's not already present. Works only as long as we consider adding
the test to the architectures on the left hand side *after* the ones
on the right hand side: x86_64 after i386, microblazeel after
microblaze, xtensaeb after xtensa.
Turns out we consider them in $(SYSEMU_TARGET_LIST) order. Defined as
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
On my machine, this results in the oder xtensa, x86_64, microblazeel,
microblaze, i386. Consequently, qom-test runs twice for microblazeel
and x86_64.
Replace this complex and flawed machinery with a much simpler one: add
generic tests (currently just qom-test) to check-qtest-generic-y
instead of check-qtest-$(target)-y for every target, then run
$(check-qtest-generic-y) for every target.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Message-Id: <1443689999-12182-5-git-send-email-armbru@redhat.com>
2015-10-01 11:59:53 +03:00
|
|
|
check-qtest-generic-y += tests/qom-test$(EXESUF)
|
2014-01-23 20:22:59 +04:00
|
|
|
|
2013-07-27 19:41:53 +04:00
|
|
|
check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
|
2015-05-04 18:05:03 +03:00
|
|
|
comments.json empty.json enum-empty.json enum-missing-data.json \
|
|
|
|
|
enum-wrong-data.json enum-int-member.json enum-dict-member.json \
|
|
|
|
|
enum-clash-member.json enum-max-member.json enum-union-clash.json \
|
2015-08-26 16:21:20 +03:00
|
|
|
enum-bad-name.json enum-bad-prefix.json \
|
|
|
|
|
funny-char.json indented-expr.json \
|
2015-05-04 18:05:14 +03:00
|
|
|
missing-type.json bad-ident.json ident-with-escape.json \
|
qapi: Support (subset of) \u escapes in strings
The handling of \ inside QAPI strings was less than ideal, and
really only worked JSON's \/, \\, \", and our extension of \'
(an obvious extension, when you realize we use '' instead of ""
for strings). For other things, like '\n', it resulted in a
literal 'n' instead of a newline.
Of course, at the moment, we really have no use for escaped
characters, as QAPI has to map to C identifiers, and we currently
support ASCII only for that. But down the road, we may add
support for default values for string parameters to a command
or struct; if that happens, it would be nice to correctly support
all JSON escape sequences, such as \n or \uXXXX. This gets us
closer, by supporting Unicode escapes in the ASCII range.
Since JSON does not require \OCTAL or \xXX escapes, and our QMP
implementation does not understand them either, I intentionally
reject it here, but it would be an easy addition if we desired it.
Likewise, intentionally refusing the NUL byte means we don't have
to worry about C strings being shorter than the qapi input.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 18:05:36 +03:00
|
|
|
escape-outside-string.json unknown-escape.json \
|
|
|
|
|
escape-too-short.json escape-too-big.json unicode-str.json \
|
2015-05-04 18:05:14 +03:00
|
|
|
double-type.json bad-base.json bad-type-bool.json bad-type-int.json \
|
|
|
|
|
bad-type-dict.json double-data.json unknown-expr-key.json \
|
2015-05-04 18:05:16 +03:00
|
|
|
redefined-type.json redefined-command.json redefined-builtin.json \
|
2015-05-04 18:05:20 +03:00
|
|
|
redefined-event.json command-int.json bad-data.json event-max.json \
|
2015-09-16 14:06:27 +03:00
|
|
|
type-bypass-bad-gen.json \
|
2015-08-31 18:17:42 +03:00
|
|
|
args-invalid.json \
|
2015-07-31 14:30:50 +03:00
|
|
|
args-array-empty.json args-array-unknown.json args-int.json \
|
|
|
|
|
args-unknown.json args-member-unknown.json args-member-array.json \
|
2015-07-01 10:54:11 +03:00
|
|
|
args-member-array-bad.json args-alternate.json args-union.json \
|
2015-09-16 14:06:24 +03:00
|
|
|
args-any.json \
|
qapi: Command returning anonymous type doesn't work, outlaw
Reproducer: with
{ 'command': 'user_def_cmd4', 'returns': { 'a': 'int' } }
added to qapi-schema-test.json, qapi-commands.py dies when it tries to
generate the command handler function
Traceback (most recent call last):
File "/work/armbru/qemu/scripts/qapi-commands.py", line 359, in <module>
ret = generate_command_decl(cmd['command'], arglist, ret_type) + "\n"
File "/work/armbru/qemu/scripts/qapi-commands.py", line 29, in generate_command_decl
ret_type=c_type(ret_type), name=c_name(name),
File "/work/armbru/qemu/scripts/qapi.py", line 927, in c_type
assert isinstance(value, str) and value != ""
AssertionError
because the return type doesn't exist.
Simply outlaw this usage, and drop or dumb down test cases accordingly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-07-31 18:59:38 +03:00
|
|
|
returns-array-bad.json returns-int.json returns-dict.json \
|
2015-05-04 18:05:20 +03:00
|
|
|
returns-unknown.json returns-alternate.json returns-whitelist.json \
|
|
|
|
|
missing-colon.json missing-comma-list.json missing-comma-object.json \
|
2015-08-31 18:17:42 +03:00
|
|
|
struct-data-invalid.json struct-member-invalid.json \
|
qapi: Command returning anonymous type doesn't work, outlaw
Reproducer: with
{ 'command': 'user_def_cmd4', 'returns': { 'a': 'int' } }
added to qapi-schema-test.json, qapi-commands.py dies when it tries to
generate the command handler function
Traceback (most recent call last):
File "/work/armbru/qemu/scripts/qapi-commands.py", line 359, in <module>
ret = generate_command_decl(cmd['command'], arglist, ret_type) + "\n"
File "/work/armbru/qemu/scripts/qapi-commands.py", line 29, in generate_command_decl
ret_type=c_type(ret_type), name=c_name(name),
File "/work/armbru/qemu/scripts/qapi.py", line 927, in c_type
assert isinstance(value, str) and value != ""
AssertionError
because the return type doesn't exist.
Simply outlaw this usage, and drop or dumb down test cases accordingly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-07-31 18:59:38 +03:00
|
|
|
nested-struct-data.json non-objects.json \
|
2014-09-26 19:20:31 +04:00
|
|
|
qapi-schema-test.json quoted-structural-chars.json \
|
2015-08-31 16:47:55 +03:00
|
|
|
leading-comma-list.json leading-comma-object.json \
|
2014-09-26 19:20:31 +04:00
|
|
|
trailing-comma-list.json trailing-comma-object.json \
|
|
|
|
|
unclosed-list.json unclosed-object.json unclosed-string.json \
|
2015-05-04 18:05:05 +03:00
|
|
|
duplicate-key.json union-invalid-base.json union-bad-branch.json \
|
|
|
|
|
union-optional-branch.json union-unknown.json union-max.json \
|
|
|
|
|
flat-union-optional-discriminator.json flat-union-no-base.json \
|
|
|
|
|
flat-union-invalid-discriminator.json flat-union-inline.json \
|
2014-09-26 19:20:31 +04:00
|
|
|
flat-union-invalid-branch-key.json flat-union-reverse-define.json \
|
2015-05-04 18:05:05 +03:00
|
|
|
flat-union-string-discriminator.json union-base-no-discriminator.json \
|
|
|
|
|
flat-union-bad-discriminator.json flat-union-bad-base.json \
|
2015-09-16 14:06:24 +03:00
|
|
|
flat-union-base-any.json \
|
2015-06-10 14:03:04 +03:00
|
|
|
flat-union-array-branch.json flat-union-int-branch.json \
|
2015-05-04 18:05:05 +03:00
|
|
|
flat-union-base-union.json flat-union-branch-clash.json \
|
|
|
|
|
alternate-nested.json alternate-unknown.json alternate-clash.json \
|
|
|
|
|
alternate-good.json alternate-base.json alternate-array.json \
|
|
|
|
|
alternate-conflict-string.json alternate-conflict-dict.json \
|
2014-09-26 19:20:31 +04:00
|
|
|
include-simple.json include-relpath.json include-format-err.json \
|
|
|
|
|
include-non-file.json include-no-file.json include-before-err.json \
|
|
|
|
|
include-nested-err.json include-self-cycle.json include-cycle.json \
|
2015-05-04 18:05:37 +03:00
|
|
|
include-repetition.json event-nest-struct.json event-case.json \
|
|
|
|
|
struct-base-clash.json struct-base-clash-deep.json )
|
2013-07-27 19:41:53 +04:00
|
|
|
|
2014-06-18 10:43:29 +04:00
|
|
|
GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h \
|
qapi: New QMP command query-qmp-schema for QMP introspection
qapi/introspect.json defines the introspection schema. It's designed
for QMP introspection, but should do for similar uses, such as QGA.
The introspection schema does not reflect all the rules and
restrictions that apply to QAPI schemata. A valid QAPI schema has an
introspection value conforming to the introspection schema, but the
converse is not true.
Introspection lowers away a number of schema details, and makes
implicit things explicit:
* The built-in types are declared with their JSON type.
All integer types are mapped to 'int', because how many bits we use
internally is an implementation detail. It could be pressed into
external interface service as very approximate range information,
but that's a bad idea. If we need range information, we better do
it properly.
* Implicit type definitions are made explicit, and given
auto-generated names:
- Array types, named by appending "List" to the name of their
element type, like in generated C.
- The enumeration types implicitly defined by simple union types,
named by appending "Kind" to the name of their simple union type,
like in generated C.
- Types that don't occur in generated C. Their names start with ':'
so they don't clash with the user's names.
* All type references are by name.
* The struct and union types are generalized into an object type.
* Base types are flattened.
* Commands take a single argument and return a single result.
Dictionary argument or list result is an implicit type definition.
The empty object type is used when a command takes no arguments or
produces no results.
The argument is always of object type, but the introspection schema
doesn't reflect that.
The 'gen': false directive is omitted as implementation detail.
The 'success-response' directive is omitted as well for now, even
though it's not an implementation detail, because it's not used by
QMP.
* Events carry a single data value.
Implicit type definition and empty object type use, just like for
commands.
The value is of object type, but the introspection schema doesn't
reflect that.
* Types not used by commands or events are omitted.
Indirect use counts as use.
* Optional members have a default, which can only be null right now
Instead of a mandatory "optional" flag, we have an optional default.
No default means mandatory, default null means optional without
default value. Non-null is available for optional with default
(possible future extension).
* Clients should *not* look up types by name, because type names are
not ABI. Look up the command or event you're interested in, then
follow the references.
TODO Should we hide the type names to eliminate the temptation?
New generator scripts/qapi-introspect.py computes an introspection
value for its input, and generates a C variable holding it.
It can generate awfully long lines. Marked TODO.
A new test-qmp-input-visitor test case feeds its result for both
tests/qapi-schema/qapi-schema-test.json and qapi-schema.json to a
QmpInputVisitor to verify it actually conforms to the schema.
New QMP command query-qmp-schema takes its return value from that
variable. Its reply is some 85KiBytes for me right now.
If this turns out to be too much, we have a couple of options:
* We can use shorter names in the JSON. Not the QMP style.
* Optionally return the sub-schema for commands and events given as
arguments.
Right now qmp_query_schema() sends the string literal computed by
qmp-introspect.py. To compute sub-schema at run time, we'd have to
duplicate parts of qapi-introspect.py in C. Unattractive.
* Let clients cache the output of query-qmp-schema.
It changes only on QEMU upgrades, i.e. rarely. Provide a command
query-qmp-schema-hash. Clients can have a cache indexed by hash,
and re-query the schema only when they don't have it cached. Even
simpler: put the hash in the QMP greeting.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-09-16 14:06:28 +03:00
|
|
|
tests/test-qmp-commands.h tests/test-qapi-event.h \
|
|
|
|
|
tests/test-qmp-introspect.h
|
2012-03-28 17:42:01 +04:00
|
|
|
|
|
|
|
|
test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \
|
|
|
|
|
tests/check-qlist.o tests/check-qfloat.o tests/check-qjson.o \
|
|
|
|
|
tests/test-coroutine.o tests/test-string-output-visitor.o \
|
|
|
|
|
tests/test-string-input-visitor.o tests/test-qmp-output-visitor.o \
|
|
|
|
|
tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \
|
2013-01-23 21:58:27 +04:00
|
|
|
tests/test-qmp-commands.o tests/test-visitor-serialization.o \
|
2013-08-20 02:35:40 +04:00
|
|
|
tests/test-x86-cpuid.o tests/test-mul64.o tests/test-int128.o \
|
2013-06-21 11:09:34 +04:00
|
|
|
tests/test-opts-visitor.o tests/test-qmp-event.o \
|
2013-08-27 19:38:45 +04:00
|
|
|
tests/rcutorture.o tests/test-rcu-list.o
|
2012-03-28 17:42:01 +04:00
|
|
|
|
|
|
|
|
$(test-obj-y): QEMU_INCLUDES += -Itests
|
2013-04-16 18:45:16 +04:00
|
|
|
QEMU_CFLAGS += -I$(SRC_PATH)/tests
|
2012-03-28 17:42:01 +04:00
|
|
|
|
2015-09-02 13:35:52 +03:00
|
|
|
|
|
|
|
|
# Deps that are common to various different sets of tests below
|
|
|
|
|
test-util-obj-y = libqemuutil.a libqemustub.a
|
2015-09-02 13:18:16 +03:00
|
|
|
test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y)
|
2015-09-02 13:35:52 +03:00
|
|
|
test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \
|
qapi: New QMP command query-qmp-schema for QMP introspection
qapi/introspect.json defines the introspection schema. It's designed
for QMP introspection, but should do for similar uses, such as QGA.
The introspection schema does not reflect all the rules and
restrictions that apply to QAPI schemata. A valid QAPI schema has an
introspection value conforming to the introspection schema, but the
converse is not true.
Introspection lowers away a number of schema details, and makes
implicit things explicit:
* The built-in types are declared with their JSON type.
All integer types are mapped to 'int', because how many bits we use
internally is an implementation detail. It could be pressed into
external interface service as very approximate range information,
but that's a bad idea. If we need range information, we better do
it properly.
* Implicit type definitions are made explicit, and given
auto-generated names:
- Array types, named by appending "List" to the name of their
element type, like in generated C.
- The enumeration types implicitly defined by simple union types,
named by appending "Kind" to the name of their simple union type,
like in generated C.
- Types that don't occur in generated C. Their names start with ':'
so they don't clash with the user's names.
* All type references are by name.
* The struct and union types are generalized into an object type.
* Base types are flattened.
* Commands take a single argument and return a single result.
Dictionary argument or list result is an implicit type definition.
The empty object type is used when a command takes no arguments or
produces no results.
The argument is always of object type, but the introspection schema
doesn't reflect that.
The 'gen': false directive is omitted as implementation detail.
The 'success-response' directive is omitted as well for now, even
though it's not an implementation detail, because it's not used by
QMP.
* Events carry a single data value.
Implicit type definition and empty object type use, just like for
commands.
The value is of object type, but the introspection schema doesn't
reflect that.
* Types not used by commands or events are omitted.
Indirect use counts as use.
* Optional members have a default, which can only be null right now
Instead of a mandatory "optional" flag, we have an optional default.
No default means mandatory, default null means optional without
default value. Non-null is available for optional with default
(possible future extension).
* Clients should *not* look up types by name, because type names are
not ABI. Look up the command or event you're interested in, then
follow the references.
TODO Should we hide the type names to eliminate the temptation?
New generator scripts/qapi-introspect.py computes an introspection
value for its input, and generates a C variable holding it.
It can generate awfully long lines. Marked TODO.
A new test-qmp-input-visitor test case feeds its result for both
tests/qapi-schema/qapi-schema-test.json and qapi-schema.json to a
QmpInputVisitor to verify it actually conforms to the schema.
New QMP command query-qmp-schema takes its return value from that
variable. Its reply is some 85KiBytes for me right now.
If this turns out to be too much, we have a couple of options:
* We can use shorter names in the JSON. Not the QMP style.
* Optionally return the sub-schema for commands and events given as
arguments.
Right now qmp_query_schema() sends the string literal computed by
qmp-introspect.py. To compute sub-schema at run time, we'd have to
duplicate parts of qapi-introspect.py in C. Unattractive.
* Let clients cache the output of query-qmp-schema.
It changes only on QEMU upgrades, i.e. rarely. Provide a command
query-qmp-schema-hash. Clients can have a cache indexed by hash,
and re-query the schema only when they don't have it cached. Even
simpler: put the hash in the QMP greeting.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-09-16 14:06:28 +03:00
|
|
|
tests/test-qapi-event.o tests/test-qmp-introspect.o \
|
2015-09-02 13:35:52 +03:00
|
|
|
$(test-qom-obj-y)
|
2015-03-13 20:39:26 +03:00
|
|
|
test-crypto-obj-y = $(crypto-obj-y) $(test-qom-obj-y)
|
2015-09-02 12:57:27 +03:00
|
|
|
test-block-obj-y = $(block-obj-y) $(test-crypto-obj-y)
|
2015-09-02 13:35:52 +03:00
|
|
|
|
|
|
|
|
tests/check-qint$(EXESUF): tests/check-qint.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qfloat$(EXESUF): tests/check-qfloat.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
|
|
|
|
|
tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
|
|
|
|
|
tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
|
|
|
|
|
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
|
|
|
|
|
tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y)
|
|
|
|
|
tests/test-rfifolock$(EXESUF): tests/test-rfifolock.o $(test-util-obj-y)
|
|
|
|
|
tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y)
|
|
|
|
|
tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y)
|
|
|
|
|
tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y)
|
|
|
|
|
tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y)
|
2013-01-23 21:58:27 +04:00
|
|
|
tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o
|
2015-09-02 13:35:52 +03:00
|
|
|
tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o $(test-util-obj-y)
|
2013-02-04 22:27:45 +04:00
|
|
|
tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o
|
2013-06-20 18:19:32 +04:00
|
|
|
tests/test-int128$(EXESUF): tests/test-int128.o
|
2015-09-02 13:35:52 +03:00
|
|
|
tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y)
|
|
|
|
|
tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y)
|
2013-06-21 11:09:34 +04:00
|
|
|
|
2013-07-11 00:08:40 +04:00
|
|
|
tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \
|
2014-02-05 19:36:52 +04:00
|
|
|
hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\
|
2013-07-11 00:08:40 +04:00
|
|
|
hw/core/irq.o \
|
2014-03-17 06:40:23 +04:00
|
|
|
hw/core/fw-path-provider.o \
|
2015-09-02 13:35:52 +03:00
|
|
|
$(test-qapi-obj-y)
|
2013-11-28 18:01:18 +04:00
|
|
|
tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
|
2014-12-12 14:13:41 +03:00
|
|
|
migration/vmstate.o migration/qemu-file.o migration/qemu-file-buf.o \
|
2015-01-22 17:01:39 +03:00
|
|
|
migration/qemu-file-unix.o qjson.o \
|
2015-09-02 13:35:52 +03:00
|
|
|
$(test-qom-obj-y)
|
2012-03-28 17:42:01 +04:00
|
|
|
|
|
|
|
|
tests/test-qapi-types.c tests/test-qapi-types.h :\
|
2015-04-02 14:38:48 +03:00
|
|
|
$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
|
2014-05-02 17:52:24 +04:00
|
|
|
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
|
2015-04-02 14:32:16 +03:00
|
|
|
$(gen-out-type) -o tests -p "test-" $<, \
|
2014-05-02 17:52:24 +04:00
|
|
|
" GEN $@")
|
2012-03-28 17:42:01 +04:00
|
|
|
tests/test-qapi-visit.c tests/test-qapi-visit.h :\
|
2015-04-02 14:38:48 +03:00
|
|
|
$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
|
2014-05-02 17:52:24 +04:00
|
|
|
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
|
2015-04-02 14:32:16 +03:00
|
|
|
$(gen-out-type) -o tests -p "test-" $<, \
|
2014-05-02 17:52:24 +04:00
|
|
|
" GEN $@")
|
2012-03-28 17:42:01 +04:00
|
|
|
tests/test-qmp-commands.h tests/test-qmp-marshal.c :\
|
2015-04-02 14:38:48 +03:00
|
|
|
$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
|
2014-05-02 17:52:24 +04:00
|
|
|
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
|
2015-04-02 14:32:16 +03:00
|
|
|
$(gen-out-type) -o tests -p "test-" $<, \
|
2014-05-02 17:52:24 +04:00
|
|
|
" GEN $@")
|
2014-06-18 10:43:29 +04:00
|
|
|
tests/test-qapi-event.c tests/test-qapi-event.h :\
|
2015-04-02 14:38:48 +03:00
|
|
|
$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
|
2014-06-18 10:43:29 +04:00
|
|
|
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \
|
2015-04-02 14:32:16 +03:00
|
|
|
$(gen-out-type) -o tests -p "test-" $<, \
|
2014-06-18 10:43:29 +04:00
|
|
|
" GEN $@")
|
qapi: New QMP command query-qmp-schema for QMP introspection
qapi/introspect.json defines the introspection schema. It's designed
for QMP introspection, but should do for similar uses, such as QGA.
The introspection schema does not reflect all the rules and
restrictions that apply to QAPI schemata. A valid QAPI schema has an
introspection value conforming to the introspection schema, but the
converse is not true.
Introspection lowers away a number of schema details, and makes
implicit things explicit:
* The built-in types are declared with their JSON type.
All integer types are mapped to 'int', because how many bits we use
internally is an implementation detail. It could be pressed into
external interface service as very approximate range information,
but that's a bad idea. If we need range information, we better do
it properly.
* Implicit type definitions are made explicit, and given
auto-generated names:
- Array types, named by appending "List" to the name of their
element type, like in generated C.
- The enumeration types implicitly defined by simple union types,
named by appending "Kind" to the name of their simple union type,
like in generated C.
- Types that don't occur in generated C. Their names start with ':'
so they don't clash with the user's names.
* All type references are by name.
* The struct and union types are generalized into an object type.
* Base types are flattened.
* Commands take a single argument and return a single result.
Dictionary argument or list result is an implicit type definition.
The empty object type is used when a command takes no arguments or
produces no results.
The argument is always of object type, but the introspection schema
doesn't reflect that.
The 'gen': false directive is omitted as implementation detail.
The 'success-response' directive is omitted as well for now, even
though it's not an implementation detail, because it's not used by
QMP.
* Events carry a single data value.
Implicit type definition and empty object type use, just like for
commands.
The value is of object type, but the introspection schema doesn't
reflect that.
* Types not used by commands or events are omitted.
Indirect use counts as use.
* Optional members have a default, which can only be null right now
Instead of a mandatory "optional" flag, we have an optional default.
No default means mandatory, default null means optional without
default value. Non-null is available for optional with default
(possible future extension).
* Clients should *not* look up types by name, because type names are
not ABI. Look up the command or event you're interested in, then
follow the references.
TODO Should we hide the type names to eliminate the temptation?
New generator scripts/qapi-introspect.py computes an introspection
value for its input, and generates a C variable holding it.
It can generate awfully long lines. Marked TODO.
A new test-qmp-input-visitor test case feeds its result for both
tests/qapi-schema/qapi-schema-test.json and qapi-schema.json to a
QmpInputVisitor to verify it actually conforms to the schema.
New QMP command query-qmp-schema takes its return value from that
variable. Its reply is some 85KiBytes for me right now.
If this turns out to be too much, we have a couple of options:
* We can use shorter names in the JSON. Not the QMP style.
* Optionally return the sub-schema for commands and events given as
arguments.
Right now qmp_query_schema() sends the string literal computed by
qmp-introspect.py. To compute sub-schema at run time, we'd have to
duplicate parts of qapi-introspect.py in C. Unattractive.
* Let clients cache the output of query-qmp-schema.
It changes only on QEMU upgrades, i.e. rarely. Provide a command
query-qmp-schema-hash. Clients can have a cache indexed by hash,
and re-query the schema only when they don't have it cached. Even
simpler: put the hash in the QMP greeting.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-09-16 14:06:28 +03:00
|
|
|
tests/test-qmp-introspect.c tests/test-qmp-introspect.h :\
|
|
|
|
|
$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
|
|
|
|
|
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-introspect.py \
|
|
|
|
|
$(gen-out-type) -o tests -p "test-" $<, \
|
|
|
|
|
" GEN $@")
|
2012-01-10 23:10:43 +04:00
|
|
|
|
2015-09-02 13:35:52 +03:00
|
|
|
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y)
|
|
|
|
|
tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-obj-y)
|
2012-02-09 14:21:03 +04:00
|
|
|
|
2015-09-02 13:35:52 +03:00
|
|
|
tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y)
|
|
|
|
|
tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y)
|
2015-09-02 12:57:27 +03:00
|
|
|
tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y)
|
|
|
|
|
tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypto-obj-y)
|
2015-04-13 16:01:39 +03:00
|
|
|
tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \
|
|
|
|
|
tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y)
|
2015-03-02 20:23:31 +03:00
|
|
|
tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \
|
|
|
|
|
tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y)
|
2013-02-17 00:47:01 +04:00
|
|
|
|
2014-10-23 12:12:42 +04:00
|
|
|
libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o tests/libqos/malloc.o
|
2015-01-19 23:15:55 +03:00
|
|
|
libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o
|
2013-06-26 17:52:22 +04:00
|
|
|
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
|
2015-01-19 23:15:55 +03:00
|
|
|
libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o
|
2015-01-19 23:16:03 +03:00
|
|
|
libqos-pc-obj-y += tests/libqos/ahci.o
|
2013-05-02 17:56:26 +04:00
|
|
|
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
|
2015-09-07 12:39:31 +03:00
|
|
|
libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o
|
2014-09-26 13:28:12 +04:00
|
|
|
libqos-usb-obj-y = $(libqos-pc-obj-y) tests/libqos/usb.o
|
2015-02-25 00:21:55 +03:00
|
|
|
libqos-virtio-obj-y = $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/libqos/malloc-generic.o
|
2013-04-16 18:45:16 +04:00
|
|
|
|
2015-10-01 11:59:56 +03:00
|
|
|
tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o
|
2012-12-21 12:45:20 +04:00
|
|
|
tests/rtc-test$(EXESUF): tests/rtc-test.o
|
|
|
|
|
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
2013-07-22 17:54:34 +04:00
|
|
|
tests/endianness-test$(EXESUF): tests/endianness-test.o
|
2014-02-10 07:52:56 +04:00
|
|
|
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
|
2012-12-21 12:45:20 +04:00
|
|
|
tests/fdc-test$(EXESUF): tests/fdc-test.o
|
2013-05-08 13:18:41 +04:00
|
|
|
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
|
2015-01-19 23:15:55 +03:00
|
|
|
tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
|
2012-12-21 12:45:20 +04:00
|
|
|
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
2013-06-26 17:52:16 +04:00
|
|
|
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
|
2014-05-27 23:03:14 +04:00
|
|
|
tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o $(libqos-obj-y)
|
2013-05-02 17:56:26 +04:00
|
|
|
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
2015-09-07 12:39:31 +03:00
|
|
|
tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y)
|
2013-04-16 18:45:19 +04:00
|
|
|
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
2015-04-14 16:11:36 +03:00
|
|
|
tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y)
|
2013-04-16 18:45:21 +04:00
|
|
|
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
2013-11-07 21:25:10 +04:00
|
|
|
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
2015-01-08 21:38:23 +03:00
|
|
|
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
2013-11-07 21:53:28 +04:00
|
|
|
tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
2013-11-07 22:18:46 +04:00
|
|
|
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
2013-11-07 21:37:34 +04:00
|
|
|
tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
2014-02-09 07:01:37 +04:00
|
|
|
tests/ne2000-test$(EXESUF): tests/ne2000-test.o
|
2014-07-15 16:57:06 +04:00
|
|
|
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
|
2015-06-28 20:58:57 +03:00
|
|
|
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
|
2014-02-09 07:39:47 +04:00
|
|
|
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
|
2014-09-01 14:07:54 +04:00
|
|
|
tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y)
|
2015-07-17 10:25:53 +03:00
|
|
|
tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) $(libqos-virtio-obj-y)
|
2014-09-26 13:28:09 +04:00
|
|
|
tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y)
|
2015-04-24 14:35:16 +03:00
|
|
|
tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y)
|
2014-02-21 20:15:21 +04:00
|
|
|
tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o
|
2014-02-21 20:36:57 +04:00
|
|
|
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
|
2014-02-21 20:49:12 +04:00
|
|
|
tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
|
2014-02-09 06:48:44 +04:00
|
|
|
tests/tpci200-test$(EXESUF): tests/tpci200-test.o
|
2014-04-28 13:01:13 +04:00
|
|
|
tests/display-vga-test$(EXESUF): tests/display-vga-test.o
|
2014-02-09 15:24:15 +04:00
|
|
|
tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
|
2013-07-29 07:44:47 +04:00
|
|
|
tests/qom-test$(EXESUF): tests/qom-test.o
|
2014-10-02 18:51:31 +04:00
|
|
|
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y)
|
2013-10-30 17:54:35 +04:00
|
|
|
tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
|
2014-02-22 01:19:43 +04:00
|
|
|
tests/nvme-test$(EXESUF): tests/nvme-test.o
|
2014-02-21 23:38:48 +04:00
|
|
|
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
2014-02-22 01:43:43 +04:00
|
|
|
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
|
2014-03-30 21:00:05 +04:00
|
|
|
tests/ac97-test$(EXESUF): tests/ac97-test.o
|
2014-03-30 21:05:20 +04:00
|
|
|
tests/es1370-test$(EXESUF): tests/es1370-test.o
|
2014-03-30 21:22:48 +04:00
|
|
|
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
|
2014-03-30 22:02:00 +04:00
|
|
|
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
|
2014-09-26 13:28:14 +04:00
|
|
|
tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
2014-09-26 13:28:13 +04:00
|
|
|
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
2014-09-26 13:28:12 +04:00
|
|
|
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
2014-09-26 13:28:14 +04:00
|
|
|
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
2015-03-13 19:21:11 +03:00
|
|
|
tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o
|
2014-06-19 21:35:42 +04:00
|
|
|
tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y)
|
2013-09-06 07:24:32 +04:00
|
|
|
tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
|
2015-09-02 13:35:52 +03:00
|
|
|
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)
|
2012-03-30 21:39:33 +04:00
|
|
|
|
2014-06-19 21:35:42 +04:00
|
|
|
ifeq ($(CONFIG_POSIX),y)
|
|
|
|
|
LIBS += -lutil
|
|
|
|
|
endif
|
2015-04-13 16:01:39 +03:00
|
|
|
LIBS += $(TEST_LIBS)
|
|
|
|
|
CFLAGS += $(TEST_CFLAGS)
|
2014-06-10 14:03:23 +04:00
|
|
|
|
2012-03-28 17:42:05 +04:00
|
|
|
# QTest rules
|
|
|
|
|
|
|
|
|
|
TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
|
2014-03-28 13:55:54 +04:00
|
|
|
ifeq ($(CONFIG_POSIX),y)
|
tests: Fix how qom-test is run
We want to run qom-test for every architecture, without having to
manually add it to every architecture's list of tests. Commit 3687d53
accomplished this by adding it to every architecture's list
automatically.
However, some architectures inherit their tests from others, like this:
check-qtest-x86_64-y = $(check-qtest-i386-y)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
For such architectures, we ended up running the (slow!) test twice.
Commit 2b8419c attempted to avoid this by adding the test only when
it's not already present. Works only as long as we consider adding
the test to the architectures on the left hand side *after* the ones
on the right hand side: x86_64 after i386, microblazeel after
microblaze, xtensaeb after xtensa.
Turns out we consider them in $(SYSEMU_TARGET_LIST) order. Defined as
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
On my machine, this results in the oder xtensa, x86_64, microblazeel,
microblaze, i386. Consequently, qom-test runs twice for microblazeel
and x86_64.
Replace this complex and flawed machinery with a much simpler one: add
generic tests (currently just qom-test) to check-qtest-generic-y
instead of check-qtest-$(target)-y for every target, then run
$(check-qtest-generic-y) for every target.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Message-Id: <1443689999-12182-5-git-send-email-armbru@redhat.com>
2015-10-01 11:59:53 +03:00
|
|
|
QTEST_TARGETS = $(TARGETS)
|
2014-03-28 13:55:54 +04:00
|
|
|
check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
|
tests: Fix how qom-test is run
We want to run qom-test for every architecture, without having to
manually add it to every architecture's list of tests. Commit 3687d53
accomplished this by adding it to every architecture's list
automatically.
However, some architectures inherit their tests from others, like this:
check-qtest-x86_64-y = $(check-qtest-i386-y)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
For such architectures, we ended up running the (slow!) test twice.
Commit 2b8419c attempted to avoid this by adding the test only when
it's not already present. Works only as long as we consider adding
the test to the architectures on the left hand side *after* the ones
on the right hand side: x86_64 after i386, microblazeel after
microblaze, xtensaeb after xtensa.
Turns out we consider them in $(SYSEMU_TARGET_LIST) order. Defined as
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
On my machine, this results in the oder xtensa, x86_64, microblazeel,
microblaze, i386. Consequently, qom-test runs twice for microblazeel
and x86_64.
Replace this complex and flawed machinery with a much simpler one: add
generic tests (currently just qom-test) to check-qtest-generic-y
instead of check-qtest-$(target)-y for every target, then run
$(check-qtest-generic-y) for every target.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Message-Id: <1443689999-12182-5-git-send-email-armbru@redhat.com>
2015-10-01 11:59:53 +03:00
|
|
|
check-qtest-y += $(check-qtest-generic-y)
|
|
|
|
|
else
|
|
|
|
|
QTEST_TARGETS =
|
2014-03-28 13:55:54 +04:00
|
|
|
endif
|
2012-03-28 17:42:05 +04:00
|
|
|
|
2015-09-02 13:35:52 +03:00
|
|
|
qtest-obj-y = tests/libqtest.o $(test-util-obj-y)
|
2012-03-28 17:42:05 +04:00
|
|
|
$(check-qtest-y): $(qtest-obj-y)
|
|
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
.PHONY: check-help
|
|
|
|
|
check-help:
|
|
|
|
|
@echo "Regression testing targets:"
|
|
|
|
|
@echo
|
|
|
|
|
@echo " make check Run all tests"
|
2012-03-28 17:42:05 +04:00
|
|
|
@echo " make check-qtest-TARGET Run qtest tests for given target"
|
|
|
|
|
@echo " make check-qtest Run qtest tests"
|
2012-03-28 17:42:01 +04:00
|
|
|
@echo " make check-unit Run qobject tests"
|
2013-07-27 19:41:53 +04:00
|
|
|
@echo " make check-qapi-schema Run QAPI schema tests"
|
2012-03-28 17:42:01 +04:00
|
|
|
@echo " make check-block Run block tests"
|
|
|
|
|
@echo " make check-report.html Generates an HTML test report"
|
2013-09-26 04:42:56 +04:00
|
|
|
@echo " make check-clean Clean the tests"
|
2012-03-28 17:42:01 +04:00
|
|
|
@echo
|
|
|
|
|
@echo "Please note that HTML reports do not regenerate if the unit tests"
|
|
|
|
|
@echo "has not changed."
|
|
|
|
|
@echo
|
|
|
|
|
@echo "The variable SPEED can be set to control the gtester speed setting."
|
|
|
|
|
@echo "Default options are -k and (for make V=1) --verbose; they can be"
|
|
|
|
|
@echo "changed with variable GTESTER_OPTIONS."
|
2012-02-09 14:21:03 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
SPEED = quick
|
|
|
|
|
GTESTER_OPTIONS = -k $(if $(V),--verbose,-q)
|
2012-05-01 22:45:39 +04:00
|
|
|
GCOV_OPTIONS = -n $(if $(V),-f,)
|
2012-01-10 23:10:43 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
# gtester tests, possibly with verbose output
|
2012-01-10 23:10:43 +04:00
|
|
|
|
2012-03-28 17:42:05 +04:00
|
|
|
.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
|
|
|
|
|
$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y)
|
2012-05-01 22:45:39 +04:00
|
|
|
$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)
|
2012-03-28 17:42:05 +04:00
|
|
|
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
|
2015-04-28 22:27:51 +03:00
|
|
|
QTEST_QEMU_IMG=qemu-img$(EXESUF) \
|
2013-05-27 17:28:51 +04:00
|
|
|
MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \
|
tests: Fix how qom-test is run
We want to run qom-test for every architecture, without having to
manually add it to every architecture's list of tests. Commit 3687d53
accomplished this by adding it to every architecture's list
automatically.
However, some architectures inherit their tests from others, like this:
check-qtest-x86_64-y = $(check-qtest-i386-y)
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
For such architectures, we ended up running the (slow!) test twice.
Commit 2b8419c attempted to avoid this by adding the test only when
it's not already present. Works only as long as we consider adding
the test to the architectures on the left hand side *after* the ones
on the right hand side: x86_64 after i386, microblazeel after
microblaze, xtensaeb after xtensa.
Turns out we consider them in $(SYSEMU_TARGET_LIST) order. Defined as
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
On my machine, this results in the oder xtensa, x86_64, microblazeel,
microblaze, i386. Consequently, qom-test runs twice for microblazeel
and x86_64.
Replace this complex and flawed machinery with a much simpler one: add
generic tests (currently just qom-test) to check-qtest-generic-y
instead of check-qtest-$(target)-y for every target, then run
$(check-qtest-generic-y) for every target.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Message-Id: <1443689999-12182-5-git-send-email-armbru@redhat.com>
2015-10-01 11:59:53 +03:00
|
|
|
gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER $@")
|
2015-10-01 11:59:56 +03:00
|
|
|
$(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \
|
2012-05-01 22:45:39 +04:00
|
|
|
echo Gcov report for $$f:;\
|
|
|
|
|
$(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \
|
|
|
|
|
done,)
|
2012-03-28 17:42:05 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
.PHONY: $(patsubst %, check-%, $(check-unit-y))
|
|
|
|
|
$(patsubst %, check-%, $(check-unit-y)): check-%: %
|
2012-05-01 22:45:39 +04:00
|
|
|
$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)
|
2013-05-27 17:28:51 +04:00
|
|
|
$(call quiet-command, \
|
|
|
|
|
MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \
|
|
|
|
|
gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*")
|
2015-10-01 11:59:56 +03:00
|
|
|
$(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \
|
2012-05-01 22:45:39 +04:00
|
|
|
echo Gcov report for $$f:;\
|
|
|
|
|
$(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \
|
|
|
|
|
done,)
|
2012-01-10 23:10:43 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
# gtester tests with XML output
|
2012-03-08 15:29:00 +04:00
|
|
|
|
2012-03-28 17:42:05 +04:00
|
|
|
$(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)): check-report-qtest-%.xml: $(check-qtest-y)
|
|
|
|
|
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
|
2015-07-20 19:21:18 +03:00
|
|
|
QTEST_QEMU_IMG=qemu-img$(EXESUF) \
|
2012-03-28 17:42:05 +04:00
|
|
|
gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y),"GTESTER $@")
|
|
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
check-report-unit.xml: $(check-unit-y)
|
|
|
|
|
$(call quiet-command,gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $^, "GTESTER $@")
|
2012-03-09 16:37:40 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
# Reports and overall runs
|
2012-03-09 16:37:40 +04:00
|
|
|
|
2012-03-28 17:42:05 +04:00
|
|
|
check-report.xml: $(patsubst %,check-report-qtest-%.xml, $(QTEST_TARGETS)) check-report-unit.xml
|
2015-07-18 17:54:32 +03:00
|
|
|
$(call quiet-command,$(SRC_PATH)/scripts/gtester-cat $^ > $@, " GEN $@")
|
2012-03-09 16:37:40 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
check-report.html: check-report.xml
|
2015-07-18 17:54:32 +03:00
|
|
|
$(call quiet-command,gtester-report $< > $@, " GEN $@")
|
2012-03-28 17:42:01 +04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# Other tests
|
|
|
|
|
|
2013-09-26 04:42:55 +04:00
|
|
|
QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
|
|
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
.PHONY: check-tests/qemu-iotests-quick.sh
|
2013-09-26 04:42:55 +04:00
|
|
|
check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
|
2012-03-28 17:42:01 +04:00
|
|
|
$<
|
|
|
|
|
|
2013-07-27 19:41:53 +04:00
|
|
|
.PHONY: check-tests/test-qapi.py
|
|
|
|
|
check-tests/test-qapi.py: tests/test-qapi.py
|
|
|
|
|
|
|
|
|
|
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
|
|
|
|
|
$(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
|
2014-05-02 17:52:24 +04:00
|
|
|
$(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts \
|
|
|
|
|
$(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py \
|
2014-05-02 17:52:35 +04:00
|
|
|
$^ >$*.test.out 2>$*.test.err; \
|
2014-05-02 17:52:24 +04:00
|
|
|
echo $$? >$*.test.exit, \
|
|
|
|
|
" TEST $*.out")
|
2013-09-24 11:43:39 +04:00
|
|
|
@diff -q $(SRC_PATH)/$*.out $*.test.out
|
2014-05-02 17:52:35 +04:00
|
|
|
@# Sanitize error messages (make them independent of build directory)
|
|
|
|
|
@perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -q $(SRC_PATH)/$*.err -
|
2013-09-24 11:43:39 +04:00
|
|
|
@diff -q $(SRC_PATH)/$*.exit $*.test.exit
|
2013-07-27 19:41:53 +04:00
|
|
|
|
2012-03-28 17:42:01 +04:00
|
|
|
# Consolidated targets
|
|
|
|
|
|
2013-09-26 04:42:56 +04:00
|
|
|
.PHONY: check-qapi-schema check-qtest check-unit check check-clean
|
2013-07-27 19:41:53 +04:00
|
|
|
check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
|
2012-03-28 17:42:05 +04:00
|
|
|
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
|
2012-03-28 17:42:01 +04:00
|
|
|
check-unit: $(patsubst %,check-%, $(check-unit-y))
|
|
|
|
|
check-block: $(patsubst %,check-%, $(check-block-y))
|
2013-07-27 19:41:53 +04:00
|
|
|
check: check-qapi-schema check-unit check-qtest
|
2013-09-26 04:42:56 +04:00
|
|
|
check-clean:
|
|
|
|
|
$(MAKE) -C tests/tcg clean
|
2014-04-07 20:33:22 +04:00
|
|
|
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
|
|
|
|
|
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)))
|
2013-09-26 04:42:56 +04:00
|
|
|
|
|
|
|
|
clean: check-clean
|
2012-07-18 21:22:27 +04:00
|
|
|
|
2013-09-26 04:42:55 +04:00
|
|
|
# Build the help program automatically
|
|
|
|
|
|
|
|
|
|
all: $(QEMU_IOTESTS_HELPERS-y)
|
|
|
|
|
|
2012-07-18 21:22:27 +04:00
|
|
|
-include $(wildcard tests/*.d)
|
2013-06-26 17:52:14 +04:00
|
|
|
-include $(wildcard tests/libqos/*.d)
|