From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45751 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIMw7-0004ic-F3 for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:55:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIMw6-00051E-3l for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:55:07 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:50254) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIMw5-00050y-Vq for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:55:06 -0500 Received: by gyd10 with SMTP id 10so372687gyd.4 for ; Tue, 16 Nov 2010 06:55:05 -0800 (PST) Message-ID: <4CE29B44.1070202@codemonkey.ws> Date: Tue, 16 Nov 2010 08:55:00 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2 1/2] Minimal RAM API support References: <20101101150701.3927.88854.stgit@s20.home> <20101101151330.3927.32277.stgit@s20.home> In-Reply-To: <20101101151330.3927.32277.stgit@s20.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: chrisw@redhat.com, kvm@vger.kernel.org, mst@redhat.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, ddutile@redhat.com On 11/01/2010 10:14 AM, Alex Williamson wrote: > This adds a minimum chunk of Anthony's RAM API support so that we > can identify actual VM RAM versus all the other things that make > use of qemu_ram_alloc. > > Signed-off-by: Alex Williamson > --- > > Makefile.objs | 1 + > cpu-common.h | 2 + > memory.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > memory.h | 18 +++++++++ > 4 files changed, 130 insertions(+), 0 deletions(-) > create mode 100644 memory.c > create mode 100644 memory.h > > diff --git a/Makefile.objs b/Makefile.objs > index f07fb01..33fae0b 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -154,6 +154,7 @@ hw-obj-y += vl.o loader.o > hw-obj-y += virtio.o virtio-console.o > hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o > hw-obj-y += watchdog.o > +hw-obj-y += memory.o > hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o > hw-obj-$(CONFIG_ECC) += ecc.o > hw-obj-$(CONFIG_NAND) += nand.o > diff --git a/cpu-common.h b/cpu-common.h > index a543b5d..6aa2738 100644 > --- a/cpu-common.h > +++ b/cpu-common.h > @@ -23,6 +23,8 @@ > /* address in the RAM (different from a physical address) */ > typedef unsigned long ram_addr_t; > > +#include "memory.h" > + > /* memory API */ > > typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value); > diff --git a/memory.c b/memory.c > new file mode 100644 > index 0000000..2895082 > --- /dev/null > +++ b/memory.c > @@ -0,0 +1,109 @@ > +/* > + * RAM API > + * > + * Copyright Red Hat, Inc. 2010 > + * > + * Authors: > + * Alex Williamson > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see. > + */ > +#include "memory.h" > +#include "range.h" > + > +typedef struct QemuRamSlot { > + target_phys_addr_t start_addr; > + ram_addr_t size; > + ram_addr_t offset; > + QLIST_ENTRY(QemuRamSlot) next; > +} QemuRamSlot; > + > +typedef struct QemuRamSlots { > + QLIST_HEAD(slots, QemuRamSlot) slots; > +} QemuRamSlots; > No need for all of the 'Qemu' prefixes. > + > +static QemuRamSlots ram_slots = { .slots = QLIST_HEAD_INITIALIZER(ram_slots) }; > Might be nicer to just typedef the extra struct away. > +static QemuRamSlot *qemu_ram_find_slot(target_phys_addr_t start_addr, > + ram_addr_t size) > +{ > + QemuRamSlot *slot; > + > + QLIST_FOREACH(slot,&ram_slots.slots, next) { > + if (slot->start_addr == start_addr&& slot->size == size) { > + return slot; > + } > + > + if (ranges_overlap(start_addr, size, slot->start_addr, slot->size)) { > + abort(); > Should display a message before aborting. > + } > + } > + > + return NULL; > +} > + > +int qemu_ram_register(target_phys_addr_t start_addr, ram_addr_t size, > + ram_addr_t phys_offset) > +{ > + QemuRamSlot *slot; > + > + if (!size) { > + return -EINVAL; > + } > + > + assert(!qemu_ram_find_slot(start_addr, size)); > + > + slot = qemu_mallocz(sizeof(QemuRamSlot)); > + > + slot->start_addr = start_addr; > + slot->size = size; > + slot->offset = phys_offset; > + > + QLIST_INSERT_HEAD(&ram_slots.slots, slot, next); > + > + cpu_register_physical_memory(slot->start_addr, slot->size, slot->offset); > + > + return 0; > +} > + > +void qemu_ram_unregister(target_phys_addr_t start_addr, ram_addr_t size) > +{ > + QemuRamSlot *slot; > + > + if (!size) { > + return; > + } > + > + slot = qemu_ram_find_slot(start_addr, size); > + assert(slot != NULL); > + > + QLIST_REMOVE(slot, next); > + qemu_free(slot); > + cpu_register_physical_memory(start_addr, size, IO_MEM_UNASSIGNED); > + > + return; > +} > + > +int qemu_ram_for_each_slot(void *opaque, qemu_ram_for_each_slot_fn fn) > +{ > + QemuRamSlot *slot; > + > + QLIST_FOREACH(slot,&ram_slots.slots, next) { > + int ret = fn(opaque, slot->start_addr, slot->size, slot->offset); > + if (ret) { > + return ret; > + } > + } > + return 0; > +} > diff --git a/memory.h b/memory.h > new file mode 100644 > index 0000000..0c17ff9 > --- /dev/null > +++ b/memory.h > @@ -0,0 +1,18 @@ > +#ifndef QEMU_MEMORY_H > +#define QEMU_MEMORY_H > + > +#include "qemu-common.h" > +#include "cpu-common.h" > Header needs copyright and would be nice to have some comments explaining these functions. Regards, Anthony Liguori > +int qemu_ram_register(target_phys_addr_t start_addr, ram_addr_t size, > + ram_addr_t phys_offset); > + > +void qemu_ram_unregister(target_phys_addr_t start_addr, ram_addr_t size); > + > +typedef int (*qemu_ram_for_each_slot_fn)(void *opaque, > + target_phys_addr_t start_addr, > + ram_addr_t size, > + ram_addr_t phys_offset); > + > +int qemu_ram_for_each_slot(void *opaque, qemu_ram_for_each_slot_fn fn); > +#endif > > > >