← Back to branch summary

~ubuntu-branches/debian/jessie/qemu/jessie

« back to all changes in this revision

Viewing changes to hw/etraxfs_timer.c

  • Committer: Package Import Robot
  • Author(s): Vagrant Cascadian
  • Date: 2011-10-03 12:29:18 UTC
  • mfrom: (1.2.13) (10.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20111003122918-zc4kv6epchrbgdta
Tags: 0.15.0+dfsg-1
* New upstream version.
* Install new qemu-system, qemu-user and qemu-user-static variants: 
  lm32, microblazeel, s390x, unicore32
* Patch from upstream to set QEMU_INCLUDES before QEMU_CFLAGS.
* Update debian/watch to check http://qemu.org/download.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/etraxfs_timer.c
85
85
        r = ptimer_get_count(t->ptimer_t1);
86
86
        break;
87
87
    case R_TIME:
88
 
        r = qemu_get_clock(vm_clock) / 10;
 
88
        r = qemu_get_clock_ns(vm_clock) / 10;
89
89
        break;
90
90
    case RW_INTR_MASK:
91
91
        r = t->rw_intr_mask;