diff options
| author | Christian Borntraeger | 2011-05-12 10:50:44 +0200 |
|---|---|---|
| committer | Alexander Graf | 2011-05-20 17:35:13 +0200 |
| commit | 22486aa04aa300db0cc5887d9612b4d486f0edac (patch) | |
| tree | 449174d7566f3812befecbbb33c63aeec9419521 /target-s390x/op_helper.c | |
| parent | s390x: change mapping base to allow guests > 2GB (diff) | |
| download | qemu-22486aa04aa300db0cc5887d9612b4d486f0edac.tar.gz qemu-22486aa04aa300db0cc5887d9612b4d486f0edac.tar.xz qemu-22486aa04aa300db0cc5887d9612b4d486f0edac.zip | |
s390x: fix memory detection for guests > 64GB
the s390 memory detection has a 16bit field that specifies the amount of
increments. This patch adopts the memory size to always fit into that
scheme. This also fixes virtio detection for these guests, since the
descriptor page is located after the main memory.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/op_helper.c')
| -rw-r--r-- | target-s390x/op_helper.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index 9153940540..49760a40a2 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env, int type, uint32_t param, int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code) { int r = 0; + int shift = 0; #ifdef DEBUG_HELPER printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code); @@ -2375,8 +2376,11 @@ int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code) switch(code) { case SCLP_CMDW_READ_SCP_INFO: case SCLP_CMDW_READ_SCP_INFO_FORCED: - stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20); - stb_phys(sccb + SCP_INCREMENT, 1); + while ((ram_size >> (20 + shift)) > 65535) { + shift++; + } + stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift)); + stb_phys(sccb + SCP_INCREMENT, 1 << shift); stw_phys(sccb + SCP_RESPONSE_CODE, 0x10); if (kvm_enabled()) { |