← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/nvram/ds1225y.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/nvram/ds1225y.c
26
26
#include "trace.h"
27
27
 
28
28
typedef struct {
29
 
    DeviceState qdev;
30
29
    MemoryRegion iomem;
31
30
    uint32_t chip_size;
32
31
    char *filename;
105
104
    }
106
105
};
107
106
 
 
107
#define TYPE_DS1225Y "ds1225y"
 
108
#define DS1225Y(obj) OBJECT_CHECK(SysBusNvRamState, (obj), TYPE_DS1225Y)
 
109
 
108
110
typedef struct {
109
 
    SysBusDevice busdev;
 
111
    SysBusDevice parent_obj;
 
112
 
110
113
    NvRamState nvram;
111
114
} SysBusNvRamState;
112
115
 
113
116
static int nvram_sysbus_initfn(SysBusDevice *dev)
114
117
{
115
 
    NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram;
 
118
    SysBusNvRamState *sys = DS1225Y(dev);
 
119
    NvRamState *s = &sys->nvram;
116
120
    FILE *file;
117
121
 
118
122
    s->contents = g_malloc0(s->chip_size);
119
123
 
120
 
    memory_region_init_io(&s->iomem, &nvram_ops, s, "nvram", s->chip_size);
 
124
    memory_region_init_io(&s->iomem, OBJECT(s), &nvram_ops, s,
 
125
                          "nvram", s->chip_size);
121
126
    sysbus_init_mmio(dev, &s->iomem);
122
127
 
123
128
    /* Read current file */
151
156
}
152
157
 
153
158
static const TypeInfo nvram_sysbus_info = {
154
 
    .name          = "ds1225y",
 
159
    .name          = TYPE_DS1225Y,
155
160
    .parent        = TYPE_SYS_BUS_DEVICE,
156
161
    .instance_size = sizeof(SysBusNvRamState),
157
162
    .class_init    = nvram_sysbus_class_init,