From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LiBqt-0004Ly-VY
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 14:11:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LiBqt-0004LI-8Y
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 14:11:23 -0400
Received: from [199.232.76.173] (port=57203 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LiBqt-0004LE-4f
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 14:11:23 -0400
Received: from savannah.gnu.org ([199.232.41.3]:37033 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LiBqs-00021B-OV
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 14:11:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LiBqs-00081g-7P
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 18:11:22 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LiBqr-00081Z-U3
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 18:11:22 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LiBqr-00081Z-U3@cvs.savannah.gnu.org>
Date: Fri, 13 Mar 2009 18:11:21 +0000
Subject: [Qemu-devel] [6854] temporarily disable logging around pci config
	writes (Avi Kivity)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6854
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6854
Author:   aliguori
Date:     2009-03-13 18:11:21 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
temporarily disable logging around pci config writes (Avi Kivity)

A pci config write may remap the vga linear frame buffer, confusing the
memory slot dirty logging logic.

Fixed Windows with -vga std.

Signed-off-by: Avi Kivity <avi@redhat.com>
Sigend-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    branches/stable_0_10_0/hw/vga.c

Modified: branches/stable_0_10_0/hw/vga.c
===================================================================
--- branches/stable_0_10_0/hw/vga.c	2009-03-13 18:11:17 UTC (rev 6853)
+++ branches/stable_0_10_0/hw/vga.c	2009-03-13 18:11:21 UTC (rev 6854)
@@ -2482,6 +2482,17 @@
     return 0;
 }
 
+static void pci_vga_write_config(PCIDevice *d,
+                                 uint32_t address, uint32_t val, int len)
+{
+    PCIVGAState *pvs = container_of(d, PCIVGAState, dev);
+    VGAState *s = &pvs->vga_state;
+
+    vga_dirty_log_stop(s);
+    pci_default_write_config(d, address, val, len);
+    vga_dirty_log_start(s);
+}
+
 int pci_vga_init(PCIBus *bus, uint8_t *vga_ram_base,
                  unsigned long vga_ram_offset, int vga_ram_size,
                  unsigned long vga_bios_offset, int vga_bios_size)
@@ -2492,7 +2503,7 @@
 
     d = (PCIVGAState *)pci_register_device(bus, "VGA",
                                            sizeof(PCIVGAState),
-                                           -1, NULL, NULL);
+                                           -1, NULL, pci_vga_write_config);
     if (!d)
         return -1;
     s = &d->vga_state;