mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
hw/ppc/spapr: Rename resize_hpt_err to errp
Rename resize_hpt_err to standard errp naming convention. Signed-off-by: Vishal Chourasia <vishalc@linux.ibm.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20251021105442.1474602-9-vishalc@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
committed by
Philippe Mathieu-Daudé
parent
55634cdf11
commit
344c79b8ff
+8
-8
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user