From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwzLi-0003UG-Pv for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:54 -0400 Received: from [140.186.70.92] (port=52149 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwzLa-0003Kd-Id for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwzL2-0007Wg-K5 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:14 -0400 Received: from mail-bw0-f218.google.com ([209.85.218.218]:35916) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwzL2-0007Vo-F5 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 10:56:12 -0400 Received: by mail-bw0-f218.google.com with SMTP id 10so233589bwz.2 for ; Wed, 31 Mar 2010 07:56:12 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 31 Mar 2010 16:56:02 +0200 Message-Id: <1270047363-12627-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> References: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] move two variable declarations out of vl.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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) { -- 1.6.6.1