← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/dma/sun4m_iommu.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/sun4m_iommu.c
24
24
 
25
25
#include "hw/sparc/sun4m.h"
26
26
#include "hw/sysbus.h"
 
27
#include "exec/address-spaces.h"
27
28
#include "trace.h"
28
29
 
29
30
/*
262
263
    iopte = s->regs[IOMMU_BASE] << 4;
263
264
    addr &= ~s->iostart;
264
265
    iopte += (addr >> (IOMMU_PAGE_SHIFT - 2)) & ~3;
265
 
    ret = ldl_be_phys(iopte);
 
266
    ret = ldl_be_phys(&address_space_memory, iopte);
266
267
    trace_sun4m_iommu_page_get_flags(pa, iopte, ret);
267
268
    return ret;
268
269
}
361
362
}
362
363
 
363
364
static Property iommu_properties[] = {
364
 
    DEFINE_PROP_HEX32("version", IOMMUState, version, 0),
 
365
    DEFINE_PROP_UINT32("version", IOMMUState, version, 0),
365
366
    DEFINE_PROP_END_OF_LIST(),
366
367
};
367
368