diff options
| author | Greg Kurz | 2020-08-13 19:28:10 +0200 |
|---|---|---|
| committer | David Gibson | 2020-08-14 05:35:45 +0200 |
| commit | 3110f0ee19ccdb50adff3dfa1321039f69efddcd (patch) | |
| tree | 88f66cb2f4c740c31762eb4f38bb1c4c3ca16943 /hw/intc | |
| parent | nvram: Exit QEMU if NVRAM cannot contain all -prom-env data (diff) | |
| download | qemu-3110f0ee19ccdb50adff3dfa1321039f69efddcd.tar.gz qemu-3110f0ee19ccdb50adff3dfa1321039f69efddcd.tar.xz qemu-3110f0ee19ccdb50adff3dfa1321039f69efddcd.zip | |
spapr/xive: Use xive_source_esb_len()
static inline size_t xive_source_esb_len(XiveSource *xsrc)
{
return (1ull << xsrc->esb_shift) * xsrc->nr_irqs;
}
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159733969034.320580.6571451425779179477.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/spapr_xive.c | 2 | ||||
| -rw-r--r-- | hw/intc/spapr_xive_kvm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 3c84f64dc4..4bd0d606ba 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -336,7 +336,7 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(SYS_BUS_DEVICE(xive), &end_xsrc->esb_mmio); /* Set the mapping address of the END ESB pages after the source ESBs */ - xive->end_base = xive->vc_base + (1ull << xsrc->esb_shift) * xsrc->nr_irqs; + xive->end_base = xive->vc_base + xive_source_esb_len(xsrc); /* * Allocate the routing tables diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index d871bb1a00..e8667ce5f6 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -831,7 +831,7 @@ void kvmppc_xive_disconnect(SpaprInterruptController *intc) /* Clear the KVM mapping */ xsrc = &xive->source; - esb_len = (1ull << xsrc->esb_shift) * xsrc->nr_irqs; + esb_len = xive_source_esb_len(xsrc); if (xsrc->esb_mmap) { memory_region_del_subregion(&xsrc->esb_mmio, &xsrc->esb_mmio_kvm); |