| Message ID | 20241029093501.3980927-1-gaosong@loongson.cn (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] hw/loongarch/boot: Use warn_report when no kernel filename | expand |
On 29/10/24 06:35, Song Gao wrote: > When we run “qemu-system-loongarch64 -qmp stdio -vnc none -S”, > we get an error message “Need kernel filename” and then we can't use qmp cmd to query some information. > So, we just throw a warning and then the cpus starts running from address VIRT_FLASH0_BASE. > > Signed-off-by: Song Gao <gaosong@loongson.cn> > --- > hw/loongarch/boot.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c > index cb668703bd..9c37abed3a 100644 > --- a/hw/loongarch/boot.c > +++ b/hw/loongarch/boot.c > @@ -278,7 +278,7 @@ static void init_boot_rom(struct loongarch_boot_info *info, void *p) > static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) > { > void *p, *bp; > - int64_t kernel_addr = 0; > + int64_t kernel_addr = VIRT_FLASH0_BASE; > LoongArchCPU *lacpu; > CPUState *cs; > > @@ -286,8 +286,7 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) > kernel_addr = load_kernel_info(info); > } else { > if(!qtest_enabled()) { > - error_report("Need kernel filename\n"); > - exit(1); > + warn_report("Need kernel filename\n"); Either nothing or "No kernel provided, booting from flash drive"? > } > } >
在 2024/10/30 上午3:48, Philippe Mathieu-Daudé 写道: > On 29/10/24 06:35, Song Gao wrote: >> When we run “qemu-system-loongarch64 -qmp stdio -vnc none -S”, >> we get an error message “Need kernel filename” and then we can't use >> qmp cmd to query some information. >> So, we just throw a warning and then the cpus starts running from >> address VIRT_FLASH0_BASE. >> >> Signed-off-by: Song Gao <gaosong@loongson.cn> >> --- >> hw/loongarch/boot.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c >> index cb668703bd..9c37abed3a 100644 >> --- a/hw/loongarch/boot.c >> +++ b/hw/loongarch/boot.c >> @@ -278,7 +278,7 @@ static void init_boot_rom(struct >> loongarch_boot_info *info, void *p) >> static void loongarch_direct_kernel_boot(struct loongarch_boot_info >> *info) >> { >> void *p, *bp; >> - int64_t kernel_addr = 0; >> + int64_t kernel_addr = VIRT_FLASH0_BASE; >> LoongArchCPU *lacpu; >> CPUState *cs; >> @@ -286,8 +286,7 @@ static void loongarch_direct_kernel_boot(struct >> loongarch_boot_info *info) >> kernel_addr = load_kernel_info(info); >> } else { >> if(!qtest_enabled()) { >> - error_report("Need kernel filename\n"); >> - exit(1); >> + warn_report("Need kernel filename\n"); > > Either nothing or "No kernel provided, booting from flash drive"? > I will change the message. Thanks. Song Gao >> } >> }
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index cb668703bd..9c37abed3a 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -278,7 +278,7 @@ static void init_boot_rom(struct loongarch_boot_info *info, void *p) static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) { void *p, *bp; - int64_t kernel_addr = 0; + int64_t kernel_addr = VIRT_FLASH0_BASE; LoongArchCPU *lacpu; CPUState *cs; @@ -286,8 +286,7 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) kernel_addr = load_kernel_info(info); } else { if(!qtest_enabled()) { - error_report("Need kernel filename\n"); - exit(1); + warn_report("Need kernel filename\n"); } }
When we run “qemu-system-loongarch64 -qmp stdio -vnc none -S”, we get an error message “Need kernel filename” and then we can't use qmp cmd to query some information. So, we just throw a warning and then the cpus starts running from address VIRT_FLASH0_BASE. Signed-off-by: Song Gao <gaosong@loongson.cn> --- hw/loongarch/boot.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)