← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/exec/cpu-defs.h

  • 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:
include/exec/cpu-defs.h
28
28
#include <inttypes.h>
29
29
#include "qemu/osdep.h"
30
30
#include "qemu/queue.h"
 
31
#ifndef CONFIG_USER_ONLY
31
32
#include "exec/hwaddr.h"
 
33
#endif
32
34
 
33
35
#ifndef TARGET_LONG_BITS
34
36
#error TARGET_LONG_BITS must be defined before including this header
99
101
                   sizeof(uintptr_t))];
100
102
} CPUTLBEntry;
101
103
 
102
 
extern int CPUTLBEntry_wrong_size[sizeof(CPUTLBEntry) == (1 << CPU_TLB_ENTRY_BITS) ? 1 : -1];
 
104
QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));
103
105
 
104
106
#define CPU_COMMON_TLB \
105
107
    /* The meaning of the MMU modes is defined in the target code. */   \
152
154
                                     memory was accessed */             \
153
155
    CPU_COMMON_TLB                                                      \
154
156
    struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE];           \
155
 
    /* buffer for temporaries in the code generator */                  \
156
 
    long temp_buf[CPU_TEMP_BUF_NLONGS];                                 \
157
157
                                                                        \
158
158
    int64_t icount_extra; /* Instructions until next timer event.  */   \
159
159
    /* Number of cycles left, with interrupt flag in high bit.          \
168
168
    /* from this point: preserved by CPU reset */                       \
169
169
    /* ice debug support */                                             \
170
170
    QTAILQ_HEAD(breakpoints_head, CPUBreakpoint) breakpoints;            \
171
 
    int singlestep_enabled;                                             \
172
171
                                                                        \
173
172
    QTAILQ_HEAD(watchpoints_head, CPUWatchpoint) watchpoints;            \
174
173
    CPUWatchpoint *watchpoint_hit;                                      \
175
174
                                                                        \
176
 
    struct GDBRegisterState *gdb_regs;                                  \
177
 
                                                                        \
178
175
    /* Core interrupt code */                                           \
179
176
    sigjmp_buf jmp_env;                                                 \
180
177
    int exception_index;                                                \
181
178
                                                                        \
182
 
    CPUArchState *next_cpu; /* next CPU sharing TB cache */                 \
183
179
    /* user data */                                                     \
184
180
    void *opaque;                                                       \
185
181
                                                                        \