← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/sysemu/kvm.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/sysemu/kvm.h
42
42
extern bool kvm_allowed;
43
43
extern bool kvm_kernel_irqchip;
44
44
extern bool kvm_async_interrupts_allowed;
 
45
extern bool kvm_halt_in_kernel_allowed;
45
46
extern bool kvm_irqfds_allowed;
46
47
extern bool kvm_msi_via_irqfd_allowed;
47
48
extern bool kvm_gsi_routing_allowed;
 
49
extern bool kvm_readonly_mem_allowed;
48
50
 
49
51
#if defined CONFIG_KVM || !defined NEED_CPU_H
50
52
#define kvm_enabled()           (kvm_allowed)
72
74
#define kvm_async_interrupts_enabled() (kvm_async_interrupts_allowed)
73
75
 
74
76
/**
 
77
 * kvm_halt_in_kernel
 
78
 *
 
79
 * Returns: true if halted cpus should still get a KVM_RUN ioctl to run
 
80
 * inside of kernel space. This only works if MP state is implemented.
 
81
 */
 
82
#define kvm_halt_in_kernel() (kvm_halt_in_kernel_allowed)
 
83
 
 
84
/**
75
85
 * kvm_irqfds_enabled:
76
86
 *
77
87
 * Returns: true if we can use irqfds to inject interrupts into
97
107
 */
98
108
#define kvm_gsi_routing_enabled() (kvm_gsi_routing_allowed)
99
109
 
 
110
/**
 
111
 * kvm_readonly_mem_enabled:
 
112
 *
 
113
 * Returns: true if KVM readonly memory is enabled (ie the kernel
 
114
 * supports it and we're running in a configuration that permits it).
 
115
 */
 
116
#define kvm_readonly_mem_enabled() (kvm_readonly_mem_allowed)
 
117
 
100
118
#else
101
119
#define kvm_enabled()           (0)
102
120
#define kvm_irqchip_in_kernel() (false)
103
121
#define kvm_async_interrupts_enabled() (false)
 
122
#define kvm_halt_in_kernel() (false)
104
123
#define kvm_irqfds_enabled() (false)
105
124
#define kvm_msi_via_irqfd_enabled() (false)
106
125
#define kvm_gsi_routing_allowed() (false)
 
126
#define kvm_readonly_mem_enabled() (false)
107
127
#endif
108
128
 
109
129
struct kvm_run;
137
157
int kvm_has_intx_set_mask(void);
138
158
 
139
159
int kvm_init_vcpu(CPUState *cpu);
 
160
int kvm_cpu_exec(CPUState *cpu);
140
161
 
141
162
#ifdef NEED_CPU_H
142
 
int kvm_cpu_exec(CPUArchState *env);
143
163
 
144
164
#if !defined(CONFIG_USER_ONLY)
145
165
void *kvm_ram_alloc(ram_addr_t size);
149
169
void kvm_setup_guest_memory(void *start, size_t size);
150
170
void kvm_flush_coalesced_mmio_buffer(void);
151
171
 
152
 
int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr,
153
 
                          target_ulong len, int type);
154
 
int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr,
155
 
                          target_ulong len, int type);
156
 
void kvm_remove_all_breakpoints(CPUArchState *current_env);
157
 
int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap);
 
172
int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr,
 
173
                          target_ulong len, int type);
 
174
int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr,
 
175
                          target_ulong len, int type);
 
176
void kvm_remove_all_breakpoints(CPUState *cpu);
 
177
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap);
158
178
#ifndef _WIN32
159
 
int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset);
 
179
int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset);
160
180
#endif
161
181
 
162
182
int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr);
210
230
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
211
231
 
212
232
void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
 
233
void kvm_irqchip_commit_routes(KVMState *s);
213
234
 
214
235
void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
215
236
void kvm_get_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);
231
252
 
232
253
int kvm_sw_breakpoints_active(CPUState *cpu);
233
254
 
234
 
int kvm_arch_insert_sw_breakpoint(CPUState *current_cpu,
 
255
int kvm_arch_insert_sw_breakpoint(CPUState *cpu,
235
256
                                  struct kvm_sw_breakpoint *bp);
236
 
int kvm_arch_remove_sw_breakpoint(CPUState *current_cpu,
 
257
int kvm_arch_remove_sw_breakpoint(CPUState *cpu,
237
258
                                  struct kvm_sw_breakpoint *bp);
238
259
int kvm_arch_insert_hw_breakpoint(target_ulong addr,
239
260
                                  target_ulong len, int type);
249
270
 
250
271
uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
251
272
                                      uint32_t index, int reg);
252
 
void kvm_cpu_synchronize_state(CPUArchState *env);
 
273
void kvm_cpu_synchronize_state(CPUState *cpu);
253
274
 
254
275
/* generic hooks - to be moved/refactored once there are more users */
255
276
 
256
 
static inline void cpu_synchronize_state(CPUArchState *env)
 
277
static inline void cpu_synchronize_state(CPUState *cpu)
257
278
{
258
279
    if (kvm_enabled()) {
259
 
        kvm_cpu_synchronize_state(env);
 
280
        kvm_cpu_synchronize_state(cpu);
260
281
    }
261
282
}
262
283
 
292
313
int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq);
293
314
void kvm_pc_gsi_handler(void *opaque, int n, int level);
294
315
void kvm_pc_setup_irq_routing(bool pci_enabled);
 
316
void kvm_init_irq_routing(KVMState *s);
295
317
#endif