Commit fb787f81 authored by Alex Williamson's avatar Alex Williamson Committed by Anthony Liguori

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: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 230741dc
......@@ -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;
......
......@@ -2826,16 +2826,9 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size)
QLIST_FOREACH(block, &ram_list.blocks, next) {
if (!strcmp(block->idstr, new_block->idstr)) {
if (block->length == new_block->length) {
fprintf(stderr, "RAMBlock \"%s\" exists, assuming lack of"
"free.\n", new_block->idstr);
qemu_free(new_block);
return block->offset;
} else {
fprintf(stderr, "RAMBlock \"%s\" already registered with"
"different size, abort\n", new_block->idstr);
abort();
}
fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",
new_block->idstr);
abort();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment