Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (41 commits)
  Remove unused variable
  ETRAX: Removed unused struct entry and fixed Windows build.
  Add common BusState
  Fix lance segfaults
  Avoid errors when curl-config does not exist
  bios: Use the correct mask to size the PCI option ROM BAR
  x86: Add support for resume flag
  net: Fix dump time stamps
  Add HTTP protocol using curl v6
  USB serial device support
  serial: fix lost character after sysrq
  usb-serial: implement break event.
  slirp: Reassign same address to same DHCP client
  kvm: x86: Save/restore KVM-specific CPU states
  kvm: Rework VCPU reset
  Introduce reset notifier order
  kvm: Fix framebuffer dirty log sync
  kvm: Add missing bits to support live migration
  kvm: Rework dirty bitmap synchronization
  kvm: Fix dirty log temporary buffer size
  ...

Conflicts:
	Makefile
	configure
	exec.c
	hw/ioapic.c
	hw/pc.c
	pc-bios/bios.bin
	target-i386/machine.c
	vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/cpu-all.h b/cpu-all.h
index 8c5e8be0d..6254af958 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -902,7 +902,8 @@ int cpu_physical_memory_set_dirty_tracking(int enable);
 
 int cpu_physical_memory_get_dirty_tracking(void);
 
-void cpu_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, target_phys_addr_t end_addr);
+int cpu_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,
+                                   target_phys_addr_t end_addr);
 
 void dump_exec_info(FILE *f,
                     int (*cpu_fprintf)(FILE *f, const char *fmt, ...));