← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu/vivid

« back to all changes in this revision

Viewing changes to hw/timer/grlib_gptimer.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/timer/grlib_gptimer.c
106
106
    /* ptimer is triggered when the counter reach 0 but GPTimer is triggered at
107
107
       underflow. Set count + 1 to simulate the GPTimer behavior. */
108
108
 
109
 
    trace_grlib_gptimer_enable(timer->id, timer->counter + 1);
 
109
    trace_grlib_gptimer_enable(timer->id, timer->counter);
110
110
 
111
 
    ptimer_set_count(timer->ptimer, timer->counter + 1);
 
111
    ptimer_set_count(timer->ptimer, (uint64_t)timer->counter + 1);
112
112
    ptimer_run(timer->ptimer, 1);
113
113
}
114
114
 
328
328
 
329
329
    unit->scaler = 0;
330
330
    unit->reload = 0;
331
 
    unit->config = 0;
332
331
 
333
332
    unit->config  = unit->nr_timers;
334
333
    unit->config |= unit->irq_line << 3;