ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
David Hildenbrand 2015-06-01 13:03:23 +02:00 committed by Cornelia Huck
parent 80d23275e3
commit 71a2fd355d
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/s390x/sclp.c
View File

@ -36,7 +36,6 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
CPUState *cpu; CPUState *cpu;
int cpu_count = 0; int cpu_count = 0;
int i = 0; int i = 0;
int increment_size = 20;
int rnsize, rnmax; int rnsize, rnmax;
int slots = MIN(machine->ram_slots, s390_get_memslot_count(kvm_state)); 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 | read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO |
SCLP_HAS_PCI_RECONFIG); SCLP_HAS_PCI_RECONFIG);
/* rnmax = ram_size >> sclp->increment_size;
* 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;
/* Memory Hotplug is only supported for the ccw machine type */ /* Memory Hotplug is only supported for the ccw machine type */
if (mhd) { 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; mhd->standby_subregion_size = MEM_SECTION_SIZE;
/* Deduct the memory slot already used for core */ /* Deduct the memory slot already used for core */
if (slots > 0) { 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); 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) { if (rnsize <= 128) {
read_info->rnsize = rnsize; read_info->rnsize = rnsize;
} else { } else {
@ -518,6 +503,7 @@ static void sclp_memory_init(SCLPDevice *sclp)
increment_size++; increment_size++;
} }
} }
sclp->increment_size = increment_size;
/* The core and standby memory areas need to be aligned with /* The core and standby memory areas need to be aligned with
* the increment size. In effect, this can cause the * the increment size. In effect, this can cause the

1
include/hw/s390x/sclp.h
View File

@ -174,6 +174,7 @@ typedef struct SCLPDevice {
/* private */ /* private */
DeviceState parent_obj; DeviceState parent_obj;
SCLPEventFacility *event_facility; SCLPEventFacility *event_facility;
int increment_size;
/* public */ /* public */
} SCLPDevice; } SCLPDevice;