From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 5 May 2011 13:39:47 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into pci
X-Git-Tag: v0.15.0-rc0~300^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5300f1a5487f67f0bde8ee1081b799108668cb1d;p=thirdparty%2Fqemu.git

Merge remote branch 'origin/master' into pci

Conflicts:
	exec.c
---

5300f1a5487f67f0bde8ee1081b799108668cb1d
diff --cc exec.c
index 0c773a8ad9a,a718d747e77..308a86dcc02
--- a/exec.c
+++ b/exec.c
@@@ -2621,7 -2618,8 +2628,8 @@@ void cpu_register_physical_memory_log(t
      ram_addr_t orig_size = size;
      subpage_t *subpage;
  
+     assert(size);
 -    cpu_notify_set_memory(start_addr, size, phys_offset);
 +    cpu_notify_set_memory(start_addr, size, phys_offset, log_dirty);
  
      if (phys_offset == IO_MEM_UNASSIGNED) {
          region_offset = start_addr;