← Back to branch summary

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

« back to all changes in this revision

Viewing changes to target-alpha/cpu.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:
target-alpha/cpu.c
21
21
 
22
22
#include "cpu.h"
23
23
#include "qemu-common.h"
24
 
 
 
24
#include "migration/vmstate.h"
 
25
 
 
26
 
 
27
static void alpha_cpu_set_pc(CPUState *cs, vaddr value)
 
28
{
 
29
    AlphaCPU *cpu = ALPHA_CPU(cs);
 
30
 
 
31
    cpu->env.pc = value;
 
32
}
25
33
 
26
34
static void alpha_cpu_realizefn(DeviceState *dev, Error **errp)
27
35
{
28
 
    AlphaCPU *cpu = ALPHA_CPU(dev);
 
36
    CPUState *cs = CPU(dev);
29
37
    AlphaCPUClass *acc = ALPHA_CPU_GET_CLASS(dev);
30
38
 
31
 
    qemu_init_vcpu(&cpu->env);
 
39
    qemu_init_vcpu(cs);
32
40
 
33
41
    acc->parent_realize(dev, errp);
34
42
}
264
272
 
265
273
    cc->class_by_name = alpha_cpu_class_by_name;
266
274
    cc->do_interrupt = alpha_cpu_do_interrupt;
 
275
    cc->dump_state = alpha_cpu_dump_state;
 
276
    cc->set_pc = alpha_cpu_set_pc;
 
277
    cc->gdb_read_register = alpha_cpu_gdb_read_register;
 
278
    cc->gdb_write_register = alpha_cpu_gdb_write_register;
 
279
#ifndef CONFIG_USER_ONLY
 
280
    cc->do_unassigned_access = alpha_cpu_unassigned_access;
 
281
    cc->get_phys_page_debug = alpha_cpu_get_phys_page_debug;
 
282
    dc->vmsd = &vmstate_alpha_cpu;
 
283
#endif
 
284
    cc->gdb_num_core_regs = 67;
267
285
}
268
286
 
269
287
static const TypeInfo alpha_cpu_type_info = {