hw/ppc/spapr.c: consecutive 'spapr->patb_entry = 0' statements
commitaca8bf9f1cbc90da82554c43ef843887ed0ab1ff
authorDaniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
Fri, 16 Jun 2017 17:22:30 +0000 (16 14:22 -0300)
committerDavid Gibson <david@gibson.dropbear.id.au>
Fri, 30 Jun 2017 04:03:31 +0000 (30 14:03 +1000)
tree5804b4944cf564a477d07e62d65523ae4e9af61b
parent6595ab31583ed3ca4a7820dc888fe2de3c37c8a2
hw/ppc/spapr.c: consecutive 'spapr->patb_entry = 0' statements

In ppc_spapr_reset(), if the guest is using HPT, the code was executing:

    } else {
        spapr->patb_entry = 0;
        spapr_setup_hpt_and_vrma(spapr);
    }

And, at the end of spapr_setup_hpt_and_vrma:

    /* We're setting up a hash table, so that means we're not radix */
    spapr->patb_entry = 0;

Resulting in spapr->patb_entry being assigned to 0 twice in a row.

Given that 'spapr_setup_hpt_and_vrma' is also called inside
'spapr_check_setup_free_hpt' of spapr_hcall.c, this trivial patch removes
the 'patb_entry = 0' assignment from the 'else' clause inside ppc_spapr_reset
to avoid this behavior.

Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
hw/ppc/spapr.c