diff options
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/generic-loader.c | 2 | ||||
| -rw-r--r-- | hw/core/qdev.c | 3 |
2 files changed, 3 insertions, 2 deletions
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; diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 11f8a27a69..7ed1f431f0 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -28,10 +28,11 @@ #include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" -#include "qapi/qmp/qjson.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/hotplug.h" #include "hw/boards.h" #include "hw/sysbus.h" |