[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] pc: Improve error message when die-id is omitte
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 2/3] pc: Improve error message when die-id is omitted |
Date: |
Thu, 15 Aug 2019 15:38:02 -0300 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/3] pc: Fix die-id validation and compatibility with libvirt, Eduardo Habkost, 2019/08/15
- [Qemu-devel] [PATCH 2/3] pc: Improve error message when die-id is omitted,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Eduardo Habkost, 2019/08/15
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Markus Armbruster, 2019/08/16
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Erik Skultety, 2019/08/16
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Markus Armbruster, 2019/08/16
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Eduardo Habkost, 2019/08/16
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Yash Mankad, 2019/08/16
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Eduardo Habkost, 2019/08/20
- Re: [Qemu-devel] [PATCH 3/3] pc: Don't make CPU properties mandatory unless necessary, Markus Armbruster, 2019/08/17