| Message ID | 20190815183803.13346-3-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc: Fix die-id validation and compatibility with libvirt | expand |
Reviewed-by: Vanderson M. do Rosario <vandersonmr2@gmail.com> Vanderson M. Rosario On Thu, Aug 15, 2019 at 3:43 PM Eduardo Habkost <ehabkost@redhat.com> wrote: > The error message when die-id is omitted doesn't make sense: > > $ qemu-system-x86_64 -smp 1,sockets=6,maxcpus=6 \ > -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0 > qemu-system-x86_64: -device > qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ > Invalid CPU die-id: 4294967295 must be in range 0:0 > > Fix it, so it will now read: > > qemu-system-x86_64: -device > qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ > CPU die-id is not set > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/i386/pc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 24b03bb49c..fb4ac5ca90 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2410,6 +2410,10 @@ static void pc_cpu_pre_plug(HotplugHandler > *hotplug_dev, > error_setg(errp, "Invalid CPU socket-id: %u must be in range > 0:%u", > cpu->socket_id, max_socket); > return; > + } > + if (cpu->die_id < 0) { > + error_setg(errp, "CPU die-id is not set"); > + return; > } else if (cpu->die_id > pcms->smp_dies - 1) { > error_setg(errp, "Invalid CPU die-id: %u must be in range > 0:%u", > cpu->die_id, pcms->smp_dies - 1); > -- > 2.21.0 > > >
On Thu, 15 Aug 2019 15:38:02 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > The error message when die-id is omitted doesn't make sense: > > $ qemu-system-x86_64 -smp 1,sockets=6,maxcpus=6 \ > -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0 > qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ > Invalid CPU die-id: 4294967295 must be in range 0:0 > > Fix it, so it will now read: > > qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ > CPU die-id is not set > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/i386/pc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 24b03bb49c..fb4ac5ca90 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2410,6 +2410,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u", > cpu->socket_id, max_socket); > return; > + } > + if (cpu->die_id < 0) { > + error_setg(errp, "CPU die-id is not set"); > + return; > } else if (cpu->die_id > pcms->smp_dies - 1) { > error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u", > cpu->die_id, pcms->smp_dies - 1);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 24b03bb49c..fb4ac5ca90 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2410,6 +2410,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u", cpu->socket_id, max_socket); return; + } + if (cpu->die_id < 0) { + error_setg(errp, "CPU die-id is not set"); + return; } else if (cpu->die_id > pcms->smp_dies - 1) { error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u", cpu->die_id, pcms->smp_dies - 1);
The error message when die-id is omitted doesn't make sense: $ qemu-system-x86_64 -smp 1,sockets=6,maxcpus=6 \ -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0 qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ Invalid CPU die-id: 4294967295 must be in range 0:0 Fix it, so it will now read: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0: \ CPU die-id is not set Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/i386/pc.c | 4 ++++ 1 file changed, 4 insertions(+)