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

« back to all changes in this revision

Viewing changes to hw/sh4/sh7750.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:
730
730
    s = g_malloc0(sizeof(SH7750State));
731
731
    s->cpu = cpu;
732
732
    s->periph_freq = 60000000;  /* 60MHz */
733
 
    memory_region_init_io(&s->iomem, &sh7750_mem_ops, s,
 
733
    memory_region_init_io(&s->iomem, NULL, &sh7750_mem_ops, s,
734
734
                          "memory", 0x1fc01000);
735
735
 
736
 
    memory_region_init_alias(&s->iomem_1f0, "memory-1f0",
 
736
    memory_region_init_alias(&s->iomem_1f0, NULL, "memory-1f0",
737
737
                             &s->iomem, 0x1f000000, 0x1000);
738
738
    memory_region_add_subregion(sysmem, 0x1f000000, &s->iomem_1f0);
739
739
 
740
 
    memory_region_init_alias(&s->iomem_ff0, "memory-ff0",
 
740
    memory_region_init_alias(&s->iomem_ff0, NULL, "memory-ff0",
741
741
                             &s->iomem, 0x1f000000, 0x1000);
742
742
    memory_region_add_subregion(sysmem, 0xff000000, &s->iomem_ff0);
743
743
 
744
 
    memory_region_init_alias(&s->iomem_1f8, "memory-1f8",
 
744
    memory_region_init_alias(&s->iomem_1f8, NULL, "memory-1f8",
745
745
                             &s->iomem, 0x1f800000, 0x1000);
746
746
    memory_region_add_subregion(sysmem, 0x1f800000, &s->iomem_1f8);
747
747
 
748
 
    memory_region_init_alias(&s->iomem_ff8, "memory-ff8",
 
748
    memory_region_init_alias(&s->iomem_ff8, NULL, "memory-ff8",
749
749
                             &s->iomem, 0x1f800000, 0x1000);
750
750
    memory_region_add_subregion(sysmem, 0xff800000, &s->iomem_ff8);
751
751
 
752
 
    memory_region_init_alias(&s->iomem_1fc, "memory-1fc",
 
752
    memory_region_init_alias(&s->iomem_1fc, NULL, "memory-1fc",
753
753
                             &s->iomem, 0x1fc00000, 0x1000);
754
754
    memory_region_add_subregion(sysmem, 0x1fc00000, &s->iomem_1fc);
755
755
 
756
 
    memory_region_init_alias(&s->iomem_ffc, "memory-ffc",
 
756
    memory_region_init_alias(&s->iomem_ffc, NULL, "memory-ffc",
757
757
                             &s->iomem, 0x1fc00000, 0x1000);
758
758
    memory_region_add_subregion(sysmem, 0xffc00000, &s->iomem_ffc);
759
759
 
760
 
    memory_region_init_io(&s->mmct_iomem, &sh7750_mmct_ops, s,
 
760
    memory_region_init_io(&s->mmct_iomem, NULL, &sh7750_mmct_ops, s,
761
761
                          "cache-and-tlb", 0x08000000);
762
762
    memory_region_add_subregion(sysmem, 0xf0000000, &s->mmct_iomem);
763
763