* [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument
@ 2012-08-10 1:27 Peter A. G. Crosthwaite
2012-08-10 6:06 ` Markus Armbruster
2012-08-10 8:53 ` Andreas Färber
0 siblings, 2 replies; 4+ messages in thread
From: Peter A. G. Crosthwaite @ 2012-08-10 1:27 UTC (permalink / raw)
To: qemu-devel, armbru; +Cc: peter.crosthwaite, peter.maydell, paul
A -kernel argument must be specified for this machine. Gaurd against no -kernel
argument. Previously gave an unhelpful "bad address" error message.
Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
---
hw/armv7m.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/hw/armv7m.c b/hw/armv7m.c
index 8cec78d..9f66667 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -227,6 +227,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
big_endian = 0;
#endif
+ if (!kernel_filename) {
+ fprintf(stderr, "Guest image must be specified (using -kernel)\n");
+ exit(1);
+ }
+
image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
NULL, big_endian, ELF_MACHINE, 1);
if (image_size < 0) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument
2012-08-10 1:27 [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument Peter A. G. Crosthwaite
@ 2012-08-10 6:06 ` Markus Armbruster
2012-08-10 8:53 ` Andreas Färber
1 sibling, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2012-08-10 6:06 UTC (permalink / raw)
To: Peter A. G. Crosthwaite; +Cc: peter.maydell, qemu-devel, paul
"Peter A. G. Crosthwaite" <peter.crosthwaite@petalogix.com> writes:
> A -kernel argument must be specified for this machine. Gaurd against no -kernel
> argument. Previously gave an unhelpful "bad address" error message.
>
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Tested-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument
2012-08-10 1:27 [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument Peter A. G. Crosthwaite
2012-08-10 6:06 ` Markus Armbruster
@ 2012-08-10 8:53 ` Andreas Färber
2012-08-10 10:18 ` Peter Maydell
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Färber @ 2012-08-10 8:53 UTC (permalink / raw)
To: Peter A. G. Crosthwaite, peter.maydell; +Cc: paul, qemu-devel, armbru
Am 10.08.2012 03:27, schrieb Peter A. G. Crosthwaite:
> A -kernel argument must be specified for this machine. Gaurd against no -kernel
"Guard"
> argument. Previously gave an unhelpful "bad address" error message.
>
> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Otherwise looks good - PMM, can you fix?
/-F
> ---
> hw/armv7m.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/hw/armv7m.c b/hw/armv7m.c
> index 8cec78d..9f66667 100644
> --- a/hw/armv7m.c
> +++ b/hw/armv7m.c
> @@ -227,6 +227,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
> big_endian = 0;
> #endif
>
> + if (!kernel_filename) {
> + fprintf(stderr, "Guest image must be specified (using -kernel)\n");
> + exit(1);
> + }
> +
> image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
> NULL, big_endian, ELF_MACHINE, 1);
> if (image_size < 0) {
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument
2012-08-10 8:53 ` Andreas Färber
@ 2012-08-10 10:18 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2012-08-10 10:18 UTC (permalink / raw)
To: Andreas Färber; +Cc: Peter A. G. Crosthwaite, paul, qemu-devel, armbru
On 10 August 2012 09:53, Andreas Färber <afaerber@suse.de> wrote:
> Am 10.08.2012 03:27, schrieb Peter A. G. Crosthwaite:
>> A -kernel argument must be specified for this machine. Gaurd against no -kernel
>
> "Guard"
>
>> argument. Previously gave an unhelpful "bad address" error message.
>>
>> Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
>
> Otherwise looks good - PMM, can you fix?
Yes, I have fixed the typo and put this patch into arm-devs.next.
I'm planning to put together a pullreq later today.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-10 10:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-10 1:27 [Qemu-devel] [PATCH] armv7m: Guard against no -kernel argument Peter A. G. Crosthwaite
2012-08-10 6:06 ` Markus Armbruster
2012-08-10 8:53 ` Andreas Färber
2012-08-10 10:18 ` Peter Maydell
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).