~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to target-xtensa/xtensa-semi.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
 
153
153
void HELPER(simcall)(CPUXtensaState *env)
154
154
{
 
155
    CPUState *cs = CPU(xtensa_env_get_cpu(env));
155
156
    uint32_t *regs = env->regs;
156
157
 
157
158
    switch (regs[2]) {
169
170
            uint32_t len = regs[5];
170
171
 
171
172
            while (len > 0) {
172
 
                hwaddr paddr =
173
 
                    cpu_get_phys_page_debug(env, vaddr);
 
173
                hwaddr paddr = cpu_get_phys_page_debug(cs, vaddr);
174
174
                uint32_t page_left =
175
175
                    TARGET_PAGE_SIZE - (vaddr & (TARGET_PAGE_SIZE - 1));
176
176
                uint32_t io_sz = page_left < len ? page_left : len;
204
204
            int i;
205
205
 
206
206
            for (i = 0; i < ARRAY_SIZE(name); ++i) {
207
 
                rc = cpu_memory_rw_debug(
208
 
                        env, regs[3] + i, (uint8_t *)name + i, 1, 0);
 
207
                rc = cpu_memory_rw_debug(cs, regs[3] + i,
 
208
                                         (uint8_t *)name + i, 1, 0);
209
209
                if (rc != 0 || name[i] == 0) {
210
210
                    break;
211
211
                }
249
249
            FD_SET(fd, &fdset);
250
250
 
251
251
            if (target_tv) {
252
 
                cpu_memory_rw_debug(env, target_tv,
 
252
                cpu_memory_rw_debug(cs, target_tv,
253
253
                        (uint8_t *)target_tvv, sizeof(target_tvv), 0);
254
254
                tv.tv_sec = (int32_t)tswap32(target_tvv[0]);
255
255
                tv.tv_usec = (int32_t)tswap32(target_tvv[1]);
284
284
            };
285
285
 
286
286
            argv.argptr[0] = tswap32(regs[3] + offsetof(struct Argv, text));
287
 
            cpu_memory_rw_debug(
288
 
                    env, regs[3], (uint8_t *)&argv, sizeof(argv), 1);
 
287
            cpu_memory_rw_debug(cs,
 
288
                                regs[3], (uint8_t *)&argv, sizeof(argv), 1);
289
289
        }
290
290
        break;
291
291