← Back to branch summary

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

« back to all changes in this revision

Viewing changes to target-openrisc/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-openrisc/cpu.c
20
20
#include "cpu.h"
21
21
#include "qemu-common.h"
22
22
 
 
23
static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)
 
24
{
 
25
    OpenRISCCPU *cpu = OPENRISC_CPU(cs);
 
26
 
 
27
    cpu->env.pc = value;
 
28
}
 
29
 
23
30
/* CPUClass::reset() */
24
31
static void openrisc_cpu_reset(CPUState *s)
25
32
{
26
33
    OpenRISCCPU *cpu = OPENRISC_CPU(s);
27
34
    OpenRISCCPUClass *occ = OPENRISC_CPU_GET_CLASS(cpu);
28
35
 
29
 
    if (qemu_loglevel_mask(CPU_LOG_RESET)) {
30
 
        qemu_log("CPU Reset (CPU %d)\n", s->cpu_index);
31
 
        log_cpu_state(&cpu->env, 0);
32
 
    }
33
 
 
34
36
    occ->parent_reset(s);
35
37
 
36
38
    memset(&cpu->env, 0, offsetof(CPUOpenRISCState, breakpoints));
64
66
 
65
67
static void openrisc_cpu_realizefn(DeviceState *dev, Error **errp)
66
68
{
67
 
    OpenRISCCPU *cpu = OPENRISC_CPU(dev);
 
69
    CPUState *cs = CPU(dev);
68
70
    OpenRISCCPUClass *occ = OPENRISC_CPU_GET_CLASS(dev);
69
71
 
70
 
    qemu_init_vcpu(&cpu->env);
71
 
    cpu_reset(CPU(cpu));
 
72
    qemu_init_vcpu(cs);
 
73
    cpu_reset(cs);
72
74
 
73
75
    occ->parent_realize(dev, errp);
74
76
}
97
99
static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
98
100
{
99
101
    ObjectClass *oc;
 
102
    char *typename;
100
103
 
101
104
    if (cpu_model == NULL) {
102
105
        return NULL;
103
106
    }
104
107
 
105
 
    oc = object_class_by_name(cpu_model);
 
108
    typename = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, cpu_model);
 
109
    oc = object_class_by_name(typename);
 
110
    g_free(typename);
106
111
    if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU) ||
107
112
                       object_class_is_abstract(oc))) {
108
113
        return NULL;
149
154
 
150
155
    cc->class_by_name = openrisc_cpu_class_by_name;
151
156
    cc->do_interrupt = openrisc_cpu_do_interrupt;
 
157
    cc->dump_state = openrisc_cpu_dump_state;
 
158
    cc->set_pc = openrisc_cpu_set_pc;
 
159
    cc->gdb_read_register = openrisc_cpu_gdb_read_register;
 
160
    cc->gdb_write_register = openrisc_cpu_gdb_write_register;
 
161
#ifndef CONFIG_USER_ONLY
 
162
    cc->get_phys_page_debug = openrisc_cpu_get_phys_page_debug;
 
163
    dc->vmsd = &vmstate_openrisc_cpu;
 
164
#endif
 
165
    cc->gdb_num_core_regs = 32 + 3;
152
166
}
153
167
 
154
168
static void cpu_register(const OpenRISCCPUInfo *info)