← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/dma/pl080.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/dma/pl080.c
8
8
 */
9
9
 
10
10
#include "hw/sysbus.h"
 
11
#include "exec/address-spaces.h"
11
12
 
12
13
#define PL080_MAX_CHANNELS 8
13
14
#define PL080_CONF_E    0x1
204
205
            if (size == 0) {
205
206
                /* Transfer complete.  */
206
207
                if (ch->lli) {
207
 
                    ch->src = ldl_le_phys(ch->lli);
208
 
                    ch->dest = ldl_le_phys(ch->lli + 4);
209
 
                    ch->ctrl = ldl_le_phys(ch->lli + 12);
210
 
                    ch->lli = ldl_le_phys(ch->lli + 8);
 
208
                    ch->src = ldl_le_phys(&address_space_memory, ch->lli);
 
209
                    ch->dest = ldl_le_phys(&address_space_memory, ch->lli + 4);
 
210
                    ch->ctrl = ldl_le_phys(&address_space_memory, ch->lli + 12);
 
211
                    ch->lli = ldl_le_phys(&address_space_memory, ch->lli + 8);
211
212
                } else {
212
213
                    ch->conf &= ~PL080_CCONF_E;
213
214
                }
381
382
{
382
383
    DeviceClass *dc = DEVICE_CLASS(oc);
383
384
 
384
 
    dc->no_user = 1;
385
385
    dc->vmsd = &vmstate_pl080;
386
386
}
387
387