diff options
author | Richard Henderson | 2021-11-16 12:50:27 +0100 |
---|---|---|
committer | Richard Henderson | 2021-11-16 12:50:27 +0100 |
commit | 9f0f846465d4c52ce9857787e947dffb64367fae (patch) | |
tree | fe73d4a068438f43622c3825ef6e3854e8446ac7 /nbd | |
parent | Merge tag 'pull-target-arm-20211115-1' of https://git.linaro.org/people/pmayd... (diff) | |
parent | tests/unit/test-smp-parse: Explicit MachineClass name (diff) | |
download | qemu-9f0f846465d4c52ce9857787e947dffb64367fae.tar.gz qemu-9f0f846465d4c52ce9857787e947dffb64367fae.tar.xz qemu-9f0f846465d4c52ce9857787e947dffb64367fae.zip |
Merge tag 'machine-core-20211115' of https://github.com/philmd/qemu into staging
Machine core patches
- Rework SMP parsing unit test to work on WinGW:
https://github.com/qemu/qemu/runs/4078386652
This fixes:
Test smp_parse failed!
Expected error report: Invalid SMP CPUs 1. The min CPUs supported by machine '(null)' is 2
Output error report: Invalid SMP CPUs 1. The min CPUs supported by machine '(NULL)' is 2
# gpg: Signature made Mon 15 Nov 2021 11:46:36 PM CET
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
* tag 'machine-core-20211115' of https://github.com/philmd/qemu:
tests/unit/test-smp-parse: Explicit MachineClass name
tests/unit/test-smp-parse: QOM'ify smp_machine_class_init()
tests/unit/test-smp-parse: Restore MachineClass fields after modifying
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'nbd')
0 files changed, 0 insertions, 0 deletions