From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: [PATCH 2/3 - qemu-kvm stable-1.0] Allow i8259 to build without i8254 Date: Thu, 24 May 2012 12:15:10 +1000 Message-ID: <1337825710.3038.51.camel@pasglop> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from gate.crashing.org ([63.228.1.57]:34374 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755052Ab2EXCPO (ORCPT ); Wed, 23 May 2012 22:15:14 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This allows the i8259 emulation to be compiled without the i8254 emulation. Currently the i8259 emulation code references some variables defined in i8254.c for the "time-drift fix". This moves the definitions from i8254.c to i8259.c so that i8259.c becomes independent of i8254.c. Signed-off-by: Benjamin Herrenschmidt --- This appears to be unnecessary on qemu-kvm master or the main qemu hw/i8254.c | 3 ++- hw/i8259.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i8254.c b/hw/i8254.c index 019c7b8..878a47b 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -348,7 +348,8 @@ static uint32_t pit_ioport_read(void *opaque, uint32_t addr) } /* global counters for time-drift fix */ -int64_t timer_acks=0, timer_interrupts=0, timer_ints_to_push=0; +extern int64_t timer_acks, timer_ints_to_push; +int64_t timer_interrupts=0; extern int time_drift_fix; diff --git a/hw/i8259.c b/hw/i8259.c index c5841c0..f33a25d 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -211,7 +211,7 @@ static void pic_intack(PicState *s, int irq) } extern int time_drift_fix; -extern int64_t timer_acks, timer_ints_to_push; +int64_t timer_acks=0, timer_ints_to_push=0; int pic_read_irq(PicState *s) {