From patchwork Mon Aug 22 17:12:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 110966 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 D243BB6F77 for ; Tue, 23 Aug 2011 03:28:48 +1000 (EST) Received: from localhost ([::1]:47464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvYIn-00074a-Ig for incoming@patchwork.ozlabs.org; Mon, 22 Aug 2011 13:28:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvYIf-0006j3-7O for qemu-devel@nongnu.org; Mon, 22 Aug 2011 13:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvYIe-00075J-1p for qemu-devel@nongnu.org; Mon, 22 Aug 2011 13:28:37 -0400 Received: from david.siemens.de ([192.35.17.14]:16036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvYId-000758-Hx for qemu-devel@nongnu.org; Mon, 22 Aug 2011 13:28:35 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p7MHCDal008437; Mon, 22 Aug 2011 19:12:13 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p7MHCCcx030106; Mon, 22 Aug 2011 19:12:13 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Mon, 22 Aug 2011 19:12:11 +0200 Message-Id: <4930e7997bb166d8019ded223be28c47a3499a8b.1314033132.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 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.14 Cc: Avi Kivity Subject: [Qemu-devel] [PATCH v3 4/6] vmware-vga: Eliminate vga_dirty_log_restart 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 After the conversion to the new Memory API, vga_dirty_log_restart became seriously pointless. Remove it from vmware-vga and and then finally drop the service. CC: Andrzej Zaborowski CC: Avi Kivity Signed-off-by: Jan Kiszka --- hw/vga.c | 6 ------ hw/vga_int.h | 1 - hw/vmware_vga.c | 2 -- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index b0371d5..432d2cb 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1532,12 +1532,6 @@ void vga_dirty_log_stop(VGACommonState *s) memory_region_set_log(&s->vram, false, DIRTY_MEMORY_VGA); } -void vga_dirty_log_restart(VGACommonState *s) -{ - vga_dirty_log_stop(s); - vga_dirty_log_start(s); -} - /* * graphic modes */ diff --git a/hw/vga_int.h b/hw/vga_int.h index 7e4ed71..d2dd7dd 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -193,7 +193,6 @@ void vga_common_reset(VGACommonState *s); void vga_dirty_log_start(VGACommonState *s); void vga_dirty_log_stop(VGACommonState *s); -void vga_dirty_log_restart(VGACommonState *s); extern const VMStateDescription vmstate_vga_common; uint32_t vga_ioport_read(void *opaque, uint32_t addr); diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 95c9897..52d2d26 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1175,8 +1175,6 @@ static int pci_vmsvga_initfn(PCIDevice *dev) iomem = &s->chip.vga.vram; - vga_dirty_log_restart(&s->chip.vga); - s->card.config[PCI_CACHE_LINE_SIZE] = 0x08; /* Cache line size */ s->card.config[PCI_LATENCY_TIMER] = 0x40; /* Latency timer */ s->card.config[PCI_INTERRUPT_LINE] = 0xff; /* End */