diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2010-07-02 11:13:29 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:36:29 -0500 |
commit | fb787f81e749fde8c74548f9db1472eb321b9a0c (patch) | |
tree | 1a3d01ef4f81d1f31ad2b4e4bdd2ee242126032d /exec.c | |
parent | 230741dcc7c15573efe41ee88b7533e0c3c76f66 (diff) | |
download | hqemu-fb787f81e749fde8c74548f9db1472eb321b9a0c.zip hqemu-fb787f81e749fde8c74548f9db1472eb321b9a0c.tar.gz |
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 'exec.c')
-rw-r--r-- | exec.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -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(); } } |