From: Michael Walle <michael@walle.cc>
To: qemu-devel@nongnu.org
Cc: Michael Walle <michael@walle.cc>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL v4 12/12] hw/lm32: print error if cpu model is not found
Date: Mon, 20 Jan 2014 20:34:30 +0100 [thread overview]
Message-ID: <1390246471-25167-13-git-send-email-michael@walle.cc> (raw)
In-Reply-To: <1390246471-25167-1-git-send-email-michael@walle.cc>
QEMU crashed if a the given cpu_model is not found.
Signed-off-by: Michael Walle <michael@walle.cc>
---
hw/lm32/lm32_boards.c | 10 ++++++++++
hw/lm32/milkymist.c | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index c032bb8..5e22e9b 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -101,6 +101,11 @@ static void lm32_evr_init(QEMUMachineInitArgs *args)
cpu_model = "lm32-full";
}
cpu = cpu_lm32_init(cpu_model);
+ if (cpu == NULL) {
+ fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
+ exit(1);
+ }
+
env = &cpu->env;
reset_info->cpu = cpu;
@@ -198,6 +203,11 @@ static void lm32_uclinux_init(QEMUMachineInitArgs *args)
cpu_model = "lm32-full";
}
cpu = cpu_lm32_init(cpu_model);
+ if (cpu == NULL) {
+ fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
+ exit(1);
+ }
+
env = &cpu->env;
reset_info->cpu = cpu;
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 15053c4..baf234c 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -108,6 +108,11 @@ milkymist_init(QEMUMachineInitArgs *args)
cpu_model = "lm32-full";
}
cpu = cpu_lm32_init(cpu_model);
+ if (cpu == NULL) {
+ fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
+ exit(1);
+ }
+
env = &cpu->env;
reset_info->cpu = cpu;
--
1.7.10.4
next prev parent reply other threads:[~2014-01-20 19:35 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-20 19:34 [Qemu-devel] [PULL v4 00/12] target-lm32 updates Michael Walle
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 01/12] lm32_sys: increase test case name length limit Michael Walle
2014-02-01 17:39 ` Peter Maydell
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 02/12] tests: lm32: new rule for single test cases Michael Walle
2014-02-01 17:45 ` Peter Maydell
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 03/12] milkymist-uart: use qemu_chr_fe_write_all() instead of qemu_chr_fe_write() Michael Walle
2014-02-01 17:46 ` Peter Maydell
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 04/12] lm32_uart/lm32_juart: use qemu_chr_fe_write_all() Michael Walle
2014-02-01 17:47 ` Peter Maydell
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 05/12] milkymist-vgafb: swap pixel data in source buffer Michael Walle
2014-02-01 17:57 ` Peter Maydell
2014-02-03 8:12 ` Paolo Bonzini
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 06/12] target-lm32: kill cpu_abort() calls Michael Walle
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 07/12] target-lm32: move model features to LM32CPU Michael Walle
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 08/12] target-lm32: add breakpoint/watchpoint support Michael Walle
2014-02-01 18:16 ` Peter Maydell
2014-02-03 21:27 ` Richard Henderson
2014-02-03 21:35 ` Peter Maydell
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 09/12] lm32_sys: print test result on stderr Michael Walle
2014-02-01 18:00 ` Peter Maydell
2014-02-01 20:31 ` Michael Walle
2014-02-03 22:39 ` Michael Walle
2014-02-03 22:59 ` Peter Maydell
2014-02-04 18:12 ` Michael Walle
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 10/12] lm32_sys: dump cpu state if test case fails Michael Walle
2014-01-20 19:34 ` [Qemu-devel] [PULL v4 11/12] target-lm32: stop VM on illegal or unknown instruction Michael Walle
2014-02-01 18:06 ` Peter Maydell
2014-02-01 20:53 ` Michael Walle
2014-01-20 19:34 ` Michael Walle [this message]
2014-02-01 18:11 ` [Qemu-devel] [PULL v4 12/12] hw/lm32: print error if cpu model is not found Peter Maydell
2014-02-01 18:21 ` [Qemu-devel] [PULL v4 00/12] target-lm32 updates Peter Maydell
2014-02-01 20:56 ` Michael Walle
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=1390246471-25167-13-git-send-email-michael@walle.cc \
--to=michael@walle.cc \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/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).