From patchwork Wed Apr 29 21:20:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 20826 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3TLLPw9009861 for ; Wed, 29 Apr 2009 21:21:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757146AbZD2VVT (ORCPT ); Wed, 29 Apr 2009 17:21:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757447AbZD2VVT (ORCPT ); Wed, 29 Apr 2009 17:21:19 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:33558 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756579AbZD2VVP (ORCPT ); Wed, 29 Apr 2009 17:21:15 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e1.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3TLHiEA016853 for ; Wed, 29 Apr 2009 17:17:44 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3TLLFbi156718 for ; Wed, 29 Apr 2009 17:21:15 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3TLLEv6000956 for ; Wed, 29 Apr 2009 17:21:14 -0400 Received: from localhost.localdomain (sig-9-65-58-151.mts.ibm.com [9.65.58.151]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3TLKdgN031204; Wed, 29 Apr 2009 17:21:12 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH 12/21] Remove odd hack in vga.c Date: Wed, 29 Apr 2009 16:20:29 -0500 Message-Id: <1241040038-17183-13-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org I looked closely at the vga code in kvm-userspace a while ago and merged every fix I could understand into upstream QEMU. This particular change makes no sense to me. I could not figure out from revision history what it actually fixed. I'm fairly certain it's not useful today. Signed-off-by: Anthony Liguori --- hw/vga.c | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index d96f1be..385184a 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2227,33 +2227,14 @@ typedef struct PCIVGAState { VGAState vga_state; } PCIVGAState; -static int s1, s2; - -static void mark_dirty(target_phys_addr_t start, target_phys_addr_t len) -{ - target_phys_addr_t end = start + len; - - while (start < end) { - cpu_physical_memory_set_dirty(cpu_get_physical_page_desc(start)); - start += TARGET_PAGE_SIZE; - } -} - void vga_dirty_log_start(VGAState *s) { if (kvm_enabled() && s->map_addr) - if (!s1) { - kvm_log_start(s->map_addr, s->map_end - s->map_addr); - mark_dirty(s->map_addr, s->map_end - s->map_addr); - s1 = 1; - } + kvm_log_start(s->map_addr, s->map_end - s->map_addr); + if (kvm_enabled() && s->lfb_vram_mapped) { - if (!s2) { - kvm_log_start(isa_mem_base + 0xa0000, 0x8000); - kvm_log_start(isa_mem_base + 0xa8000, 0x8000); - mark_dirty(isa_mem_base + 0xa0000, 0x10000); - } - s2 = 1; + kvm_log_start(isa_mem_base + 0xa0000, 0x8000); + kvm_log_start(isa_mem_base + 0xa8000, 0x8000); } }