motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc/spapr: Convert HPTE() macro as hpte_get_ptr() method

Browse source 
Convert HPTE() macro as hpte_get_ptr() method.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Message-ID: <20241220213103.6314-2-philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-20 22:30:58 +01:00 • committed by Nicholas Piggin
parent c2c687013d
commit c894bdf78b
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
hw/ppc/spapr.c
View file

@ -1402,7 +1402,13 @@ static bool spapr_get_pate(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu,
} }
} }
#define HPTE(_table, _i) (void *)(((uint64_t *)(_table)) + ((_i) * 2)) static uint64_t *hpte_get_ptr(SpaprMachineState *s, unsigned index)
{
uint64_t *table = s->htab;
return &table[2 * index];
}
#define HPTE_VALID(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_VALID) #define HPTE_VALID(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_VALID)
#define HPTE_DIRTY(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_HPTE_DIRTY) #define HPTE_DIRTY(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_HPTE_DIRTY)
#define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~HPTE64_V_HPTE_DIRTY)) #define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~HPTE64_V_HPTE_DIRTY))
@ -1617,7 +1623,7 @@ int spapr_reallocate_hpt(SpaprMachineState *spapr, int shift, Error **errp)
spapr->htab_shift = shift; spapr->htab_shift = shift;
for (i = 0; i < size / HASH_PTE_SIZE_64; i++) { for (i = 0; i < size / HASH_PTE_SIZE_64; i++) {
DIRTY_HPTE(HPTE(spapr->htab, i)); DIRTY_HPTE(hpte_get_ptr(spapr, i));
} }
} }
/* We're setting up a hash table, so that means we're not radix */ /* We're setting up a hash table, so that means we're not radix */
@ -2174,7 +2180,7 @@ static void htab_save_chunk(QEMUFile *f, SpaprMachineState *spapr,
qemu_put_be32(f, chunkstart); qemu_put_be32(f, chunkstart);
qemu_put_be16(f, n_valid); qemu_put_be16(f, n_valid);
qemu_put_be16(f, n_invalid); qemu_put_be16(f, n_invalid);
qemu_put_buffer(f, HPTE(spapr->htab, chunkstart), qemu_put_buffer(f, (void *)hpte_get_ptr(spapr, chunkstart),
HASH_PTE_SIZE_64 * n_valid); HASH_PTE_SIZE_64 * n_valid);
} }
@ -2200,16 +2206,16 @@ static void htab_save_first_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume invalid HPTEs */ /* Consume invalid HPTEs */
while ((index < htabslots) while ((index < htabslots)
&& !HPTE_VALID(HPTE(spapr->htab, index))) { && !HPTE_VALID(hpte_get_ptr(spapr, index))) {
CLEAN_HPTE(HPTE(spapr->htab, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
} }
/* Consume valid HPTEs */ /* Consume valid HPTEs */
chunkstart = index; chunkstart = index;
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& HPTE_VALID(HPTE(spapr->htab, index))) { && HPTE_VALID(hpte_get_ptr(spapr, index))) {
CLEAN_HPTE(HPTE(spapr->htab, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
} }
@ -2249,7 +2255,7 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume non-dirty HPTEs */ /* Consume non-dirty HPTEs */
while ((index < htabslots) while ((index < htabslots)
&& !HPTE_DIRTY(HPTE(spapr->htab, index))) { && !HPTE_DIRTY(hpte_get_ptr(spapr, index))) {
index++; index++;
examined++; examined++;
} }
@ -2257,9 +2263,9 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
chunkstart = index; chunkstart = index;
/* Consume valid dirty HPTEs */ /* Consume valid dirty HPTEs */
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& HPTE_DIRTY(HPTE(spapr->htab, index)) && HPTE_DIRTY(hpte_get_ptr(spapr, index))
&& HPTE_VALID(HPTE(spapr->htab, index))) { && HPTE_VALID(hpte_get_ptr(spapr, index))) {
CLEAN_HPTE(HPTE(spapr->htab, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
examined++; examined++;
} }
@ -2267,9 +2273,9 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
invalidstart = index; invalidstart = index;
/* Consume invalid dirty HPTEs */ /* Consume invalid dirty HPTEs */
while ((index < htabslots) && (index - invalidstart < USHRT_MAX) while ((index < htabslots) && (index - invalidstart < USHRT_MAX)
&& HPTE_DIRTY(HPTE(spapr->htab, index)) && HPTE_DIRTY(hpte_get_ptr(spapr, index))
&& !HPTE_VALID(HPTE(spapr->htab, index))) { && !HPTE_VALID(hpte_get_ptr(spapr, index))) {
CLEAN_HPTE(HPTE(spapr->htab, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
examined++; examined++;
} }
@ -2451,11 +2457,11 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
if (spapr->htab) { if (spapr->htab) {
if (n_valid) { if (n_valid) {
qemu_get_buffer(f, HPTE(spapr->htab, index), qemu_get_buffer(f, (void *)hpte_get_ptr(spapr, index),
HASH_PTE_SIZE_64 * n_valid); HASH_PTE_SIZE_64 * n_valid);
} }
if (n_invalid) { if (n_invalid) {
memset(HPTE(spapr->htab, index + n_valid), 0, memset(hpte_get_ptr(spapr, index + n_valid), 0,
HASH_PTE_SIZE_64 * n_invalid); HASH_PTE_SIZE_64 * n_invalid);
} }
} else { } else {