← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/intc/sh_intc.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
http://bugs.debian.org/709241
* 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:
hw/intc/sh_intc.c
42
42
        pending_changed = 1;
43
43
 
44
44
    if (pending_changed) {
45
 
        CPUState *cpu = CPU(sh_env_get_cpu(first_cpu));
46
45
        if (source->pending) {
47
46
            source->parent->pending++;
48
47
            if (source->parent->pending == 1) {
49
 
                cpu_interrupt(cpu, CPU_INTERRUPT_HARD);
 
48
                cpu_interrupt(first_cpu, CPU_INTERRUPT_HARD);
50
49
            }
51
50
        } else {
52
51
            source->parent->pending--;
53
52
            if (source->parent->pending == 0) {
54
 
                cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD);
 
53
                cpu_reset_interrupt(first_cpu, CPU_INTERRUPT_HARD);
55
54
            }
56
55
        }
57
56
    }
319
318
 
320
319
#define SH_INTC_IOMEM_FORMAT "interrupt-controller-%s-%s-%s"
321
320
    snprintf(name, sizeof(name), SH_INTC_IOMEM_FORMAT, type, action, "p4");
322
 
    memory_region_init_alias(iomem_p4, name, iomem, INTC_A7(address), 4);
 
321
    memory_region_init_alias(iomem_p4, NULL, name, iomem, INTC_A7(address), 4);
323
322
    memory_region_add_subregion(sysmem, P4ADDR(address), iomem_p4);
324
323
 
325
324
    snprintf(name, sizeof(name), SH_INTC_IOMEM_FORMAT, type, action, "a7");
326
 
    memory_region_init_alias(iomem_a7, name, iomem, INTC_A7(address), 4);
 
325
    memory_region_init_alias(iomem_a7, NULL, name, iomem, INTC_A7(address), 4);
327
326
    memory_region_add_subregion(sysmem, A7ADDR(address), iomem_a7);
328
327
#undef SH_INTC_IOMEM_FORMAT
329
328
 
466
465
 
467
466
    desc->irqs = qemu_allocate_irqs(sh_intc_set_irq, desc, nr_sources);
468
467
 
469
 
    memory_region_init_io(&desc->iomem, &sh_intc_ops, desc,
 
468
    memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc,
470
469
                          "interrupt-controller", 0x100000000ULL);
471
470
 
472
471
#define INT_REG_PARAMS(reg_struct, type, action, j) \