OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Alex Williamson 2010-07-02 11:13:29 -06:00 committed by Anthony Liguori
parent 230741dcc7
commit fb787f81e7
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch_init.c
View File

@ -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;

13
exec.c
View File

@ -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();
}
}