On 24/10/25 11:26, Vishal Chourasia wrote:
Pass errp to load_image_targphys_as() in generic-loader and
guest-loader to capture detailed error information from the
loader functions.
Use error_prepend() instead of error_setg() to preserve the
underlying error details while adding context about which image
failed to load.
Signed-off-by: Vishal Chourasia <[email protected]>
---
hw/core/generic-loader.c | 7 ++++---
hw/core/guest-loader.c | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 6689847c33..35d4e5f4ea 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -60,6 +60,7 @@ static void generic_loader_reset(void *opaque)
static void generic_loader_realize(DeviceState *dev, Error **errp)
{
+ ERRP_GUARD();
GenericLoaderState *s = GENERIC_LOADER(dev);
hwaddr entry;
ssize_t size = 0;
@@ -149,13 +150,13 @@ static void generic_loader_realize(DeviceState *dev,
Error **errp)
if (size < 0 || s->force_raw) {
/* Default to the maximum size being the machine's ram size */
size = load_image_targphys_as(s->file, s->addr,
- current_machine->ram_size, as, NULL);
+ current_machine->ram_size, as, errp);
} else {
s->addr = entry;
}
- if (size < 0) {
- error_setg(errp, "Cannot load specified image %s", s->file);
+ if (*errp) {
Again I'd keep the 'if (size < 0)' check to avoid *errp.
+ error_prepend(errp, "Cannot load specified image %s: ", s->file);
return;
}
}
diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c
index 59f325ad9c..dcbe8e4520 100644
--- a/hw/core/guest-loader.c
+++ b/hw/core/guest-loader.c
@@ -81,6 +81,7 @@ static void loader_insert_platform_data(GuestLoaderState *s,
int size,
static void guest_loader_realize(DeviceState *dev, Error **errp)
{
+ ERRP_GUARD();
GuestLoaderState *s = GUEST_LOADER(dev);
char *file = s->kernel ? s->kernel : s->initrd;
int size = 0;
@@ -101,9 +102,9 @@ static void guest_loader_realize(DeviceState *dev, Error
**errp)
/* Default to the maximum size being the machine's ram size */
size = load_image_targphys_as(file, s->addr, current_machine->ram_size,
- NULL, NULL);
- if (size < 0) {
- error_setg(errp, "Cannot load specified image %s", file);
+ NULL, errp);
+ if (*errp) {
Ditto, otherwise:
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
+ error_prepend(errp, "Cannot load specified image %s: ", file);
return;
}
