From patchwork Sun Oct 2 16:42:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 117336 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 8632BB6F67 for ; Mon, 3 Oct 2011 03:44:34 +1100 (EST) Received: from localhost ([::1]:57473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAP9T-0006NL-PV for incoming@patchwork.ozlabs.org; Sun, 02 Oct 2011 12:44:31 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAP9M-0006MT-JA for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAP9L-0005Fr-Du for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:24 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:42808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAP9L-0005Fe-2t for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:44:23 -0400 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate03.web.de (Postfix) with ESMTP id 094A319D3EB6F; Sun, 2 Oct 2011 18:42:46 +0200 (CEST) Received: from [92.77.61.80] (helo=mchn199C.mchp.siemens.de) by smtp03.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1RAP7l-0005ec-00; Sun, 02 Oct 2011 18:42:45 +0200 Message-ID: <4E889484.4040603@web.de> Date: Sun, 02 Oct 2011 18:42:44 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity References: <4E81C8EF.3020900@siemens.com> <4E88704A.2080907@redhat.com> In-Reply-To: <4E88704A.2080907@redhat.com> X-Enigmail-Version: 1.3.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/9saAIG2g1RJ1uuETKQUAxGrv46sl9Y25X+1gj 5rWXT1J4ERXxqBQaljQ8KhuwG41BB7X9x8CsY4g8yyU2j1E8nS sISqu+BQ4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] memory: Push typedefs into qemu-common 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 From: Jan Kiszka There is a circular dependency between memory.h and ioport.h /wrt type definitions now. Resolve it by pushing MemoryRegion and MemoryRegionPortio typedefs into qemu-common.h. Signed-off-by: Jan Kiszka --- ioport.h | 3 --- memory.h | 2 -- qemu-common.h | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ioport.h b/ioport.h index 968cc23..f1bd663 100644 --- a/ioport.h +++ b/ioport.h @@ -52,9 +52,6 @@ uint8_t cpu_inb(pio_addr_t addr); uint16_t cpu_inw(pio_addr_t addr); uint32_t cpu_inl(pio_addr_t addr); -typedef struct MemoryRegion MemoryRegion; -typedef struct MemoryRegionPortio MemoryRegionPortio; - typedef struct PortioList { const MemoryRegionPortio *ports; MemoryRegion *address_space; diff --git a/memory.h b/memory.h index d77c1f1..275404a 100644 --- a/memory.h +++ b/memory.h @@ -26,8 +26,6 @@ #include "ioport.h" typedef struct MemoryRegionOps MemoryRegionOps; -typedef struct MemoryRegion MemoryRegion; -typedef struct MemoryRegionPortio MemoryRegionPortio; typedef struct MemoryRegionMmio MemoryRegionMmio; /* Must match *_DIRTY_FLAGS in cpu-all.h. To be replaced with dynamic diff --git a/qemu-common.h b/qemu-common.h index 5e87bdf..8cb26f6 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -264,6 +264,8 @@ typedef struct SSIBus SSIBus; typedef struct EventNotifier EventNotifier; typedef struct VirtIODevice VirtIODevice; typedef struct QEMUSGList QEMUSGList; +typedef struct MemoryRegion MemoryRegion; +typedef struct MemoryRegionPortio MemoryRegionPortio; typedef uint64_t pcibus_t;