qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Matthew Rosato <mjrosato@linux.vnet.ibm.com>,
	qemu-devel <qemu-devel@nongnu.org>,
	Alexander Graf <agraf@suse.de>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	Jens Freimann <jfrei@linux.vnet.ibm.com>,
	Anthony Liguori <anthony@codemonkey.ws>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 14/19] s390-virtio: Apply same memory boundaries as virtio-ccw
Date: Mon,  1 Sep 2014 14:54:25 +0200	[thread overview]
Message-ID: <1409576070-55803-15-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <1409576070-55803-1-git-send-email-borntraeger@de.ibm.com>

From: Matthew Rosato <mjrosato@linux.vnet.ibm.com>

Although s390-virtio won't support memory hotplug, it should
enforce the same memory boundaries so that it can use shared codepaths
(like read_SCP_info).

Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390x/s390-virtio.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 1a75a1c..4ca52b7 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -230,18 +230,21 @@ static void s390_init(MachineState *machine)
     ram_addr_t my_ram_size = machine->ram_size;
     MemoryRegion *sysmem = get_system_memory();
     MemoryRegion *ram = g_new(MemoryRegion, 1);
-    int shift = 0;
+    int increment_size = 20;
     uint8_t *storage_keys;
     void *virtio_region;
     hwaddr virtio_region_len;
     hwaddr virtio_region_start;
 
-    /* s390x ram size detection needs a 16bit multiplier + an increment. So
-       guests > 64GB can be specified in 2MB steps etc. */
-    while ((my_ram_size >> (20 + shift)) > 65535) {
-        shift++;
+    /*
+     * 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 ((my_ram_size >> increment_size) > MAX_STORAGE_INCREMENTS) {
+        increment_size++;
     }
-    my_ram_size = my_ram_size >> (20 + shift) << (20 + shift);
+    my_ram_size = my_ram_size >> increment_size << increment_size;
 
     /* let's propagate the changed ram size into the global variable. */
     ram_size = my_ram_size;
-- 
1.8.4.2

  parent reply	other threads:[~2014-09-01 12:54 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 12:54 [Qemu-devel] [PULL 00/19] s390x/kvm: Several updates/fixes/features Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 01/19] s390x/kvm: run guest triggered resets on the target vcpu thread Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 02/19] s390x/kvm: execute sigp orders " Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 03/19] s390x/kvm: execute "system reset" cpu resets on the " Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 04/19] s390x/kvm: execute the first cpu reset " Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 05/19] pc-bios/s390-ccw: support all virtio block size Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 06/19] pc-bios/s390-ccw: handle more ECKD DASD block sizes Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 07/19] pc-bios/s390-ccw Improve ECKD informational message Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 08/19] pc-bios/s390-ccw Really big EAV ECKD DASD handling Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 09/19] pc-bios/s390-ccw: IPL from DASD with format variations Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 11/19] pc-bios/s390-ccw.img binary update Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 12/19] sclp-s390: Add device to manage s390 memory hotplug Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 13/19] virtio-ccw: Include standby memory when calculating storage increment Christian Borntraeger
2014-09-01 12:54 ` Christian Borntraeger [this message]
2014-09-01 12:54 ` [Qemu-devel] [PULL 15/19] sclp-s390: Add memory hotplug SCLPs Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 16/19] s390x/gdb: don't touch the cc if tcg is not enabled Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 17/19] s390x/gdb: add the feature xml files for s390x Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 18/19] s390x/gdb: generate target.xml and handle fp/ac as coprocessors Christian Borntraeger
2014-09-01 12:54 ` [Qemu-devel] [PULL 19/19] s390x/gdb: coding style fixes Christian Borntraeger
2014-09-01 13:44 ` [Qemu-devel] [PULL 00/19] s390x/kvm: Several updates/fixes/features Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409576070-55803-15-git-send-email-borntraeger@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=agraf@suse.de \
    --cc=anthony@codemonkey.ws \
    --cc=cornelia.huck@de.ibm.com \
    --cc=jfrei@linux.vnet.ibm.com \
    --cc=mjrosato@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).