← Back to branch summary

~ubuntu-branches/ubuntu/saucy/qemu/saucy-proposed

« back to all changes in this revision

Viewing changes to target-openrisc/cpu.h

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-05-28 08:18:30 UTC
  • mfrom: (1.8.2) (10.1.37 sid)
  • Revision ID: package-import@ubuntu.com-20130528081830-87xl2z9fq516a814
Tags: 1.5.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.5.0+dfs-2 from debian unstable.  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
    * 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.
  - Dropped patches:
    * 0001-fix-wrong-output-with-info-chardev-for-tcp-socket.patch
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * gridcentric patch - updated
    * linaro arm patches from qemu-linaro rebasing branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-openrisc/cpu.h
33
33
#include "exec/cpu-defs.h"
34
34
#include "fpu/softfloat.h"
35
35
#include "qom/cpu.h"
36
 
#include "qapi/error.h"
37
36
 
38
37
#define TYPE_OPENRISC_CPU "or32-cpu"
39
38
 
46
45
 
47
46
/**
48
47
 * OpenRISCCPUClass:
 
48
 * @parent_realize: The parent class' realize handler.
49
49
 * @parent_reset: The parent class' reset handler.
50
50
 *
51
51
 * A OpenRISC CPU model.
55
55
    CPUClass parent_class;
56
56
    /*< public >*/
57
57
 
 
58
    DeviceRealize parent_realize;
58
59
    void (*parent_reset)(CPUState *cpu);
59
60
} OpenRISCCPUClass;
60
61
 
339
340
 
340
341
#define ENV_GET_CPU(e) CPU(openrisc_env_get_cpu(e))
341
342
 
 
343
#define ENV_OFFSET offsetof(OpenRISCCPU, env)
 
344
 
342
345
OpenRISCCPU *cpu_openrisc_init(const char *cpu_model);
343
 
void openrisc_cpu_realize(Object *obj, Error **errp);
344
346
 
345
347
void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf);
346
348
int cpu_openrisc_exec(CPUOpenRISCState *s);
347
 
void do_interrupt(CPUOpenRISCState *env);
 
349
void openrisc_cpu_do_interrupt(CPUState *cpu);
348
350
void openrisc_translate_init(void);
349
351
int cpu_openrisc_handle_mmu_fault(CPUOpenRISCState *env,
350
352
                                  target_ulong address,
421
423
#define CPU_INTERRUPT_TIMER   CPU_INTERRUPT_TGT_INT_0
422
424
static inline bool cpu_has_work(CPUState *cpu)
423
425
{
424
 
    CPUOpenRISCState *env = &OPENRISC_CPU(cpu)->env;
425
 
 
426
 
    return env->interrupt_request & (CPU_INTERRUPT_HARD |
 
426
    return cpu->interrupt_request & (CPU_INTERRUPT_HARD |
427
427
                                     CPU_INTERRUPT_TIMER);
428
428
}
429
429