提交 fb787f81 编写于 作者: A Alex Williamson 提交者: 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: NAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 230741dc
...@@ -369,8 +369,9 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) ...@@ -369,8 +369,9 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
} }
if (!block) { if (!block) {
if (!qemu_ram_alloc(NULL, id, length)) fprintf(stderr, "Unknown ramblock \"%s\", cannot "
return -ENOMEM; "accept migration\n", id);
return -EINVAL;
} }
total_ram_bytes -= length; total_ram_bytes -= length;
......
...@@ -2826,16 +2826,9 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size) ...@@ -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) { QLIST_FOREACH(block, &ram_list.blocks, next) {
if (!strcmp(block->idstr, new_block->idstr)) { if (!strcmp(block->idstr, new_block->idstr)) {
if (block->length == new_block->length) { fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",
fprintf(stderr, "RAMBlock \"%s\" exists, assuming lack of" new_block->idstr);
"free.\n", new_block->idstr); abort();
qemu_free(new_block);
return block->offset;
} else {
fprintf(stderr, "RAMBlock \"%s\" already registered with"
"different size, abort\n", new_block->idstr);
abort();
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册