Commit a816f2d6 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr: Simplify some warning printing paths in spapr_caps.c 



We obviously only want to print a warning in these cases, but this is done
in a rather convoluted manner. Just use warn_report() instead.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <159188281098.70166.18387926536399257573.stgit@bahia.lan>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 63d21199

hw/ppc/spapr_caps.c

+6 −22
Original line number Diff line number Diff line
@@ -248,13 +248,11 @@ SpaprCapPossible cap_cfpc_possible = { 
static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val,

                                 Error **errp)

{

    Error *local_err = NULL;

    uint8_t kvm_val =  kvmppc_get_cap_safe_cache();



    if (tcg_enabled() && val) {

        /* TCG only supports broken, allow other values and print a warning */

        error_setg(&local_err,

                   "TCG doesn't support requested feature, cap-cfpc=%s",

        warn_report("TCG doesn't support requested feature, cap-cfpc=%s",

                    cap_cfpc_possible.vals[val]);

    } else if (kvm_enabled() && (val > kvm_val)) {

        error_setg(errp,
@@ -262,9 +260,6 @@ static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val, 
                   " try appending -machine cap-cfpc=%s",

                   cap_cfpc_possible.vals[kvm_val]);

    }



    if (local_err != NULL)

        warn_report_err(local_err);

}



SpaprCapPossible cap_sbbc_possible = {
@@ -277,13 +272,11 @@ SpaprCapPossible cap_sbbc_possible = { 
static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t val,

                                        Error **errp)

{

    Error *local_err = NULL;

    uint8_t kvm_val =  kvmppc_get_cap_safe_bounds_check();



    if (tcg_enabled() && val) {

        /* TCG only supports broken, allow other values and print a warning */

        error_setg(&local_err,

                   "TCG doesn't support requested feature, cap-sbbc=%s",

        warn_report("TCG doesn't support requested feature, cap-sbbc=%s",

                    cap_sbbc_possible.vals[val]);

    } else if (kvm_enabled() && (val > kvm_val)) {

        error_setg(errp,
@@ -291,9 +284,6 @@ static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t val, 
                   " try appending -machine cap-sbbc=%s",

                   cap_sbbc_possible.vals[kvm_val]);

    }



    if (local_err != NULL)

        warn_report_err(local_err);

}



SpaprCapPossible cap_ibs_possible = {
@@ -309,13 +299,11 @@ SpaprCapPossible cap_ibs_possible = { 
static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr,

                                           uint8_t val, Error **errp)

{

    Error *local_err = NULL;

    uint8_t kvm_val = kvmppc_get_cap_safe_indirect_branch();



    if (tcg_enabled() && val) {

        /* TCG only supports broken, allow other values and print a warning */

        error_setg(&local_err,

                   "TCG doesn't support requested feature, cap-ibs=%s",

        warn_report("TCG doesn't support requested feature, cap-ibs=%s",

                    cap_ibs_possible.vals[val]);

    } else if (kvm_enabled() && (val > kvm_val)) {

        error_setg(errp,
@@ -323,10 +311,6 @@ static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr, 
                   " try appending -machine cap-ibs=%s",

                   cap_ibs_possible.vals[kvm_val]);

    }



    if (local_err != NULL) {

        warn_report_err(local_err);

    }

}



#define VALUE_DESC_TRISTATE     " (broken, workaround, fixed)"