Move qemu-timer.h to include/qemu/timer.h
Note: upstream still puts qemu-timer.c in the top-level
directory, so no need to move it
Change-Id: I475309d6f0040b4fd2277e52a2526825c112e91f
diff --git a/android/hw-sensors.c b/android/hw-sensors.c
index a7daea5..f0d82b1 100644
--- a/android/hw-sensors.c
+++ b/android/hw-sensors.c
@@ -19,7 +19,7 @@
#include "android/globals.h"
#include "hw/hw.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "android/sensors-port.h"
#define E(...) derror(__VA_ARGS__)
diff --git a/android/looper-qemu.c b/android/looper-qemu.c
index c5cffcd..6ea64ca 100644
--- a/android/looper-qemu.c
+++ b/android/looper-qemu.c
@@ -15,7 +15,7 @@
#include <android/looper.h>
#include <android/utils/panic.h>
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "sockets.h" /* for socket_set_nonblock() */
diff --git a/audio/audio.c b/audio/audio.c
index 7acd3d7..b9780c9 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "audio.h"
#include "monitor.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#define AUDIO_CAP "audio"
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 4925234..56d9dfc 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "audio.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define AUDIO_CAP "noaudio"
#include "audio_int.h"
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 62ba42d..746dd9d 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "audio.h"
#define AUDIO_CAP "wav"
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 72fb8ce..71b70a4 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "qemu-log.h"
#include "block_int.h"
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 503ed39..62d3324 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "block_int.h"
#include "module.h"
#include <windows.h>
diff --git a/buffered_file.c b/buffered_file.c
index a661570..2355189 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "buffered_file.h"
diff --git a/console.c b/console.c
index a94aecd..af7d7cf 100644
--- a/console.c
+++ b/console.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
diff --git a/exec.c b/exec.c
index 2fd4f55..7165d13 100644
--- a/exec.c
+++ b/exec.c
@@ -40,7 +40,7 @@
#include "qemu/osdep.h"
#include "kvm.h"
#include "hax.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#endif
diff --git a/gen-icount.h b/gen-icount.h
index 5fb3829..9a668b3 100644
--- a/gen-icount.h
+++ b/gen-icount.h
@@ -1,4 +1,4 @@
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* Helpers for instruction counting code generation. */
diff --git a/hw/apic.c b/hw/apic.c
index 7814ce6..65f4a82 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -19,7 +19,7 @@
*/
#include "hw.h"
#include "pc.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "host-utils.h"
//#define DEBUG_APIC
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index f732011..75069cd 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -11,7 +11,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "arm-misc.h"
/* 32 internal lines (16 used for system exceptions) plus 64 external
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 65ffa37..0eabd2b 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "irq.h"
#include "sysemu.h"
#include "net.h"
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 41df24c..9b403f8 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "usb.h"
#include "net.h"
#include "bt.h"
diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c
index 7e2f668..a362ed8 100644
--- a/hw/bt-l2cap.c
+++ b/hw/bt-l2cap.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "bt.h"
#define L2CAP_CID_MAX 0x100 /* Between 0x40 and 0x10000 */
diff --git a/hw/goldfish_pipe.c b/hw/goldfish_pipe.c
index 9925538..daa5118 100644
--- a/hw/goldfish_pipe.c
+++ b/hw/goldfish_pipe.c
@@ -14,7 +14,7 @@
#include "hw/goldfish_pipe.h"
#include "hw/goldfish_device.h"
#include "hw/goldfish_vmem.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define DEBUG 0
diff --git a/hw/goldfish_timer.c b/hw/goldfish_timer.c
index 567ce2e..cc8abab 100644
--- a/hw/goldfish_timer.c
+++ b/hw/goldfish_timer.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "cpu.h"
#include "arm_pic.h"
#include "goldfish_device.h"
diff --git a/hw/i8254.c b/hw/i8254.c
index a553ec2..d03e3a0 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
#include "isa.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
//#define DEBUG_PIT
diff --git a/hw/ioapic.c b/hw/ioapic.c
index b179e6e..43faf6a 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -23,7 +23,7 @@
#include "hw.h"
#include "pc.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "host-utils.h"
//#define DEBUG_IOAPIC
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 9cf880d..e1397c4 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "pc.h"
#include "isa.h"
diff --git a/hw/mips_timer.c b/hw/mips_timer.c
index 6bae90b..7250161 100644
--- a/hw/mips_timer.c
+++ b/hw/mips_timer.c
@@ -1,6 +1,6 @@
#include "hw.h"
#include "mips.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define TIMER_FREQ 100 * 1000 * 1000
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index d34b85d..b576fc0 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -27,7 +27,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "usb.h"
#include "pci.h"
#include "pxa.h"
diff --git a/qemu-timer.h b/include/qemu/timer.h
similarity index 100%
rename from qemu-timer.h
rename to include/qemu/timer.h
diff --git a/monitor.c b/monitor.c
index 09c1551..7e39dcb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -40,7 +40,7 @@
#include "audio/audio.h"
#include "disas.h"
#include "balloon.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "migration.h"
#include "kvm.h"
#include "acl.h"
diff --git a/net-android.c b/net-android.c
index 50b816c..2ee4ddb 100644
--- a/net-android.c
+++ b/net-android.c
@@ -116,7 +116,7 @@
#include "net.h"
#include "monitor.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
diff --git a/net.c b/net.c
index 219ed30..fe6f73f 100644
--- a/net.c
+++ b/net.c
@@ -114,7 +114,7 @@
#include "net.h"
#include "monitor.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
diff --git a/qemu-char.c b/qemu-char.c
index 46c15ce..e2fea82 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -27,7 +27,7 @@
#include "monitor.h"
#include "console.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "block.h"
#include "hw/usb.h"
diff --git a/qemu-timer-common.c b/qemu-timer-common.c
index 755e300..16f5e75 100644
--- a/qemu-timer-common.c
+++ b/qemu-timer-common.c
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/***********************************************************/
/* real time host monotonic timer */
diff --git a/qemu-timer.c b/qemu-timer.c
index 4e51dd3..353002c 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -53,7 +53,7 @@
#include <mmsystem.h>
#endif
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* Conversion factor from emulated instructions to virtual clock ticks. */
int icount_time_shift;
diff --git a/qemu_timers.h b/qemu_timers.h
index 9642301..6269dc8 100644
--- a/qemu_timers.h
+++ b/qemu_timers.h
@@ -2,6 +2,6 @@
#define _QEMU_TIMERS_H
#include "qemu_file.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#endif /* _QEMU_TIMERS_H */
diff --git a/savevm.c b/savevm.c
index c2602b4..04b3263 100644
--- a/savevm.c
+++ b/savevm.c
@@ -75,7 +75,7 @@
#include "net.h"
#include "monitor.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "blockdev.h"
#include "block.h"
diff --git a/shaper.c b/shaper.c
index 072bd85..da9e3bd 100644
--- a/shaper.c
+++ b/shaper.c
@@ -11,7 +11,7 @@
*/
#include "shaper.h"
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include <stdlib.h>
#define SHAPER_CLOCK rt_clock
diff --git a/softmmu_template.h b/softmmu_template.h
index 1ea4398..82505ec 100644
--- a/softmmu_template.h
+++ b/softmmu_template.h
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/sysemu.h b/sysemu.h
index 27a3e0e..cf34ee6 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -5,7 +5,7 @@
#include "qemu-common.h"
#include "qemu-option.h"
#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qdict.h"
#include "qerror.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 66529f5..ff592dd 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -47,7 +47,7 @@
#include "qemu-common.h"
#include "cache-utils.h"
#include "host-utils.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* Note: the long term plan is to reduce the dependancies on the QEMU
CPU definitions. Currently they are used for qemu_ld/st
diff --git a/telephony/sysdeps_qemu.c b/telephony/sysdeps_qemu.c
index 6aa5038..f180de8 100644
--- a/telephony/sysdeps_qemu.c
+++ b/telephony/sysdeps_qemu.c
@@ -12,7 +12,7 @@
#include "sockets.h"
#include "sysdeps.h"
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#ifdef _WIN32
#include <winsock2.h>
diff --git a/translate-all.c b/translate-all.c
index c89ec8a..e1013aa 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -29,7 +29,7 @@
#include "exec-all.h"
#include "disas.h"
#include "tcg.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* code generation context */
TCGContext tcg_ctx;
diff --git a/usb-dummy-android.c b/usb-dummy-android.c
index ed03219..903e398 100755
--- a/usb-dummy-android.c
+++ b/usb-dummy-android.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "monitor.h"
#include "hw/usb.h"
diff --git a/usb-linux.c b/usb-linux.c
index 49f5746..a6e5fe4 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -31,7 +31,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "monitor.h"
#include <dirent.h>
diff --git a/vl-android-ui.c b/vl-android-ui.c
index 0b63d4a..e36dbb5 100644
--- a/vl-android-ui.c
+++ b/vl-android-ui.c
@@ -39,7 +39,7 @@
#include "qemu-common.h"
#include "net.h"
#include "console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "block.h"
#include "sockets.h"
diff --git a/vl-android.c b/vl-android.c
index 0129935..4258a49 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -41,7 +41,7 @@
#include "console.h"
#include "sysemu.h"
#include "gdbstub.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "blockdev.h"
#include "audio/audio.h"
@@ -192,7 +192,7 @@
#include "console.h"
#include "sysemu.h"
#include "gdbstub.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "cache-utils.h"
#include "block.h"
diff --git a/vl.c b/vl.c
index 3102679..d7f7138 100644
--- a/vl.c
+++ b/vl.c
@@ -150,7 +150,7 @@
#include "console.h"
#include "sysemu.h"
#include "gdbstub.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "cache-utils.h"
#include "block.h"
diff --git a/vnc-android.c b/vnc-android.c
index 9b259b2..82cc7ab 100644
--- a/vnc-android.c
+++ b/vnc-android.c
@@ -27,7 +27,7 @@
#include "vnc.h"
#include "sysemu.h"
#include "qemu_socket.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "acl.h"
#define VNC_REFRESH_INTERVAL (1000 / 30)
diff --git a/vnc.c b/vnc.c
index cc3ecaa..67ab985 100644
--- a/vnc.c
+++ b/vnc.c
@@ -27,7 +27,7 @@
#include "vnc.h"
#include "sysemu.h"
#include "qemu_socket.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "acl.h"
#define VNC_REFRESH_INTERVAL (1000 / 30)