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

« back to all changes in this revision

Viewing changes to target-alpha/machine.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
* 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:
20
20
    .put = put_fpcr,
21
21
};
22
22
 
23
 
static VMStateField vmstate_cpu_fields[] = {
 
23
static VMStateField vmstate_env_fields[] = {
24
24
    VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31),
25
25
    VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31),
26
26
    /* Save the architecture value of the fpcr, not the internally
68
68
    VMSTATE_END_OF_LIST()
69
69
};
70
70
 
71
 
static const VMStateDescription vmstate_cpu = {
 
71
static const VMStateDescription vmstate_env = {
 
72
    .name = "env",
 
73
    .version_id = 1,
 
74
    .minimum_version_id = 1,
 
75
    .minimum_version_id_old = 1,
 
76
    .fields = vmstate_env_fields,
 
77
};
 
78
 
 
79
static VMStateField vmstate_cpu_fields[] = {
 
80
    VMSTATE_CPU(),
 
81
    VMSTATE_STRUCT(env, AlphaCPU, 1, vmstate_env, CPUAlphaState),
 
82
    VMSTATE_END_OF_LIST()
 
83
};
 
84
 
 
85
const VMStateDescription vmstate_alpha_cpu = {
72
86
    .name = "cpu",
73
87
    .version_id = 1,
74
88
    .minimum_version_id = 1,
75
89
    .minimum_version_id_old = 1,
76
90
    .fields = vmstate_cpu_fields,
77
91
};
78
 
 
79
 
void cpu_save(QEMUFile *f, void *opaque)
80
 
{
81
 
    vmstate_save_state(f, &vmstate_cpu, opaque);
82
 
}
83
 
 
84
 
int cpu_load(QEMUFile *f, void *opaque, int version_id)
85
 
{
86
 
    return vmstate_load_state(f, &vmstate_cpu, opaque, version_id);
87
 
}