52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
|
From 15b6c032ed2f92aa3210fe30376119eb468af039 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 23 Oct 2024 14:19:00 +0800
|
||
|
|
Subject: [PATCH] hw/intc/openpic: Improve errors for out of bounds property
|
||
|
|
values
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 627c1e012cb3f14745f9b7d991642894a4402d5c
|
||
|
|
|
||
|
|
The error message doesn't matter much, as the "openpic" device isn't
|
||
|
|
user-creatable. But it's the last use of
|
||
|
|
QERR_PROPERTY_VALUE_OUT_OF_RANGE, which has to go. Change the message
|
||
|
|
just like the previous commit did for x86 CPUs.
|
||
|
|
|
||
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
||
|
|
Message-ID: <20241010150144.986655-7-armbru@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/intc/openpic.c | 5 +----
|
||
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
|
||
|
|
index a6f91d4bcd..0f99b77a17 100644
|
||
|
|
--- a/hw/intc/openpic.c
|
||
|
|
+++ b/hw/intc/openpic.c
|
||
|
|
@@ -41,7 +41,6 @@
|
||
|
|
#include "hw/pci/msi.h"
|
||
|
|
#include "qapi/error.h"
|
||
|
|
#include "qemu/bitops.h"
|
||
|
|
-#include "qapi/qmp/qerror.h"
|
||
|
|
#include "qemu/module.h"
|
||
|
|
#include "qemu/timer.h"
|
||
|
|
#include "qemu/error-report.h"
|
||
|
|
@@ -1535,9 +1534,7 @@ static void openpic_realize(DeviceState *dev, Error **errp)
|
||
|
|
};
|
||
|
|
|
||
|
|
if (opp->nb_cpus > MAX_CPU) {
|
||
|
|
- error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
|
||
|
|
- TYPE_OPENPIC, "nb_cpus", (uint64_t)opp->nb_cpus,
|
||
|
|
- (uint64_t)0, (uint64_t)MAX_CPU);
|
||
|
|
+ error_setg(errp, "property 'nb_cpus' can be at most %d", MAX_CPU);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|