From patchwork Wed Aug 17 22:41:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 110415 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 01354B6F7D for ; Thu, 18 Aug 2011 08:42:25 +1000 (EST) Received: from localhost ([::1]:52940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtooY-00057C-Ee for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2011 18:42:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtooL-0004sp-Km for qemu-devel@nongnu.org; Wed, 17 Aug 2011 18:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtooK-0005pc-EB for qemu-devel@nongnu.org; Wed, 17 Aug 2011 18:42:09 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:53774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtooJ-0005pQ-OX for qemu-devel@nongnu.org; Wed, 17 Aug 2011 18:42:08 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate02.web.de (Postfix) with ESMTP id 12AD51A8CC86E; Thu, 18 Aug 2011 00:42:07 +0200 (CEST) Received: from [216.123.155.199] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QtooI-000511-00; Thu, 18 Aug 2011 00:42:06 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Wed, 17 Aug 2011 15:41:01 -0700 Message-Id: <00da5c78b143e9f1543a64ad0dd88c5dd47ca223.1313620857.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/FliW3+9PrajQYPicq3Oa8+kqmgIU5kWySt69g iNWgcI1rFRBzR0VeIxuc1K2Jf/rKIma8zpvolOLBPbM+IplK43 65QyGevBA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: Avi Kivity Subject: [Qemu-devel] [PATCH v2 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 From: Jan Kiszka 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 33dc478..fe481dd 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1533,12 +1533,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 100d98c..6fc23a6 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 0c94ef1..475829e 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1173,8 +1173,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 */