qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	dgilbert@redhat.com, Juan Quintela <quintela@redhat.com>
Subject: [Qemu-devel] [PULL 6/8] arch_init: support resizing on incoming migration
Date: Wed, 24 Dec 2014 13:51:47 +0200	[thread overview]
Message-ID: <1419421800-27505-7-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1419421800-27505-1-git-send-email-mst@redhat.com>

If block used_length does not match, try to resize it.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch_init.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 106f46e..cfedbf0 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -1086,11 +1086,14 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
 
                 QTAILQ_FOREACH(block, &ram_list.blocks, next) {
                     if (!strncmp(id, block->idstr, sizeof(id))) {
-                        if (block->used_length != length) {
-                            error_report("Length mismatch: %s: 0x" RAM_ADDR_FMT
-                                         " in != 0x" RAM_ADDR_FMT, id, length,
-                                         block->used_length);
-                            ret =  -EINVAL;
+                        if (length != block->used_length) {
+                            Error *local_err = NULL;
+
+                            ret = qemu_ram_resize(block->offset, length, &local_err);
+                            if (local_err) {
+                                error_report("%s", error_get_pretty(local_err));
+                                error_free(local_err);
+                            }
                         }
                         break;
                     }
-- 
MST

  parent reply	other threads:[~2014-12-24 11:51 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-24 11:51 [Qemu-devel] [PULL 0/8] pc: resizeable ROM blocks Michael S. Tsirkin
2014-12-24 11:51 ` [Qemu-devel] [PULL 1/8] cpu: add cpu_physical_memory_clear_dirty_range_nocode Michael S. Tsirkin
2015-01-07  7:16   ` Paolo Bonzini
2014-12-24 11:51 ` [Qemu-devel] [PULL 2/8] memory: add memory_region_set_size Michael S. Tsirkin
2014-12-24 11:51 ` [Qemu-devel] [PULL 3/8] exec: cpu_physical_memory_set/clear_dirty_range Michael S. Tsirkin
2014-12-24 11:51 ` [Qemu-devel] [PULL 4/8] exec: split length -> used_length/max_length Michael S. Tsirkin
2014-12-24 11:51 ` [Qemu-devel] [PULL 5/8] exec: qemu_ram_alloc_resizeable, qemu_ram_resize Michael S. Tsirkin
2015-01-07  7:18   ` Paolo Bonzini
2015-01-07  9:55     ` Michael S. Tsirkin
2014-12-24 11:51 ` Michael S. Tsirkin [this message]
2014-12-24 11:51 ` [Qemu-devel] [PULL 7/8] memory: API to allocate resizeable RAM MR Michael S. Tsirkin
2014-12-24 11:51 ` [Qemu-devel] [PULL 8/8] acpi-build: make ROMs RAM blocks resizeable Michael S. Tsirkin
2014-12-30 13:47   ` Marcel Apfelbaum
2014-12-24 12:25 ` [Qemu-devel] [PULL 0/8] pc: resizeable ROM blocks Paolo Bonzini
2014-12-24 12:40   ` Peter Maydell
2014-12-24 12:41   ` Michael S. Tsirkin
2015-01-07  7:33     ` Paolo Bonzini
2015-01-07 10:03       ` Michael S. Tsirkin
2015-01-07 10:52         ` Paolo Bonzini
2015-01-07 12:37           ` Michael S. Tsirkin
2015-01-07 12:59             ` Paolo Bonzini
2015-01-19 14:04       ` Igor Mammedov

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=1419421800-27505-7-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /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).