From patchwork Sat Aug 4 12:05:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhang X-Patchwork-Id: 175087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B12822C008E for ; Sat, 4 Aug 2012 22:07:46 +1000 (EST) Received: from localhost ([::1]:46580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd8y-0000rY-P7 for incoming@patchwork.ozlabs.org; Sat, 04 Aug 2012 08:07:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd8f-00006c-88 for qemu-devel@nongnu.org; Sat, 04 Aug 2012 08:07:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sxd8e-0003at-1J for qemu-devel@nongnu.org; Sat, 04 Aug 2012 08:07:25 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:35131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sxd8d-0002vX-SY; Sat, 04 Aug 2012 08:07:23 -0400 Received: by mail-ob0-f173.google.com with SMTP id ta14so2476455obb.4 for ; Sat, 04 Aug 2012 05:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=oOEdAsn3aRYbuWQj8Rwynd+YnojRCPnQxALkEDqvtTk=; b=ZoRa0IW6wJLfnTCkrsAIY1fkZoiYWOQmDhf39E4LFdrtSHSZJmOSTeIB8aBUubcdhO 03HnsxK24jvGYqsvmgEW4gsnQMUqutZUfv6cYR3RH53qmW9c64olN6I6UlzVdxJhTTWk x4BUuOrDhGbSVk7P+K4BDd+x/akdtacm9bOxmNfO314M9fdbjU5AaPlNP2b73DH5ty4u pRCKzy9SwQ56YjWWsIu0WpsfXY3IRHyFa6vg6JUoHd/LA1XcsCEiJrCyvxgYkWfvYmsk VHgFeSeMLiEhnjudn5gG+wzZiFXQO3+G7R4TpCjZ7+UmZNDByu/5RjeSqazjbOepssOX P9SQ== Received: by 10.182.212.98 with SMTP id nj2mr10407828obc.18.1344082043467; Sat, 04 Aug 2012 05:07:23 -0700 (PDT) Received: from localhost.localdomain ([175.25.242.10]) by mx.google.com with ESMTPS id th3sm12393434obb.6.2012.08.04.05.07.18 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Aug 2012 05:07:22 -0700 (PDT) From: Li Zhang To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Sat, 4 Aug 2012 20:05:56 +0800 Message-Id: <1344081957-4717-5-git-send-email-zhlcindy@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1344081957-4717-1-git-send-email-zhlcindy@linux.vnet.ibm.com> References: <1344081957-4717-1-git-send-email-zhlcindy@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: aliguori@us.ibm.com, agraf@suse.de, Li Zhang , afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [Qemu-ppc][PATCH v6 4/5] Cleanup pc.h on other platforms 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 The declarations of pci_vga_init() and pci_cirrus_vga_init() are moved to vga-pci.h to be called by all the platforms. So it's necessary to cleanup pc.h on the platforms other than PC which include the file and add vga-pci.h on all the plaforms to call vga related functions. This patch is to cleanup pc.h and add vga-pci.h. Signed-off-by: Li Zhang --- hw/alpha_pci.c | 1 + hw/mips_malta.c | 1 + hw/pc.c | 1 + hw/ppc_newworld.c | 2 +- hw/ppc_oldworld.c | 2 +- hw/ppc_prep.c | 1 + hw/sun4u.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c index 6735577..ea546f8 100644 --- a/hw/alpha_pci.c +++ b/hw/alpha_pci.c @@ -11,6 +11,7 @@ #include "qemu-log.h" #include "sysemu.h" #include "vmware_vga.h" +#include "vga-pci.h" /* PCI IO reads/writes, to byte-word addressable memory. */ diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 351c88e..ad23f26 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -48,6 +48,7 @@ #include "blockdev.h" #include "exec-memory.h" #include "sysbus.h" /* SysBusDevice */ +#include "vga-pci.h" //#define DEBUG_BOARD_INIT diff --git a/hw/pc.c b/hw/pc.c index bd193f3..67967db 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -49,6 +49,7 @@ #include "memory.h" #include "exec-memory.h" #include "arch_init.h" +#include "vga-pci.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 1a324eb..c9226db 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -52,7 +52,6 @@ #include "adb.h" #include "mac_dbdma.h" #include "nvram.h" -#include "pc.h" #include "pci.h" #include "net.h" #include "sysemu.h" @@ -68,6 +67,7 @@ #include "hw/usb.h" #include "blockdev.h" #include "exec-memory.h" +#include "vga-pci.h" #define MAX_IDE_BUS 2 #define CFG_ADDR 0xf0000510 diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index da05705..73d71a8 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -29,7 +29,6 @@ #include "adb.h" #include "mac_dbdma.h" #include "nvram.h" -#include "pc.h" #include "sysemu.h" #include "net.h" #include "isa.h" @@ -44,6 +43,7 @@ #include "kvm_ppc.h" #include "blockdev.h" #include "exec-memory.h" +#include "vga-pci.h" #define MAX_IDE_BUS 2 #define CFG_ADDR 0xf0000510 diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index dc294ae..ecdf633 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -39,6 +39,7 @@ #include "blockdev.h" #include "arch_init.h" #include "exec-memory.h" +#include "vga-pci.h" //#define HARD_DEBUG_PPC_IO //#define DEBUG_PPC_IO diff --git a/hw/sun4u.c b/hw/sun4u.c index 137a7c6..07cd042 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -39,6 +39,7 @@ #include "elf.h" #include "blockdev.h" #include "exec-memory.h" +#include "vga-pci.h" //#define DEBUG_IRQ //#define DEBUG_EBUS