[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h |
Date: |
Mon, 24 May 2010 17:18:17 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hpet_emul.h | 2 ++
hw/pc.h | 3 ---
monitor.c | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
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"
--
1.6.6.1
- [Qemu-devel] [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 1/6] Create again config-device.h and config.devices.h, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h,
Juan Quintela <=
- [Qemu-devel] [PATCH 3/6] Move no_hpet test to inside hpet_init(), Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 6/6] Create CONFIG_HPET, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 4/6] Make hpet_in_legacy_mode() return 0 for !TARGET_I386, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 5/6] make hpet_in_legacy_mode() return a bool, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Jan Kiszka, 2010/05/24