Commit 23d9cff4 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

pc: Improve error message when die-id is omitted 



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: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190815183803.13346-3-ehabkost@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarVanderson M. do Rosario <vandersonmr2@gmail.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 2a0585e1

hw/i386/pc.c

+4 −0
Original line number Diff line number Diff line
@@ -2428,6 +2428,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);