From patchwork Fri Oct 29 16:39:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 69613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CD39B70D4 for ; Sat, 30 Oct 2010 04:12:32 +1100 (EST) Received: from [127.0.0.1] (port=42872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBs4N-0007EG-SV for incoming@patchwork.ozlabs.org; Fri, 29 Oct 2010 12:44:47 -0400 Received: from [140.186.70.92] (port=50908 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBrzf-0005df-32 for qemu-devel@nongnu.org; Fri, 29 Oct 2010 12:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBrys-0002IC-Eq for qemu-devel@nongnu.org; Fri, 29 Oct 2010 12:39:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBrys-0002I5-6H for qemu-devel@nongnu.org; Fri, 29 Oct 2010 12:39:06 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9TGd4jC010895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Oct 2010 12:39:04 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9TGd3Ea013652; Fri, 29 Oct 2010 12:39:03 -0400 From: Alex Williamson To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Fri, 29 Oct 2010 10:39:03 -0600 Message-ID: <20101029163842.26094.32206.stgit@s20.home> In-Reply-To: <20101029162918.26094.69379.stgit@s20.home> References: <20101029162918.26094.69379.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: chrisw@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, kvm@vger.kernel.org, mst@redhat.com Subject: [Qemu-devel] [PATCH 1/2] Minimal RAM API support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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.target | 1 + cpu-common.h | 2 + memory.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ memory.h | 23 +++++++++++++++ 4 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 memory.c create mode 100644 memory.h diff --git a/Makefile.target b/Makefile.target index c48cbcc..e4e2eb4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -175,6 +175,7 @@ obj-$(CONFIG_VIRTFS) += virtio-9p.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-y += memory.o LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) 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..86947fb --- /dev/null +++ b/memory.c @@ -0,0 +1,82 @@ +/* + * 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" + +QemuRamSlots ram_slots = { .slots = QLIST_HEAD_INITIALIZER(ram_slots) }; + +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(); + } + } + + return NULL; +} + +void qemu_ram_register(target_phys_addr_t start_addr, ram_addr_t size, + ram_addr_t phys_offset) +{ + QemuRamSlot *slot; + + if (!size) { + return; + } + + 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); +} + +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); + cpu_register_physical_memory(start_addr, size, IO_MEM_UNASSIGNED); + + return; +} diff --git a/memory.h b/memory.h new file mode 100644 index 0000000..91e552e --- /dev/null +++ b/memory.h @@ -0,0 +1,23 @@ +#ifndef QEMU_MEMORY_H +#define QEMU_MEMORY_H + +#include "qemu-common.h" +#include "cpu-common.h" + +typedef struct QemuRamSlot { + target_phys_addr_t start_addr; + ram_addr_t size; + ram_addr_t offset; + void *host; + QLIST_ENTRY(QemuRamSlot) next; +} QemuRamSlot; + +typedef struct QemuRamSlots { + QLIST_HEAD(slots, QemuRamSlot) slots; +} QemuRamSlots; +extern QemuRamSlots ram_slots; + +void 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); +#endif