summary refs log tree commit diff stats
path: root/arch_init.c
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2010-07-02 11:13:29 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2010-07-06 10:36:29 -0500
commitfb787f81e749fde8c74548f9db1472eb321b9a0c (patch)
tree1a3d01ef4f81d1f31ad2b4e4bdd2ee242126032d /arch_init.c
parent230741dcc7c15573efe41ee88b7533e0c3c76f66 (diff)
downloadfocaccia-qemu-fb787f81e749fde8c74548f9db1472eb321b9a0c.tar.gz
focaccia-qemu-fb787f81e749fde8c74548f9db1472eb321b9a0c.zip
ramblocks: No more being lazy about duplicate names
Now that we have a working qemu_ram_free() and the primary runtime
user of it has been updated, don't be lenient about duplicate id strings.
We also shouldn't need to create them ondemand at the target.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'arch_init.c')
-rw-r--r--arch_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch_init.c b/arch_init.c
index 2f082f30bb..47bb4b2d8f 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -369,8 +369,9 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
                     }
 
                     if (!block) {
-                        if (!qemu_ram_alloc(NULL, id, length))
-                            return -ENOMEM;
+                        fprintf(stderr, "Unknown ramblock \"%s\", cannot "
+                                "accept migration\n", id);
+                        return -EINVAL;
                     }
 
                     total_ram_bytes -= length;