diff options
author | Richard Purdie <richard@openedhand.com> | 2007-12-03 23:18:02 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-12-03 23:18:02 +0000 |
commit | 11f9f2412eae749d28c99f8bf36f8aee7deb36b4 (patch) | |
tree | 35edbce67c753112dd4aff9b7f93fb60f5ba4394 /meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch | |
parent | c3c2ee2f424a0041ad2c27d42853a05e683b401f (diff) | |
download | poky-11f9f2412eae749d28c99f8bf36f8aee7deb36b4.tar.gz |
qemu: Add 20071121 version, default preference -1 for now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3303 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch')
-rw-r--r-- | meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch b/meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch new file mode 100644 index 0000000000..31c9da491d --- /dev/null +++ b/meta/packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | #DPATCHLEVEL=1 | ||
2 | --- | ||
3 | # vl.c | 5 ++++- | ||
4 | # 1 file changed, 4 insertions(+), 1 deletion(-) | ||
5 | # | ||
6 | Index: qemu/vl.c | ||
7 | =================================================================== | ||
8 | --- qemu.orig/vl.c 2007-12-03 15:44:35.000000000 +0000 | ||
9 | +++ qemu/vl.c 2007-12-03 15:51:03.000000000 +0000 | ||
10 | @@ -1289,12 +1289,15 @@ static void hpet_stop_timer(struct qemu_ | ||
11 | |||
12 | static int rtc_start_timer(struct qemu_alarm_timer *t) | ||
13 | { | ||
14 | + unsigned long current_rtc_freq = 0; | ||
15 | int rtc_fd; | ||
16 | |||
17 | TFR(rtc_fd = open("/dev/rtc", O_RDONLY)); | ||
18 | if (rtc_fd < 0) | ||
19 | return -1; | ||
20 | - if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { | ||
21 | + ioctl(rtc_fd, RTC_IRQP_READ, ¤t_rtc_freq); | ||
22 | + if (current_rtc_freq != RTC_FREQ && | ||
23 | + ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { | ||
24 | fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n" | ||
25 | "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n" | ||
26 | "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n"); | ||