mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-09 05:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-5.2-20201105' into staging

Browse Source 
ppc patch queue for 2020-11-05

A small PR this time, one bugfix, one removal of minor dead code, one
warning suppression.

# gpg: Signature made Thu 05 Nov 2020 03:44:51 GMT
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dg-gitlab/tags/ppc-for-5.2-20201105:
  spapr: Convert hpt_prepare_thread() to use qemu_try_memalign()
  spapr: Drop dead code in spapr_reallocate_hpt()
  target/ppc/excp_helper: Add a fallthrough for fix compiler warning

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2020-11-05 18:59:50 +00:00
parent fbd9cc20ad f29b959dc6
commit 326c9a0eb6
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ppc/spapr.c
View File

@@ -1522,12 +1522,6 @@ int spapr_reallocate_hpt(SpaprMachineState *spapr, int shift, Error **errp)
int i; int i;
spapr->htab = qemu_memalign(size, size); spapr->htab = qemu_memalign(size, size);
if (!spapr->htab) {
error_setg_errno(errp, errno,
"Could not allocate HPT of order %d", shift);
return -ENOMEM;
}
memset(spapr->htab, 0, size); memset(spapr->htab, 0, size);
spapr->htab_shift = shift; spapr->htab_shift = shift;

2
hw/ppc/spapr_hcall.c
View File

@@ -360,7 +360,7 @@ static void *hpt_prepare_thread(void *opaque)
SpaprPendingHpt *pending = opaque; SpaprPendingHpt *pending = opaque;
size_t size = 1ULL << pending->shift; size_t size = 1ULL << pending->shift;
pending->hpt = qemu_memalign(size, size); pending->hpt = qemu_try_memalign(size, size);
if (pending->hpt) { if (pending->hpt) {
memset(pending->hpt, 0, size); memset(pending->hpt, 0, size);
pending->ret = H_SUCCESS; pending->ret = H_SUCCESS;

1
target/ppc/excp_helper.c
View File

@@ -527,6 +527,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
break; break;
case POWERPC_EXCP_HISI: /* Hypervisor instruction storage exception */ case POWERPC_EXCP_HISI: /* Hypervisor instruction storage exception */
msr |= env->error_code; msr |= env->error_code;
/* fall through */
case POWERPC_EXCP_HDECR: /* Hypervisor decrementer exception */ case POWERPC_EXCP_HDECR: /* Hypervisor decrementer exception */
case POWERPC_EXCP_HDSI: /* Hypervisor data storage exception */ case POWERPC_EXCP_HDSI: /* Hypervisor data storage exception */
case POWERPC_EXCP_HDSEG: /* Hypervisor data segment exception */ case POWERPC_EXCP_HDSEG: /* Hypervisor data segment exception */