From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37822 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OReGX-0003IQ-4u for qemu-devel@nongnu.org; Thu, 24 Jun 2010 00:42:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OReGV-0001ST-LS for qemu-devel@nongnu.org; Thu, 24 Jun 2010 00:42:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60259) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OReGV-0001SP-Ez for qemu-devel@nongnu.org; Thu, 24 Jun 2010 00:42:15 -0400 From: Alex Williamson Date: Wed, 23 Jun 2010 22:41:54 -0600 Message-ID: <20100624044154.16168.80805.stgit@localhost.localdomain> In-Reply-To: <20100624044046.16168.32804.stgit@localhost.localdomain> References: <20100624044046.16168.32804.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 09/15] ramblocks: Make use of DeviceState pointer and BusInfo.get_dev_path List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, armbru@redhat.com, alex.williamson@redhat.com, kraxel@redhat.com, cam@cs.ualberta.ca, paul@codesourcery.com With these two pieces in place, we can start naming ramblocks. When the device is present and it lives on a bus that provides a device path, we concatenate the path and the provided name. Otherwise we just use name. The resulting id string must be unique. For now we assume an allocation for the same name and size is a device that has been removed and reinserted and return the same block. This will go away once qemu_ram_free() is implemented. Signed-off-by: Alex Williamson --- cpu-all.h | 1 + exec.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index dbb2139..5d8342b 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -865,6 +865,7 @@ typedef struct RAMBlock { uint8_t *host; ram_addr_t offset; ram_addr_t length; + char idstr[256]; QLIST_ENTRY(RAMBlock) next; } RAMBlock; diff --git a/exec.c b/exec.c index dc47831..a136c13 100644 --- a/exec.c +++ b/exec.c @@ -36,6 +36,7 @@ #include "qemu-common.h" #include "tcg.h" #include "hw/hw.h" +#include "hw/qdev.h" #include "osdep.h" #include "kvm.h" #include "qemu-timer.h" @@ -2778,10 +2779,34 @@ static ram_addr_t find_ram_offset(ram_addr_t size) ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size) { - RAMBlock *new_block; + RAMBlock *new_block, *block; size = TARGET_PAGE_ALIGN(size); - new_block = qemu_malloc(sizeof(*new_block)); + new_block = qemu_mallocz(sizeof(*new_block)); + + if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { + char *id = dev->parent_bus->info->get_dev_path(dev); + if (id) { + snprintf(new_block->idstr, sizeof(new_block->idstr), "%s/", id); + qemu_free(id); + } + } + pstrcat(new_block->idstr, sizeof(new_block->idstr), name); + + 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(); + } + } + } if (mem_path) { #if defined (__linux__) && !defined(TARGET_S390X)