From patchwork Wed Aug 24 13:40:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 111353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49D20B6F18 for ; Wed, 24 Aug 2011 23:41:28 +1000 (EST) Received: from localhost ([::1]:48731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwDht-0005s9-Fg for incoming@patchwork.ozlabs.org; Wed, 24 Aug 2011 09:41:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwDha-0005hy-1P for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwDhY-0007K1-C3 for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwDhY-0007JY-2I for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:04 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7ODf3jS019780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Aug 2011 09:41:03 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7ODf2HN023790 for ; Wed, 24 Aug 2011 09:41:03 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id F07C6250B54; Wed, 24 Aug 2011 16:41:00 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Wed, 24 Aug 2011 16:40:45 +0300 Message-Id: <1314193259-27092-9-git-send-email-avi@redhat.com> In-Reply-To: <1314193259-27092-1-git-send-email-avi@redhat.com> References: <1314193259-27092-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 08/22] sysbus: add sysbus_add_memory_overlap() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Avi Kivity --- hw/sysbus.c | 6 ++++++ hw/sysbus.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index f5f0ed2..4efb91a 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -263,6 +263,12 @@ void sysbus_add_memory(SysBusDevice *dev, target_phys_addr_t addr, memory_region_add_subregion(get_system_memory(), addr, mem); } +void sysbus_add_memory_overlap(SysBusDevice *dev, target_phys_addr_t addr, + MemoryRegion *mem, unsigned priority) +{ + memory_region_add_subregion(get_system_memory(), addr, mem); +} + void sysbus_del_memory(SysBusDevice *dev, MemoryRegion *mem) { memory_region_del_subregion(get_system_memory(), mem); diff --git a/hw/sysbus.h b/hw/sysbus.h index e4d56cf..b3e1f99 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -59,6 +59,8 @@ void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq); void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr); void sysbus_add_memory(SysBusDevice *dev, target_phys_addr_t addr, MemoryRegion *mem); +void sysbus_add_memory_overlap(SysBusDevice *dev, target_phys_addr_t addr, + MemoryRegion *mem, unsigned priority); void sysbus_del_memory(SysBusDevice *dev, MemoryRegion *mem); void sysbus_add_io(SysBusDevice *dev, target_phys_addr_t addr, MemoryRegion *mem);