From: Alistair Francis <alistair.francis@opensource.wdc.com>
To: qemu-devel@nongnu.org
Cc: alistair23@gmail.com,
Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>,
Alistair Francis <alistair.francis@wdc.com>,
Bin Meng <bmeng.cn@gmail.com>, Anup Patel <anup@brainfault.org>
Subject: [PULL 18/31] hw/riscv: virt: Exit if the user provided -bios in combination with KVM
Date: Thu, 21 Apr 2022 16:36:17 +1000 [thread overview]
Message-ID: <20220421063630.1033608-19-alistair.francis@opensource.wdc.com> (raw)
In-Reply-To: <20220421063630.1033608-1-alistair.francis@opensource.wdc.com>
From: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
The -bios option is silently ignored if used in combination with -enable-kvm.
The reason is that the machine starts in S-Mode, and the bios typically runs in
M-Mode.
Better exit in that case to not confuse the user.
Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Message-Id: <20220401121842.2791796-1-ralf.ramsauer@oth-regensburg.de>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
hw/riscv/virt.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index da50cbed43..09609c96e8 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1308,12 +1308,18 @@ static void virt_machine_init(MachineState *machine)
/*
* Only direct boot kernel is currently supported for KVM VM,
- * so the "-bios" parameter is ignored and treated like "-bios none"
- * when KVM is enabled.
+ * so the "-bios" parameter is not supported when KVM is enabled.
*/
if (kvm_enabled()) {
- g_free(machine->firmware);
- machine->firmware = g_strdup("none");
+ if (machine->firmware) {
+ if (strcmp(machine->firmware, "none")) {
+ error_report("Machine mode firmware is not supported in "
+ "combination with KVM.");
+ exit(1);
+ }
+ } else {
+ machine->firmware = g_strdup("none");
+ }
}
if (riscv_is_32bit(&s->soc[0])) {
--
2.35.1
next prev parent reply other threads:[~2022-04-21 7:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 6:35 [PULL 00/31] riscv-to-apply queue Alistair Francis
2022-04-21 6:36 ` [PULL 01/31] hw/ssi: Add Ibex SPI device model Alistair Francis
2022-04-21 6:36 ` [PULL 02/31] riscv: opentitan: Connect opentitan SPI Host Alistair Francis
2022-04-21 6:36 ` [PULL 03/31] target/riscv: Define simpler privileged spec version numbering Alistair Francis
2022-04-21 6:36 ` [PULL 04/31] target/riscv: Add the privileged spec version 1.12.0 Alistair Francis
2022-04-21 6:36 ` [PULL 05/31] target/riscv: Introduce privilege version field in the CSR ops Alistair Francis
2022-04-21 6:36 ` [PULL 06/31] target/riscv: Add support for mconfigptr Alistair Francis
2022-04-21 6:36 ` [PULL 07/31] target/riscv: Add *envcfg* CSRs support Alistair Francis
2022-04-21 6:36 ` [PULL 08/31] target/riscv: Enable privileged spec version 1.12 Alistair Francis
2022-04-21 6:36 ` [PULL 09/31] target/riscv: cpu: Fixup indentation Alistair Francis
2022-04-21 6:36 ` [PULL 10/31] target/riscv: Allow software access to MIP SEIP Alistair Francis
2022-04-21 6:36 ` [PULL 11/31] target/riscv: Add initial support for the Sdtrig extension Alistair Francis
2022-04-21 6:36 ` [PULL 12/31] target/riscv: optimize condition assign for scale < 0 Alistair Francis
2022-04-21 6:36 ` [PULL 13/31] target/riscv: optimize helper for vmv<nr>r.v Alistair Francis
2022-04-21 6:36 ` [PULL 14/31] target/riscv: misa to ISA string conversion fix Alistair Francis
2022-04-21 6:36 ` [PULL 15/31] target/riscv: Add isa extenstion strings to the device tree Alistair Francis
2022-04-21 6:36 ` [PULL 16/31] target/riscv: fix start byte for vmv<nf>r.v when vstart != 0 Alistair Francis
2022-04-21 6:36 ` [PULL 17/31] target/riscv: Use cpu_loop_exit_restore directly from mmu faults Alistair Francis
2022-04-21 6:36 ` Alistair Francis [this message]
2022-04-21 6:36 ` [PULL 19/31] target/riscv/pmp: fix NAPOT range computation overflow Alistair Francis
2022-04-21 6:36 ` [PULL 20/31] hw/riscv: virt: fix DT property mmu-type when CPU mmu option is disabled Alistair Francis
2022-04-21 6:36 ` [PULL 21/31] hw/intc: Add .impl.[min|max]_access_size declaration in RISC-V ACLINT Alistair Francis
2022-04-21 6:36 ` [PULL 22/31] hw/intc: Support 32/64-bit mtimecmp and mtime accesses " Alistair Francis
2022-04-21 6:36 ` [PULL 23/31] hw/intc: Make RISC-V ACLINT mtime MMIO register writable Alistair Francis
2022-04-21 6:36 ` [PULL 24/31] hw/intc: riscv_aclint: Add reset function of ACLINT devices Alistair Francis
2022-04-21 6:36 ` [PULL 25/31] target/riscv: debug: Implement debug related TCGCPUOps Alistair Francis
2022-04-21 6:36 ` [PULL 26/31] target/riscv: cpu: Add a config option for native debug Alistair Francis
2022-04-21 6:36 ` [PULL 27/31] target/riscv: csr: Hook debug CSR read/write Alistair Francis
2022-04-21 6:36 ` [PULL 28/31] target/riscv: machine: Add debug state description Alistair Francis
2022-04-21 6:36 ` [PULL 29/31] target/riscv: cpu: Enable native debug feature Alistair Francis
2022-04-21 6:36 ` [PULL 30/31] hw/core: tcg-cpu-ops.h: Update comments of debug_check_watchpoint() Alistair Francis
2022-04-21 6:36 ` [PULL 31/31] hw/riscv: boot: Support 64bit fdt address Alistair Francis
2022-04-21 15:03 ` [PULL 00/31] riscv-to-apply queue Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220421063630.1033608-19-alistair.francis@opensource.wdc.com \
--to=alistair.francis@opensource.wdc.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=anup@brainfault.org \
--cc=bmeng.cn@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=ralf.ramsauer@oth-regensburg.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).