From patchwork Tue Jun 14 16:53:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 100383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 90FE3B6F9C for ; Wed, 15 Jun 2011 03:19:46 +1000 (EST) Received: from localhost ([::1]:45929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWXHC-0007p7-BX for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2011 13:19:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWWsB-0001ku-9J for qemu-devel@nongnu.org; Tue, 14 Jun 2011 12:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWWs7-0005N7-Fz for qemu-devel@nongnu.org; Tue, 14 Jun 2011 12:53:50 -0400 Received: from goliath.siemens.de ([192.35.17.28]:34737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWWs6-0005MM-C8 for qemu-devel@nongnu.org; Tue, 14 Jun 2011 12:53:46 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p5EGri61028844; Tue, 14 Jun 2011 18:53:44 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p5EGrhK5024105; Tue, 14 Jun 2011 18:53:44 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Tue, 14 Jun 2011 18:53:30 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 01/13] spice: Use cpu_register_physical_memory_log for dirty log enabling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Drop outdated dirty log disable/enable around PCI remapping and register the BAR for dirty logging via cpu_register_physical_memory_log. That allows to remove all vga_dirty_log_start/stop references from qxl. Note: The addtional vga_dirty_log_start for the primary interface looked stray. qxl_write_config enabled logging for all interfaces anyway. CC: Gerd Hoffmann Signed-off-by: Jan Kiszka --- hw/qxl.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 1906e84..eba1ff9 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -619,12 +619,10 @@ static void qxl_write_config(PCIDevice *d, uint32_t address, PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, d); VGACommonState *vga = &qxl->vga; - vga_dirty_log_stop(vga); pci_default_write_config(d, address, val, len); if (vga->map_addr && qxl->pci.io_regions[0].addr == -1) { vga->map_addr = 0; } - vga_dirty_log_start(vga); } static void qxl_check_state(PCIQXLDevice *d) @@ -1037,12 +1035,11 @@ static void qxl_map(PCIDevice *pci, int region_num, qxl->io_base = addr; break; case QXL_RAM_RANGE_INDEX: - cpu_register_physical_memory(addr, size, qxl->vga.vram_offset | IO_MEM_RAM); + cpu_register_physical_memory_log(addr, size, + qxl->vga.vram_offset | IO_MEM_RAM, + 0, true); qxl->vga.map_addr = addr; qxl->vga.map_end = addr + size; - if (qxl->id == 0) { - vga_dirty_log_start(&qxl->vga); - } break; case QXL_ROM_RANGE_INDEX: cpu_register_physical_memory(addr, size, qxl->rom_offset | IO_MEM_ROM);