diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-11-22 15:11:29 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-11-22 15:11:29 +0200 |
| commit | 0b04e23bfe861522689765229143d9671e2308df (patch) | |
| tree | 6c270982bd88387870e48e40879d7b0cb978ac32 /block_int.h | |
| parent | Merge commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7' into upstream-merge (diff) | |
| parent | kvm: x86: Refactor use of interrupt_bitmap (diff) | |
| download | qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.gz qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.bz2 qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.zip | |
Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-merge
* commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a': (22 commits)
kvm: x86: Refactor use of interrupt_bitmap
kvm: Add arch reset handler
Enable migration without shared storage from the monitor
Block live migration
Expose a mechanism to trace block writes
char: rename qemu_chr_reset to qemu_chr_generic_open
char: Remove special init_reset handling
char: don't limit data sent to backends to 1k per buffer
ARM PB-A8 support
LAN9118 emulation
mips_r4k: fix reset
PPC64: map Uni-North AGP bus aka fix Linux boot
PPC64: Partial fix to Linux crash: revert to old devfn
PCI: make duplicate devfn allocation fatal
Do not execute shell scripts directly
mips malta: fix indentation
target-mips: fix indentation
mips-malta: fix reset
mips: fix cpu_reset memory leak
fix make clean targets
...
Carry changes to qemu-kvm-x86.c.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'block_int.h')
| -rw-r--r-- | block_int.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block_int.h b/block_int.h index 8e72abee0..7ebe926f5 100644 --- a/block_int.h +++ b/block_int.h @@ -168,6 +168,8 @@ struct BlockDriverState { int cyls, heads, secs, translation; int type; char device_name[32]; + int dirty_tracking; + uint8_t *dirty_bitmap; BlockDriverState *next; void *private; }; |