diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-20 11:01:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-20 11:01:20 +0000 |
| commit | bf12043acc6458e7b71d19a9f030b31ec22fba12 (patch) | |
| tree | e86dfe8d5d45f37619d9284cc5abd37140404823 /tests | |
| parent | 39e2821077e6dcf788b7c2a9ef50970ec7995437 (diff) | |
| parent | 6c77aa909e0eec6531e2398d0e9e60ec6a9339c6 (diff) | |
| download | qemu-bf12043acc6458e7b71d19a9f030b31ec22fba12.zip qemu-bf12043acc6458e7b71d19a9f030b31ec22fba12.tar.gz qemu-bf12043acc6458e7b71d19a9f030b31ec22fba12.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, acpi: fixes
A couple of bugfixes.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 20 Nov 2019 09:57:44 GMT
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
tests: acpi: always retain dumped ACPI tables in case of error
vhost-user-input: use free(elem) instead of g_free(elem)
libvhost-user: Zero memory allocated for VuVirtqInflightDesc
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bios-tables-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0b33fb2..79f5da0 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -437,11 +437,11 @@ static void test_acpi_asl(test_data *data) g_assert(!err || exp_err); if (g_strcmp0(asl->str, exp_asl->str)) { + sdt->tmp_files_retain = true; if (exp_err) { fprintf(stderr, "Warning! iasl couldn't parse the expected aml\n"); } else { - sdt->tmp_files_retain = true; exp_sdt->tmp_files_retain = true; fprintf(stderr, "acpi-test: Warning! %.4s mismatch. " |