← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/timer/cadence_ttc.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/timer/cadence_ttc.c
64
64
    qemu_irq irq;
65
65
} CadenceTimerState;
66
66
 
67
 
typedef struct {
68
 
    SysBusDevice busdev;
 
67
#define TYPE_CADENCE_TTC "cadence_ttc"
 
68
#define CADENCE_TTC(obj) \
 
69
    OBJECT_CHECK(CadenceTTCState, (obj), TYPE_CADENCE_TTC)
 
70
 
 
71
typedef struct CadenceTTCState {
 
72
    SysBusDevice parent_obj;
 
73
 
69
74
    MemoryRegion iomem;
70
75
    CadenceTimerState timer[3];
71
76
} CadenceTTCState;
401
406
 
402
407
static int cadence_ttc_init(SysBusDevice *dev)
403
408
{
404
 
    CadenceTTCState *s = FROM_SYSBUS(CadenceTTCState, dev);
 
409
    CadenceTTCState *s = CADENCE_TTC(dev);
405
410
    int i;
406
411
 
407
412
    for (i = 0; i < 3; ++i) {
409
414
        sysbus_init_irq(dev, &s->timer[i].irq);
410
415
    }
411
416
 
412
 
    memory_region_init_io(&s->iomem, &cadence_ttc_ops, s, "timer", 0x1000);
 
417
    memory_region_init_io(&s->iomem, OBJECT(s), &cadence_ttc_ops, s,
 
418
                          "timer", 0x1000);
413
419
    sysbus_init_mmio(dev, &s->iomem);
414
420
 
415
421
    return 0;
475
481
}
476
482
 
477
483
static const TypeInfo cadence_ttc_info = {
478
 
    .name  = "cadence_ttc",
 
484
    .name  = TYPE_CADENCE_TTC,
479
485
    .parent = TYPE_SYS_BUS_DEVICE,
480
486
    .instance_size  = sizeof(CadenceTTCState),
481
487
    .class_init = cadence_ttc_class_init,