diff options
author | Laurent Vivier | 2017-08-02 12:32:59 +0200 |
---|---|---|
committer | Eduardo Habkost | 2017-08-02 23:30:13 +0200 |
commit | be2960baae07e5257cde8c814cbd91647e235147 (patch) | |
tree | 45fff75cf5b7905f64176cb554d907862b402be5 | |
parent | Update version for v2.10.0-rc1 release (diff) | |
download | qemu-be2960baae07e5257cde8c814cbd91647e235147.tar.gz qemu-be2960baae07e5257cde8c814cbd91647e235147.tar.xz qemu-be2960baae07e5257cde8c814cbd91647e235147.zip |
cpu: don't allow negative core id
With pseries machine type a negative core-id is not managed properly:
-1 gives an inaccurate error message ("core -1 already populated"),
-2 crashes QEMU (core dump)
As it seems a negative value is invalid for any architecture,
instead of checking this in spapr_core_pre_plug() I think it's better
to check this in the generic part, core_prop_set_core_id()
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20170802103259.25940-1-lvivier@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r-- | hw/cpu/core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/cpu/core.c b/hw/cpu/core.c index 2bf960d6a8..bd578ab80c 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -33,6 +33,11 @@ static void core_prop_set_core_id(Object *obj, Visitor *v, const char *name, return; } + if (value < 0) { + error_setg(errp, "Invalid core id %"PRId64, value); + return; + } + core->core_id = value; } |