[Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160408

[Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160408

[David Gibson]

The following changes since commit ead5268f2166101f7dde70598c9f538a90afd8ee:

  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-04-07-tag' into staging (2016-04-07 18:06:14 +0100)

are available in the git repository at:

  git://github.com/dgibson/qemu.git tags/ppc-for-2.6-20160408

for you to fetch changes up to a110655a068d4b98495115ff0f8405235d845272:

  spapr: Fix ibm,lrdr-capacity (2016-04-08 11:18:10 +1000)

----------------------------------------------------------------
ppc patch queue for 2016-04-08

Just a single bugfix for spapr in this batch, but I want to make sure
it gets in for 2.6.

----------------------------------------------------------------
Bharata B Rao (1):
      spapr: Fix ibm,lrdr-capacity

 hw/ppc/spapr_rtas.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/1] spapr: Fix ibm,lrdr-capacity

[David Gibson]

From: Bharata B Rao <bharata@linux.vnet.ibm.com>

ibm,lrdr-capacity has a field to describe the maximum address in bytes
and therefore, the most memory that can be allocated to this guest. We
are using maxmem for this field, but instead should use the actual RAM
address corresponding to the end of hotplug region.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/spapr_rtas.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 2db2292..f073258 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -684,6 +684,9 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr,
     int i;
     uint32_t lrdr_capacity[5];
     MachineState *machine = MACHINE(qdev_get_machine());
+    sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
+    uint64_t max_hotplug_addr = spapr->hotplug_memory.base +
+                                memory_region_size(&spapr->hotplug_memory.mr);
 
     ret = fdt_add_mem_rsv(fdt, rtas_addr, rtas_size);
     if (ret < 0) {
@@ -733,8 +736,8 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr,
 
     }
 
-    lrdr_capacity[0] = cpu_to_be32(((uint64_t)machine->maxram_size) >> 32);
-    lrdr_capacity[1] = cpu_to_be32(machine->maxram_size & 0xffffffff);
+    lrdr_capacity[0] = cpu_to_be32(max_hotplug_addr >> 32);
+    lrdr_capacity[1] = cpu_to_be32(max_hotplug_addr & 0xffffffff);
     lrdr_capacity[2] = 0;
     lrdr_capacity[3] = cpu_to_be32(SPAPR_MEMORY_BLOCK_SIZE);
     lrdr_capacity[4] = cpu_to_be32(max_cpus/smp_threads);
-- 
2.5.5

Re: [Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160408

[Peter Maydell]

On 8 April 2016 at 06:05, David Gibson <david@gibson.dropbear.id.au> wrote:
> The following changes since commit ead5268f2166101f7dde70598c9f538a90afd8ee:
>
>   Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-04-07-tag' into staging (2016-04-07 18:06:14 +0100)
>
> are available in the git repository at:
>
>   git://github.com/dgibson/qemu.git tags/ppc-for-2.6-20160408
>
> for you to fetch changes up to a110655a068d4b98495115ff0f8405235d845272:
>
>   spapr: Fix ibm,lrdr-capacity (2016-04-08 11:18:10 +1000)
>
> ----------------------------------------------------------------
> ppc patch queue for 2016-04-08
>
> Just a single bugfix for spapr in this batch, but I want to make sure
> it gets in for 2.6.

Applied, thanks.

-- PMM