← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/watchdog/wdt_i6300esb.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/watchdog/wdt_i6300esb.c
374
374
 
375
375
static const VMStateDescription vmstate_i6300esb = {
376
376
    .name = "i6300esb_wdt",
377
 
    .version_id = sizeof(I6300State),
378
 
    .minimum_version_id = sizeof(I6300State),
379
 
    .minimum_version_id_old = sizeof(I6300State),
 
377
    /* With this VMSD's introduction, version_id/minimum_version_id were
 
378
     * erroneously set to sizeof(I6300State), causing a somewhat random
 
379
     * version_id to be set for every build. This eventually broke
 
380
     * migration.
 
381
     *
 
382
     * To correct this without breaking old->new migration for older versions
 
383
     * of QEMU, we've set version_id to a value high enough to exceed all past
 
384
     * values of sizeof(I6300State) across various build environments, and have
 
385
     * reset minimum_version_id_old/minimum_version_id to 1, since this VMSD
 
386
     * has never changed and thus can accept all past versions.
 
387
     *
 
388
     * For future changes we can treat these values as we normally would.
 
389
     */
 
390
    .version_id = 10000,
 
391
    .minimum_version_id = 1,
 
392
    .minimum_version_id_old = 1,
380
393
    .fields      = (VMStateField []) {
381
394
        VMSTATE_PCI_DEVICE(dev, I6300State),
382
395
        VMSTATE_INT32(reboot_enabled, I6300State),
404
417
    d->timer = qemu_new_timer_ns(vm_clock, i6300esb_timer_expired, d);
405
418
    d->previous_reboot_flag = 0;
406
419
 
407
 
    memory_region_init_io(&d->io_mem, &i6300esb_ops, d, "i6300esb", 0x10);
 
420
    memory_region_init_io(&d->io_mem, OBJECT(d), &i6300esb_ops, d,
 
421
                          "i6300esb", 0x10);
408
422
    pci_register_bar(&d->dev, 0, 0, &d->io_mem);
409
423
    /* qemu_register_coalesced_mmio (addr, 0x10); ? */
410
424
 
437
451
    k->class_id = PCI_CLASS_SYSTEM_OTHER;
438
452
    dc->reset = i6300esb_reset;
439
453
    dc->vmsd = &vmstate_i6300esb;
 
454
    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
440
455
}
441
456
 
442
457
static const TypeInfo i6300esb_info = {