diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 11:45:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-20 11:45:23 +0100 |
| commit | df8197836844275ef805c9031008eb3b20a89b83 (patch) | |
| tree | 2b44346f27a01ca6bc6216dc84d5e03c30cc7148 /tests | |
| parent | c14e42d7a4495ecbad7bf8b3d603272e3a8992a1 (diff) | |
| parent | 2cc06a8843ace3d03464032eb3c74bc6e2b07579 (diff) | |
| download | qemu-df8197836844275ef805c9031008eb3b20a89b83.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20151020-1' into staging
fw_cfg: add dma interface, add strings via cmdline.
# gpg: Signature made Tue 20 Oct 2015 07:07:34 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-fw_cfg-20151020-1:
fw_cfg: Define a static signature to be returned on DMA port reads
Enable fw_cfg DMA interface for x86
Enable fw_cfg DMA interface for ARM
Implement fw_cfg DMA interface
fw_cfg DMA interface documentation
fw_cfg: document fw_cfg_modify_iXX() update functions
fw_cfg: insert string blobs via qemu cmdline
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fw_cfg-test.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 9be78e9564..b7d4007e32 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -37,7 +37,9 @@ static void test_fw_cfg_signature(void) static void test_fw_cfg_id(void) { - g_assert_cmpint(qfw_cfg_get_u32(fw_cfg, FW_CFG_ID), ==, 1); + uint32_t id = qfw_cfg_get_u32(fw_cfg, FW_CFG_ID); + g_assert((id == 1) || + (id == 3)); } static void test_fw_cfg_uuid(void) |