diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-05-29 13:14:50 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-09-07 16:10:44 +0200 |
| commit | 311467f77eab5c3e1f8e0f6f446201e3a1f46e70 (patch) | |
| tree | df58f31367971622c1018abaa9de3bd5dec8e12f /hw/s390x/s390-virtio-ccw.c | |
| parent | 1723a1b6313851d9704961e1f527312ee0a5fce4 (diff) | |
| download | qemu-311467f77eab5c3e1f8e0f6f446201e3a1f46e70.tar.gz qemu-311467f77eab5c3e1f8e0f6f446201e3a1f46e70.tar.bz2 qemu-311467f77eab5c3e1f8e0f6f446201e3a1f46e70.zip | |
s390: no need to manually parse for slots and maxmem
ram_slots and maxram_size has already been parsed and verified by
common code for us.
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/s390-virtio-ccw.c')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e2a26e95b9..d4afe7df2c 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -109,9 +109,8 @@ static void ccw_init(MachineState *machine) int ret; VirtualCssBus *css_bus; DeviceState *dev; - QemuOpts *opts = qemu_opts_find(qemu_find_opts("memory"), NULL); ram_addr_t pad_size = 0; - ram_addr_t maxmem = qemu_opt_get_size(opts, "maxmem", my_ram_size); + ram_addr_t maxmem = machine->maxram_size; ram_addr_t standby_mem_size = maxmem - my_ram_size; uint64_t kvm_limit; |