Patchwork [2/6] Move no_hpet declaration to hpet_emul.h

login
register
mail settings
Submitter Juan Quintela
Date May 24, 2010, 3:18 p.m.
Message ID <6ca8004ac4217d108d0f500c175dad3d0648e8cb.1274714215.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/53431/
State New
Headers show

Comments

Juan Quintela - May 24, 2010, 3:18 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/hpet_emul.h |    2 ++
 hw/pc.h        |    3 ---
 monitor.c      |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h
index cfd95b4..7e9b610 100644
--- a/hw/hpet_emul.h
+++ b/hw/hpet_emul.h
@@ -13,6 +13,8 @@ 
 #ifndef QEMU_HPET_EMUL_H
 #define QEMU_HPET_EMUL_H

+extern int no_hpet;
+
 #define HPET_BASE               0xfed00000
 #define HPET_CLK_PERIOD         10000000ULL /* 10000000 femtoseconds == 10ns*/

diff --git a/hw/pc.h b/hw/pc.h
index 73cccef..5ee0aad 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -124,9 +124,6 @@  i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
                        int kvm_enabled);
 void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);

-/* hpet.c */
-extern int no_hpet;
-
 /* pcspk.c */
 void pcspk_init(PITState *);
 int pcspk_audio_init(qemu_irq *pic);
diff --git a/monitor.c b/monitor.c
index a1ebc5d..5975f40 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,6 +30,7 @@ 
 #include "hw/pci.h"
 #include "hw/watchdog.h"
 #include "hw/loader.h"
+#include "hw/hpet_emul.h"
 #include "gdbstub.h"
 #include "net.h"
 #include "net/slirp.h"