diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-02 11:14:28 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-02 11:14:28 +0000 |
commit | 7eed7c05fdb54e30976eb6599637786e2260f432 (patch) | |
tree | a9b652c4ea7c353f93533a069a0f56f53b6bf59b /meta/packages/qemu/qemu-0.9.0+cvs20071230/04_do_not_print_rtc_freq_if_ok.patch | |
parent | 8ff44c1f07bd9e0d9a98b1b68e4739dbb71f4f3b (diff) | |
download | openembedded-core-7eed7c05fdb54e30976eb6599637786e2260f432.tar.gz openembedded-core-7eed7c05fdb54e30976eb6599637786e2260f432.tar.bz2 openembedded-core-7eed7c05fdb54e30976eb6599637786e2260f432.tar.xz openembedded-core-7eed7c05fdb54e30976eb6599637786e2260f432.zip |
qemu: upgrade 20071121 -> 20071230 to fix problems with target mmap'd regions overlapping with the host system libraries
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3397 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/qemu/qemu-0.9.0+cvs20071230/04_do_not_print_rtc_freq_if_ok.patch')
-rw-r--r-- | meta/packages/qemu/qemu-0.9.0+cvs20071230/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+cvs20071230/04_do_not_print_rtc_freq_if_ok.patch b/meta/packages/qemu/qemu-0.9.0+cvs20071230/04_do_not_print_rtc_freq_if_ok.patch new file mode 100644 index 000000000..31c9da491 --- /dev/null +++ b/meta/packages/qemu/qemu-0.9.0+cvs20071230/04_do_not_print_rtc_freq_if_ok.patch @@ -0,0 +1,26 @@ +#DPATCHLEVEL=1 +--- +# vl.c | 5 ++++- +# 1 file changed, 4 insertions(+), 1 deletion(-) +# +Index: qemu/vl.c +=================================================================== +--- qemu.orig/vl.c 2007-12-03 15:44:35.000000000 +0000 ++++ qemu/vl.c 2007-12-03 15:51:03.000000000 +0000 +@@ -1289,12 +1289,15 @@ static void hpet_stop_timer(struct qemu_ + + static int rtc_start_timer(struct qemu_alarm_timer *t) + { ++ unsigned long current_rtc_freq = 0; + int rtc_fd; + + TFR(rtc_fd = open("/dev/rtc", O_RDONLY)); + if (rtc_fd < 0) + return -1; +- if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { ++ ioctl(rtc_fd, RTC_IRQP_READ, ¤t_rtc_freq); ++ if (current_rtc_freq != RTC_FREQ && ++ ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { + fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n" + "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n" + "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n"); |