← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/m68k/mcf5208.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/m68k/mcf5208.c
172
172
    int i;
173
173
 
174
174
    /* SDRAMC.  */
175
 
    memory_region_init_io(iomem, &m5208_sys_ops, NULL, "m5208-sys", 0x00004000);
 
175
    memory_region_init_io(iomem, NULL, &m5208_sys_ops, NULL, "m5208-sys", 0x00004000);
176
176
    memory_region_add_subregion(address_space, 0xfc0a8000, iomem);
177
177
    /* Timers.  */
178
178
    for (i = 0; i < 2; i++) {
179
179
        s = (m5208_timer_state *)g_malloc0(sizeof(m5208_timer_state));
180
180
        bh = qemu_bh_new(m5208_timer_trigger, s);
181
181
        s->timer = ptimer_init(bh);
182
 
        memory_region_init_io(&s->iomem, &m5208_timer_ops, s,
 
182
        memory_region_init_io(&s->iomem, NULL, &m5208_timer_ops, s,
183
183
                              "m5208-timer", 0x00004000);
184
184
        memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i,
185
185
                                    &s->iomem);
217
217
    /* TODO: Configure BARs.  */
218
218
 
219
219
    /* DRAM at 0x40000000 */
220
 
    memory_region_init_ram(ram, "mcf5208.ram", ram_size);
 
220
    memory_region_init_ram(ram, NULL, "mcf5208.ram", ram_size);
221
221
    vmstate_register_ram_global(ram);
222
222
    memory_region_add_subregion(address_space_mem, 0x40000000, ram);
223
223
 
224
224
    /* Internal SRAM.  */
225
 
    memory_region_init_ram(sram, "mcf5208.sram", 16384);
 
225
    memory_region_init_ram(sram, NULL, "mcf5208.sram", 16384);
226
226
    vmstate_register_ram_global(sram);
227
227
    memory_region_add_subregion(address_space_mem, 0x80000000, sram);
228
228