From fb787f81e749fde8c74548f9db1472eb321b9a0c Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 2 Jul 2010 11:13:29 -0600 Subject: 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 Signed-off-by: Anthony Liguori --- exec.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index b9a14718b8..5420f564b5 100644 --- a/exec.c +++ b/exec.c @@ -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(); } } -- cgit v1.2.3-55-g7522