← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/sd/milkymist-memcard.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/sd/milkymist-memcard.c
58
58
    R_MAX
59
59
};
60
60
 
 
61
#define TYPE_MILKYMIST_MEMCARD "milkymist-memcard"
 
62
#define MILKYMIST_MEMCARD(obj) \
 
63
    OBJECT_CHECK(MilkymistMemcardState, (obj), TYPE_MILKYMIST_MEMCARD)
 
64
 
61
65
struct MilkymistMemcardState {
62
 
    SysBusDevice busdev;
 
66
    SysBusDevice parent_obj;
 
67
 
63
68
    MemoryRegion regs_region;
64
69
    SDState *card;
65
70
 
231
236
 
232
237
static void milkymist_memcard_reset(DeviceState *d)
233
238
{
234
 
    MilkymistMemcardState *s =
235
 
            container_of(d, MilkymistMemcardState, busdev.qdev);
 
239
    MilkymistMemcardState *s = MILKYMIST_MEMCARD(d);
236
240
    int i;
237
241
 
238
242
    s->command_write_ptr = 0;
246
250
 
247
251
static int milkymist_memcard_init(SysBusDevice *dev)
248
252
{
249
 
    MilkymistMemcardState *s = FROM_SYSBUS(typeof(*s), dev);
 
253
    MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev);
250
254
    DriveInfo *dinfo;
251
255
 
252
256
    dinfo = drive_get_next(IF_SD);
253
 
    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0, 0);
 
257
    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, false, false);
254
258
    s->enabled = dinfo ? bdrv_is_inserted(dinfo->bdrv) : 0;
255
259
 
256
 
    memory_region_init_io(&s->regs_region, &memcard_mmio_ops, s,
 
260
    memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s,
257
261
            "milkymist-memcard", R_MAX * 4);
258
262
    sysbus_init_mmio(dev, &s->regs_region);
259
263
 
289
293
}
290
294
 
291
295
static const TypeInfo milkymist_memcard_info = {
292
 
    .name          = "milkymist-memcard",
 
296
    .name          = TYPE_MILKYMIST_MEMCARD,
293
297
    .parent        = TYPE_SYS_BUS_DEVICE,
294
298
    .instance_size = sizeof(MilkymistMemcardState),
295
299
    .class_init    = milkymist_memcard_class_init,