diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-08-24 08:09:26 +1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-08-24 08:09:27 +1000 |
| commit | f259e4cb8a8b4ef5463326fc214a7d8d7703d5de (patch) | |
| tree | bb02ce9d553a435a9dd50fd378ca3a7e034fc8a4 /system/vl.c | |
| parent | 407f9a4b121eb65166375c410e14d7b704bc1106 (diff) | |
| parent | d6192f3f7593536a4285e8ab6c6cf3f34973ce62 (diff) | |
| download | focaccia-qemu-f259e4cb8a8b4ef5463326fc214a7d8d7703d5de.tar.gz focaccia-qemu-f259e4cb8a8b4ef5463326fc214a7d8d7703d5de.zip | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2024-08-23 # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmbImVIACgkQcBtPaxpp # PllP3wf/TaYAQs0HkQRQ62/2wqnfABpZYft/g6EhHveZ/04pJ/eNIIiVqqUg4DGs # i8fENABRlRPoeK5HtGVhHYbOg6tzje7MR0qdSmWaKb2R5pPqkLHZ6NTtQlINLpOb # O8Nh1c5/qDW/pDPCWVLkEMTqKhtGfINr0pHSlTfOr0W9FrU1I6srvr6AZtrTORlL # 5b79j5IZGQSj5zR3ViuKyEPdA5NRSeTOewg8WCKGSxZGk4OlVPevrEAGOyQReOuN # HTfNi8KQH/pPzl6+f+THkgKmYYfUAlPvzkJDndV9vcPFLPI8ZncZ1o1Kmog6UERc # s5J2vTcir/ReEukApRRsZkKHLAoYdQ== # =Srl8 # -----END PGP SIGNATURE----- # gpg: Signature made Sat 24 Aug 2024 12:14:42 AM AEST # gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full] # gpg: aka "Michael Tokarev <mjt@debian.org>" [full] # gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full] * tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() system/vl.c: Print machine name, not "(null)", for unknown machine types hw/x86: add a couple of comments explaining how the kernel image is parsed Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'system/vl.c')
| -rw-r--r-- | system/vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/vl.c b/system/vl.c index 41d53d2456..01b8b8e77a 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1679,10 +1679,10 @@ static MachineClass *select_machine(QDict *qdict, Error **errp) if (machine_type) { machine_class = find_machine(machine_type, machines); - qdict_del(qdict, "type"); if (!machine_class) { - error_setg(errp, "unsupported machine type: \"%s\"", optarg); + error_setg(errp, "unsupported machine type: \"%s\"", machine_type); } + qdict_del(qdict, "type"); } else { machine_class = find_default_machine(machines); if (!machine_class) { |