7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
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
|
|
|