From: Vishal Chourasia <vishalc@linux.ibm.com>
To: adityag@linux.ibm.com, harshpb@linux.ibm.com,
milesg@linux.ibm.com, npiggin@gmail.com,
peter.maydell@linaro.org, alistair23@gmail.com,
balaton@eik.bme.hu, qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
berrange@redhat.com
Cc: "Vishal Chourasia" <vishalc@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [Patch v6 5/6] hw/ppc/spapr: Rename resize_hpt_err to errp
Date: Wed, 22 Oct 2025 18:55:09 +0530 [thread overview]
Message-ID: <20251022132507.1597232-12-vishalc@linux.ibm.com> (raw)
In-Reply-To: <20251022132507.1597232-2-vishalc@linux.ibm.com>
Rename resize_hpt_err to standard errp naming convention.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Vishal Chourasia <vishalc@linux.ibm.com>
---
hw/ppc/spapr.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d69117d3b4..e51540a5ad 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2817,7 +2817,7 @@ static void spapr_machine_init(MachineState *machine)
int i;
MemoryRegion *sysmem = get_system_memory();
long load_limit, fw_size;
- Error *resize_hpt_err = NULL;
+ Error *errp = NULL;
NICInfo *nd;
if (!filename) {
@@ -2845,7 +2845,7 @@ static void spapr_machine_init(MachineState *machine)
/* Determine capabilities to run with */
spapr_caps_init(spapr);
- kvmppc_check_papr_resize_hpt(&resize_hpt_err);
+ kvmppc_check_papr_resize_hpt(&errp);
if (spapr->resize_hpt == SPAPR_RESIZE_HPT_DEFAULT) {
/*
* If the user explicitly requested a mode we should either
@@ -2853,10 +2853,10 @@ static void spapr_machine_init(MachineState *machine)
* it's not set explicitly, we reset our mode to something
* that works
*/
- if (resize_hpt_err) {
+ if (errp) {
spapr->resize_hpt = SPAPR_RESIZE_HPT_DISABLED;
- error_free(resize_hpt_err);
- resize_hpt_err = NULL;
+ error_free(errp);
+ errp = NULL;
} else {
spapr->resize_hpt = smc->resize_hpt_default;
}
@@ -2864,14 +2864,14 @@ static void spapr_machine_init(MachineState *machine)
assert(spapr->resize_hpt != SPAPR_RESIZE_HPT_DEFAULT);
- if ((spapr->resize_hpt != SPAPR_RESIZE_HPT_DISABLED) && resize_hpt_err) {
+ if ((spapr->resize_hpt != SPAPR_RESIZE_HPT_DISABLED) && errp) {
/*
* User requested HPT resize, but this host can't supply it. Bail out
*/
- error_report_err(resize_hpt_err);
+ error_report_err(errp);
exit(1);
}
- error_free(resize_hpt_err);
+ error_free(errp);
spapr->rma_size = spapr_rma_size(spapr, &error_fatal);
--
2.51.0
next prev parent reply other threads:[~2025-10-22 13:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-22 13:24 [Patch v6 0/6] hw/core/loader: capture Error from load_image_targphys Vishal Chourasia
2025-10-22 13:25 ` [Patch v6 1/6] hw/core/loader: Use qemu_open() instead of open() in get_image_size() Vishal Chourasia
2025-10-22 13:25 ` [Patch v6 2/6] hw/core/loader: capture Error from load_image_targphys Vishal Chourasia
2025-10-22 13:25 ` [Patch v6 3/6] hw/core/loader: add check for zero size in load_image_targphys_as Vishal Chourasia
2025-10-22 13:25 ` [Patch v6 4/6] hw/core: Pass errp to load_image_targphys_as() Vishal Chourasia
2025-10-22 13:25 ` Vishal Chourasia [this message]
2025-10-22 13:25 ` [Patch v6 6/6] hw/ppc: Pass errp to load_image_targphys() and report errors Vishal Chourasia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251022132507.1597232-12-vishalc@linux.ibm.com \
--to=vishalc@linux.ibm.com \
--cc=adityag@linux.ibm.com \
--cc=alistair23@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=berrange@redhat.com \
--cc=harshpb@linux.ibm.com \
--cc=milesg@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).