diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-06-01 13:03:23 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-09-07 16:10:44 +0200 |
| commit | 71a2fd355d8fa429bcc04740c260635e084255f2 (patch) | |
| tree | 61a6c4c2d2163d3230a11cd1f5216fe7d7c7696d /hw/s390x/sclp.c | |
| parent | 80d23275e3c4bc93fa6f123613d5ff389ed3fc62 (diff) | |
| download | qemu-71a2fd355d8fa429bcc04740c260635e084255f2.tar.gz qemu-71a2fd355d8fa429bcc04740c260635e084255f2.tar.bz2 qemu-71a2fd355d8fa429bcc04740c260635e084255f2.zip | |
s390/sclp: store the increment_size in the sclp device
Let's calculate it once and reuse it.
Suggested-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x/sclp.c')
| -rw-r--r-- | hw/s390x/sclp.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index ac582e804c..0a7f4dd2f7 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -36,7 +36,6 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) CPUState *cpu; int cpu_count = 0; int i = 0; - int increment_size = 20; int rnsize, rnmax; int slots = MIN(machine->ram_slots, s390_get_memslot_count(kvm_state)); @@ -57,23 +56,9 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO | SCLP_HAS_PCI_RECONFIG); - /* - * The storage increment size is a multiple of 1M and is a power of 2. - * The number of storage increments must be MAX_STORAGE_INCREMENTS or fewer. - */ - while ((ram_size >> increment_size) > MAX_STORAGE_INCREMENTS) { - increment_size++; - } - rnmax = ram_size >> increment_size; - + rnmax = ram_size >> sclp->increment_size; /* Memory Hotplug is only supported for the ccw machine type */ if (mhd) { - while ((mhd->standby_mem_size >> increment_size) > - MAX_STORAGE_INCREMENTS) { - increment_size++; - } - assert(increment_size == mhd->increment_size); - mhd->standby_subregion_size = MEM_SECTION_SIZE; /* Deduct the memory slot already used for core */ if (slots > 0) { @@ -105,7 +90,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) read_info->facilities |= cpu_to_be64(SCLP_FC_ASSIGN_ATTACH_READ_STOR); } - rnsize = 1 << (increment_size - 20); + rnsize = 1 << (sclp->increment_size - 20); if (rnsize <= 128) { read_info->rnsize = rnsize; } else { @@ -518,6 +503,7 @@ static void sclp_memory_init(SCLPDevice *sclp) increment_size++; } } + sclp->increment_size = increment_size; /* The core and standby memory areas need to be aligned with * the increment size. In effect, this can cause the |