diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 17:30:33 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 17:30:33 -0200 |
| commit | 3e446abd89287bcb296531616b5c873b4275f7d8 (patch) | |
| tree | 1219df7152eea26cccc7ee9bce7a06fef3b5df2b /target-i386/cpu.h | |
| parent | Merge commit 'dae5079acacc4e42e9583fbc326f81c08ab973d3' into upstream-merge (diff) | |
| parent | Add KVM paravirt cpuid leaf (diff) | |
| download | qemu-kvm-3e446abd89287bcb296531616b5c873b4275f7d8.tar.gz qemu-kvm-3e446abd89287bcb296531616b5c873b4275f7d8.tar.bz2 qemu-kvm-3e446abd89287bcb296531616b5c873b4275f7d8.zip | |
Merge commit 'bb0300dc57c10b3721451b0ff566a03f9276cc77' into upstream-merge
* commit 'bb0300dc57c10b3721451b0ff566a03f9276cc77': (30 commits)
Add KVM paravirt cpuid leaf
virtio-blk: remove dead variable in virtio_blk_handle_scsi
qcow/qcow2: implement bdrv_aio_flush
block: flush backing_hd in the right place
json-parser: remove dead increment
qcow2-refcount: remove dead assignment
hw/vga.c: remove dead assignment
x86: translate.c: remove dead assignment
virtio: net: remove dead assignment
vl.c: Remove dead assignment
osdep.c: Fix accept4 fallback
qemu-img rebase
block: Add bdrv_change_backing_file
block: Introduce BDRV_O_NO_BACKING
move kbd/mouse handling to input.c
use pkg-config for libcurl whenever available
use pkg-config for sdl whenever available
fixes to the static compilation case for sdl
use cross-prefix for pkgconfig
pcnet: remove dead nested assignment, spotted by clang
...
Conflicts:
target-i386/kvm.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 0df6f1d6c..7d0bbd012 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -717,7 +717,8 @@ typedef struct CPUX86State { uint8_t nmi_pending; uint8_t has_error_code; uint32_t sipi_vector; - + uint32_t cpuid_kvm_features; + /* in order to simplify APIC support, we leave this pointer to the user */ struct APICState *apic_state; |