Browse Source
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdO66kACgkQ4+MsLN6t wN4dGw//ZSVZO/cdOc1izC44mCPjnHkhSjX5i12E09QnDfNQ9cef2pG50lsndm3N xJwunST+Hqfoh07YT4zuGSO+60BiiPsPse+ytnuHK0E4wLbIfrWzPcf1CMRDk3wf O4IniCv8O7BRYccK1iPkFI8ZVqK84m3Bn1tQ51LOy09b6om7jIqNwlxWxGYqkWCR l+9RxW/IKWD3OrveBATEhD1lwoUBIYPPzdm6NayEdOJXGOgnvbNbtmuRCR8dCxCS RUH3GZu0vvRTpOYjFzeR9Xy+CE1vcOeKsZf35QwV4eX8+UKv30HgF6J8fInkS60m EqPA+AU7fi+DN3Ua1Jx38wXHPr8mPTQoVGV6q0UB8b3B22kPQn+Mu8jHLyMOp4rK 6JEX5cAOZuwBEk0I8VjwqeDGVYgFwnMHhVuss0N4kCvP0qQcC2JMGMW0Rk4Lxw16 q0kwbQ0c56+qET57EOf9VW40Yb1q3Zu9t39XfNO/m3KGLkVSPfFZEu5voWD14mZW RutPlG/ww3n878Xz06YsqYF0ED/0SiW8U1tmEzg+X9vA/7Z7/0MH0rleNb36a0Fs 0aDq/mZBcnFLKy+9rlpy18OolY/N6LZnebCpdQe5wSRn/ioWDc4/GyIaLO9lSE5o TFHmGtIIQ2FoeRgtwCSfVNwaA6ILgPRsgXFDOqxCUplgKv6GX2Q= =GZ/H -----END PGP SIGNATURE----- Merge tag 'hw-misc-20241203' of https://github.com/philmd/qemu into staging Misc fixes for QEMU v9.2.0 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdO66kACgkQ4+MsLN6t # wN4dGw//ZSVZO/cdOc1izC44mCPjnHkhSjX5i12E09QnDfNQ9cef2pG50lsndm3N # xJwunST+Hqfoh07YT4zuGSO+60BiiPsPse+ytnuHK0E4wLbIfrWzPcf1CMRDk3wf # O4IniCv8O7BRYccK1iPkFI8ZVqK84m3Bn1tQ51LOy09b6om7jIqNwlxWxGYqkWCR # l+9RxW/IKWD3OrveBATEhD1lwoUBIYPPzdm6NayEdOJXGOgnvbNbtmuRCR8dCxCS # RUH3GZu0vvRTpOYjFzeR9Xy+CE1vcOeKsZf35QwV4eX8+UKv30HgF6J8fInkS60m # EqPA+AU7fi+DN3Ua1Jx38wXHPr8mPTQoVGV6q0UB8b3B22kPQn+Mu8jHLyMOp4rK # 6JEX5cAOZuwBEk0I8VjwqeDGVYgFwnMHhVuss0N4kCvP0qQcC2JMGMW0Rk4Lxw16 # q0kwbQ0c56+qET57EOf9VW40Yb1q3Zu9t39XfNO/m3KGLkVSPfFZEu5voWD14mZW # RutPlG/ww3n878Xz06YsqYF0ED/0SiW8U1tmEzg+X9vA/7Z7/0MH0rleNb36a0Fs # 0aDq/mZBcnFLKy+9rlpy18OolY/N6LZnebCpdQe5wSRn/ioWDc4/GyIaLO9lSE5o # TFHmGtIIQ2FoeRgtwCSfVNwaA6ILgPRsgXFDOqxCUplgKv6GX2Q= # =GZ/H # -----END PGP SIGNATURE----- # gpg: Signature made Tue 03 Dec 2024 11:29:45 GMT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20241203' of https://github.com/philmd/qemu: system: Select HVF by default when no other accelerator is available tests/qtest: add test for querying balloon guest stats tests/qtest: drop 'fuzz-' prefix from virtio-balloon test hw/virtio: fix crash in processing balloon stats hw/display/vga: Do not reset 'big_endian_fb' in vga_common_reset() target/riscv: Avoid bad shift in riscv_cpu_do_interrupt() hw/core/machine: diagnose wrapping of maxmem MAINTAINERS: update email addr for Brian Cain meson: Add missing SDL dependency to system/main.c MAINTAINERS: add myself as the maintainer for LoongArch VirtMachine ui/cocoa: Temporarily ignore annoying deprecated declaration warnings hw/openrisc/openrisc_sim: keep serial@90000000 as default hw/openrisc: Fixed undercounting of TTCR in continuous mode Signed-off-by: Peter Maydell <peter.maydell@linaro.org>pull/275/head
Peter Maydell
1 year ago
12 changed files with 102 additions and 48 deletions
@ -1,37 +0,0 @@ |
|||
/*
|
|||
* QTest fuzzer-generated testcase for virtio balloon device |
|||
* |
|||
* Copyright (c) 2024 Gao Shiyuan <gaoshiyuan@baidu.com> |
|||
* |
|||
* SPDX-License-Identifier: GPL-2.0-or-later |
|||
*/ |
|||
|
|||
#include "qemu/osdep.h" |
|||
#include "libqtest.h" |
|||
|
|||
/*
|
|||
* https://gitlab.com/qemu-project/qemu/-/issues/2576
|
|||
* Used to trigger: |
|||
* virtio_address_space_lookup: Assertion `mrs.mr' failed. |
|||
*/ |
|||
static void oss_fuzz_71649(void) |
|||
{ |
|||
QTestState *s = qtest_init("-device virtio-balloon -machine q35" |
|||
" -nodefaults"); |
|||
|
|||
qtest_outl(s, 0xcf8, 0x80000890); |
|||
qtest_outl(s, 0xcfc, 0x2); |
|||
qtest_outl(s, 0xcf8, 0x80000891); |
|||
qtest_inl(s, 0xcfc); |
|||
qtest_quit(s); |
|||
} |
|||
|
|||
int main(int argc, char **argv) |
|||
{ |
|||
g_test_init(&argc, &argv, NULL); |
|||
|
|||
qtest_add_func("fuzz/virtio/oss_fuzz_71649", oss_fuzz_71649); |
|||
|
|||
return g_test_run(); |
|||
} |
|||
|
|||
@ -0,0 +1,57 @@ |
|||
/*
|
|||
* QTest test cases for virtio balloon device |
|||
* |
|||
* Copyright (c) 2024 Gao Shiyuan <gaoshiyuan@baidu.com> |
|||
* |
|||
* SPDX-License-Identifier: GPL-2.0-or-later |
|||
*/ |
|||
|
|||
#include "qemu/osdep.h" |
|||
#include "libqtest.h" |
|||
#include "standard-headers/linux/virtio_balloon.h" |
|||
|
|||
/*
|
|||
* https://gitlab.com/qemu-project/qemu/-/issues/2576
|
|||
* Used to trigger: |
|||
* virtio_address_space_lookup: Assertion `mrs.mr' failed. |
|||
*/ |
|||
static void oss_fuzz_71649(void) |
|||
{ |
|||
QTestState *s = qtest_init("-device virtio-balloon -machine q35" |
|||
" -nodefaults"); |
|||
|
|||
qtest_outl(s, 0xcf8, 0x80000890); |
|||
qtest_outl(s, 0xcfc, 0x2); |
|||
qtest_outl(s, 0xcf8, 0x80000891); |
|||
qtest_inl(s, 0xcfc); |
|||
qtest_quit(s); |
|||
} |
|||
|
|||
static void query_stats(void) |
|||
{ |
|||
QTestState *s = qtest_init("-device virtio-balloon,id=balloon" |
|||
" -nodefaults"); |
|||
QDict *ret = qtest_qmp_assert_success_ref( |
|||
s, |
|||
"{ 'execute': 'qom-get', 'arguments': " \ |
|||
"{ 'path': '/machine/peripheral/balloon', " \ |
|||
" 'property': 'guest-stats' } }"); |
|||
QDict *stats = qdict_get_qdict(ret, "stats"); |
|||
|
|||
/* We expect 1 entry in the dict for each known kernel stat */ |
|||
assert(qdict_size(stats) == VIRTIO_BALLOON_S_NR); |
|||
|
|||
qobject_unref(ret); |
|||
qtest_quit(s); |
|||
} |
|||
|
|||
int main(int argc, char **argv) |
|||
{ |
|||
g_test_init(&argc, &argv, NULL); |
|||
|
|||
qtest_add_func("virtio-balloon/oss_fuzz_71649", oss_fuzz_71649); |
|||
qtest_add_func("virtio-balloon/query-stats", query_stats); |
|||
|
|||
return g_test_run(); |
|||
} |
|||
|
|||
Loading…
Reference in new issue