From patchwork Thu Apr 1 17:57:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 49229 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 85AD2B7D07 for ; Fri, 2 Apr 2010 05:01:41 +1100 (EST) Received: from localhost ([127.0.0.1]:55303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxOi2-0004al-O0 for incoming@patchwork.ozlabs.org; Thu, 01 Apr 2010 14:01:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxOe7-0003r7-MZ for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:35 -0400 Received: from [140.186.70.92] (port=59641 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxOe6-0003qS-18 for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxOe3-0004zA-Vj for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:33 -0400 Received: from mail-pz0-f171.google.com ([209.85.222.171]:57291) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxOe3-0004yE-6y for qemu-devel@nongnu.org; Thu, 01 Apr 2010 13:57:31 -0400 Received: by mail-pz0-f171.google.com with SMTP id 1so1115015pzk.18 for ; Thu, 01 Apr 2010 10:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=32LUQP+o4PcYZe2r83wSOBe4ojBlTZYew14ePC+5Y1c=; b=rlyBbr9oLk4mET0kcvQjCOyu8jYLGMLemVeknqjZhrQlBvh8mbHUJlQZl/NxwHZ/7O N91XNEGgkRkiayKGw+3GNHoLofVQqWSWu7652S5UQMIsmyOcJvzYTNvHOEOW/ad92bjr iOuV08kCLo7w5t6VSiIN1C3z35RXN5uQVnxyU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=f0drXb+Z+O7PgLBoyBHY0TFOTqSDrCLwuuitGYVg1g8G4eDhQ5IcA4FuApIMmjdp25 LwvTQF3EZQtNLx08m/iNKpF0+HAQi5CmebOhdPCV8idRq7yoGtbyNqZ5anXtjjyDPSnG gQsqc4chzAK0Qgu6NqKDi78YnXgQyIdEv7i74= Received: by 10.143.170.10 with SMTP id x10mr436667wfo.189.1270144649447; Thu, 01 Apr 2010 10:57:29 -0700 (PDT) Received: from localhost.localdomain (93-34-197-68.ip51.fastwebnet.it [93.34.197.68]) by mx.google.com with ESMTPS id c21sm8510833ibr.22.2010.04.01.10.57.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Apr 2010 10:57:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 1 Apr 2010 19:57:09 +0200 Message-Id: <1270144632-25063-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1270144632-25063-1-git-send-email-pbonzini@redhat.com> References: <1270144632-25063-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 2/5] move two variable declarations out of vl.c 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 Signed-off-by: Paolo Bonzini --- hw/i8259.c | 1 + hw/isa-bus.c | 1 + vl.c | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i8259.c b/hw/i8259.c index 3de22e3..37ef04e 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -68,6 +68,7 @@ static int irq_level[16]; #ifdef DEBUG_IRQ_COUNT static uint64_t irq_count[16]; #endif +PicState2 *isa_pic; /* set irq level. If an edge is detected, then the IRR is set to 1 */ static inline void pic_set_irq1(PicState *s, int irq, int level) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4d489d2..4e306de 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -28,6 +28,7 @@ struct ISABus { uint32_t assigned; }; static ISABus *isabus; +target_phys_addr_t isa_mem_base = 0; static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent); diff --git a/vl.c b/vl.c index 9ce6e4c..8828beb 100644 --- a/vl.c +++ b/vl.c @@ -292,10 +292,6 @@ static int default_driver_check(QemuOpts *opts, void *opaque) } /***********************************************************/ -/* x86 ISA bus support */ - -target_phys_addr_t isa_mem_base = 0; -PicState2 *isa_pic; static void set_proc_name(const char *s) {