46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From dca8f8c8bc4466d2502bcd305fcc8e84adf992da Mon Sep 17 00:00:00 2001
|
|
From: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 27 Nov 2023 10:20:40 +0800
|
|
Subject: [PATCH] target/i386/cpu: Improve error message for property "vendor"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from 298d8b122056052951bda487392d8aabbfd0f3e5
|
|
|
|
Improve
|
|
|
|
$ qemu-system-x86_64 -device max-x86_64-cpu,vendor=me
|
|
qemu-system-x86_64: -device max-x86_64-cpu,vendor=me: Property '.vendor' doesn't take value 'me'
|
|
|
|
to
|
|
|
|
qemu-system-x86_64: -device max-x86_64-cpu,vendor=0123456789abc: value of property 'vendor' must consist of exactly 12 characters
|
|
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
Message-ID: <20231031111059.3407803-8-armbru@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
|
|
Signed-off-by: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/i386/cpu.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index 6aaa730a0d..53a7484ca8 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -4805,7 +4805,8 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value,
|
|
int i;
|
|
|
|
if (strlen(value) != CPUID_VENDOR_SZ) {
|
|
- error_setg(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value);
|
|
+ error_setg(errp, "value of property 'vendor' must consist of"
|
|
+ " exactly " stringify(CPUID_VENDOR_SZ) " characters");
|
|
return;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|