From: Peter Maydell Date: Mon, 5 Feb 2018 15:04:26 +0000 (+0000) Subject: hw/core/generic-loader: Allow PC to be set on command line X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bbba7757bacc9f890a3f028d328b4b429dbe78ec;p=qemu.git hw/core/generic-loader: Allow PC to be set on command line The documentation for the generic loader claims that you can set the PC for a CPU with an option of the form -device loader,cpu-num=0,addr=0x10000004 However if you try this QEMU complains: cpu_num must be specified when setting a program counter This is because we were testing against 0 rather than CPU_NONE. Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180205150426.20542-1-peter.maydell@linaro.org --- diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 46012673c3..cb0e68486d 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -105,7 +105,7 @@ static void generic_loader_realize(DeviceState *dev, Error **errp) error_setg(errp, "data can not be specified when setting a " "program counter"); return; - } else if (!s->cpu_num) { + } else if (s->cpu_num == CPU_NONE) { error_setg(errp, "cpu_num must be specified when setting a " "program counter"); return;