From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Mpico-0004bI-8m
	for qemu-devel@nongnu.org; Mon, 21 Sep 2009 09:08:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Mpici-0004Yl-DY
	for qemu-devel@nongnu.org; Mon, 21 Sep 2009 09:08:13 -0400
Received: from [199.232.76.173] (port=38464 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Mpici-0004YY-4D
	for qemu-devel@nongnu.org; Mon, 21 Sep 2009 09:08:08 -0400
Received: from thoth.sbs.de ([192.35.17.2]:17157)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1Mpich-0006qe-Gg
	for qemu-devel@nongnu.org; Mon, 21 Sep 2009 09:08:07 -0400
Message-ID: <4AB77AB1.6030205@siemens.com>
Date: Mon, 21 Sep 2009 15:08:01 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <cover.1253536404.git.quintela@redhat.com>
	<92ddcd593bbf9a49155e1bc8d3b60cde1663436e.1253536405.git.quintela@redhat.com>
In-Reply-To: <92ddcd593bbf9a49155e1bc8d3b60cde1663436e.1253536405.git.quintela@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 2/2] vga: move back dirty_log functions to
	vga.c
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: Juan Quintela <quintela@redhat.com>
Cc: qemu-devel@nongnu.org

Juan Quintela wrote:
> They are needed there on qemu-kvm.

Well, my real argument still is that they are not PCI-specific, even if
they are currently only used by PCI-based adapters.

Acked-by: Jan Kiszka <jan.kiszka@siemens.com>

Thanks,
Jan

> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  hw/vga-pci.c |   12 ------------
>  hw/vga.c     |   12 ++++++++++++
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/vga-pci.c b/hw/vga-pci.c
> index 6038cec..ccc78e5 100644
> --- a/hw/vga-pci.c
> +++ b/hw/vga-pci.c
> @@ -28,7 +28,6 @@
>  #include "vga_int.h"
>  #include "pixel_ops.h"
>  #include "qemu-timer.h"
> -#include "kvm.h"
> 
>  typedef struct PCIVGAState {
>      PCIDevice dev;
> @@ -59,17 +58,6 @@ static int pci_vga_load(QEMUFile *f, void *opaque, int version_id)
>      return vga_common_load(f, &s->vga, version_id);
>  }
> 
> -void vga_dirty_log_start(VGACommonState *s)
> -{
> -    if (kvm_enabled() && s->map_addr)
> -        kvm_log_start(s->map_addr, s->map_end - s->map_addr);
> -
> -    if (kvm_enabled() && s->lfb_vram_mapped) {
> -        kvm_log_start(isa_mem_base + 0xa0000, 0x8000);
> -        kvm_log_start(isa_mem_base + 0xa8000, 0x8000);
> -    }
> -}
> -
>  static void vga_map(PCIDevice *pci_dev, int region_num,
>                      uint32_t addr, uint32_t size, int type)
>  {
> diff --git a/hw/vga.c b/hw/vga.c
> index 514371c..6cbd3d3 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -28,6 +28,7 @@
>  #include "vga_int.h"
>  #include "pixel_ops.h"
>  #include "qemu-timer.h"
> +#include "kvm.h"
> 
>  //#define DEBUG_VGA
>  //#define DEBUG_VGA_MEM
> @@ -1576,6 +1577,17 @@ static void vga_sync_dirty_bitmap(VGACommonState *s)
>      }
>  }
> 
> +void vga_dirty_log_start(VGACommonState *s)
> +{
> +    if (kvm_enabled() && s->map_addr)
> +        kvm_log_start(s->map_addr, s->map_end - s->map_addr);
> +
> +    if (kvm_enabled() && s->lfb_vram_mapped) {
> +        kvm_log_start(isa_mem_base + 0xa0000, 0x8000);
> +        kvm_log_start(isa_mem_base + 0xa8000, 0x8000);
> +    }
> +}
> +
>  /*
>   * graphic modes
>   */

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux