← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/display/milkymist-tmu2.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/display/milkymist-tmu2.c
75
75
    int y;
76
76
} QEMU_PACKED;
77
77
 
 
78
#define TYPE_MILKYMIST_TMU2 "milkymist-tmu2"
 
79
#define MILKYMIST_TMU2(obj) \
 
80
    OBJECT_CHECK(MilkymistTMU2State, (obj), TYPE_MILKYMIST_TMU2)
 
81
 
78
82
struct MilkymistTMU2State {
79
 
    SysBusDevice busdev;
 
83
    SysBusDevice parent_obj;
 
84
 
80
85
    MemoryRegion regs_region;
81
86
    CharDriverState *chr;
82
87
    qemu_irq irq;
429
434
 
430
435
static void milkymist_tmu2_reset(DeviceState *d)
431
436
{
432
 
    MilkymistTMU2State *s = container_of(d, MilkymistTMU2State, busdev.qdev);
 
437
    MilkymistTMU2State *s = MILKYMIST_TMU2(d);
433
438
    int i;
434
439
 
435
440
    for (i = 0; i < R_MAX; i++) {
439
444
 
440
445
static int milkymist_tmu2_init(SysBusDevice *dev)
441
446
{
442
 
    MilkymistTMU2State *s = FROM_SYSBUS(typeof(*s), dev);
 
447
    MilkymistTMU2State *s = MILKYMIST_TMU2(dev);
443
448
 
444
449
    if (tmu2_glx_init(s)) {
445
450
        return 1;
447
452
 
448
453
    sysbus_init_irq(dev, &s->irq);
449
454
 
450
 
    memory_region_init_io(&s->regs_region, &tmu2_mmio_ops, s,
 
455
    memory_region_init_io(&s->regs_region, OBJECT(s), &tmu2_mmio_ops, s,
451
456
            "milkymist-tmu2", R_MAX * 4);
452
457
    sysbus_init_mmio(dev, &s->regs_region);
453
458
 
476
481
}
477
482
 
478
483
static const TypeInfo milkymist_tmu2_info = {
479
 
    .name          = "milkymist-tmu2",
 
484
    .name          = TYPE_MILKYMIST_TMU2,
480
485
    .parent        = TYPE_SYS_BUS_DEVICE,
481
486
    .instance_size = sizeof(MilkymistTMU2State),
482
487
    .class_init    = milkymist_tmu2_class_init,