source: trunk/packages/xen-common/xen-common/tools/ioemu/patches/qemu-timer @ 34

Last change on this file since 34 was 34, checked in by hartmans, 17 years ago

Add xen and xen-common

File size: 1.2 KB
Line 
1Index: ioemu/vl.c
2===================================================================
3--- ioemu.orig/vl.c     2007-05-03 10:07:52.000000000 +0100
4+++ ioemu/vl.c  2007-05-03 10:07:52.000000000 +0100
5@@ -825,6 +825,16 @@
6     }
7 }
8 
9+#ifdef CONFIG_DM
10+static void timer_save(QEMUFile *f, void *opaque)
11+{
12+}
13+
14+static int timer_load(QEMUFile *f, void *opaque, int version_id)
15+{
16+    return 0;
17+}
18+#else  /* !CONFIG_DM */
19 static void timer_save(QEMUFile *f, void *opaque)
20 {
21     if (cpu_ticks_enabled) {
22@@ -941,6 +951,8 @@
23 
24 #endif /* !defined(_WIN32) */
25 
26+#endif /* !CONFIG_DM */
27+
28 static void init_timer_alarm(void)
29 {
30 #ifdef _WIN32
31@@ -972,12 +984,15 @@
32     pit_min_timer_count = ((uint64_t)10000 * PIT_FREQ) / 1000000;
33 #else
34     {
35+#ifndef CONFIG_DM
36         struct sigaction act;
37         struct itimerval itv;
38+#endif
39         
40         /* get times() syscall frequency */
41         timer_freq = sysconf(_SC_CLK_TCK);
42         
43+#ifndef CONFIG_DM
44         /* timer signal */
45         sigfillset(&act.sa_mask);
46        act.sa_flags = 0;
47@@ -1023,6 +1038,7 @@
48             pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec *
49                                    PIT_FREQ) / 1000000;
50         }
51+#endif /* CONFIG_DM */
52     }
53 #endif
54 }
Note: See TracBrowser for help on using the repository browser.