From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JL4SR-00079S-E0
	for qemu-devel@nongnu.org; Fri, 01 Feb 2008 17:34:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JL4SN-00077z-QO
	for qemu-devel@nongnu.org; Fri, 01 Feb 2008 17:34:02 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JL4SN-00077w-Kp
	for qemu-devel@nongnu.org; Fri, 01 Feb 2008 17:33:59 -0500
Received: from rv-out-0910.google.com ([209.85.198.185])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1JL4SN-0005kl-4g
	for qemu-devel@nongnu.org; Fri, 01 Feb 2008 17:33:59 -0500
Received: by rv-out-0910.google.com with SMTP id g11so2703035rvb.22
	for <qemu-devel@nongnu.org>; Fri, 01 Feb 2008 14:33:56 -0800 (PST)
Message-ID: <47A39BF8.2040602@codemonkey.ws>
Date: Fri, 01 Feb 2008 16:23:52 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1201903921-1125-1-git-send-email-aliguori@us.ibm.com>
	<1201903921-1125-2-git-send-email-aliguori@us.ibm.com>
In-Reply-To: <1201903921-1125-2-git-send-email-aliguori@us.ibm.com>
Content-Type: multipart/mixed; boundary="------------070400080704010702070002"
Subject: [Qemu-devel] Re: [PATCH 1/6] Fix VMware VGA init call
Reply-To: qemu-devel@nongnu.org
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: Anthony Liguori <aliguori@us.ibm.com>
Cc: kvm-devel@lists.sourceforge.net, Paul Brook <paul@codesourcery.com>, qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------070400080704010702070002
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

And attached is v2 which updates both uses of ram_size instead of just 
the one :-)

Regards,

Anthony Liguori

Anthony Liguori wrote:
> This was never corrected during the ram_alloc() conversion.
>
> Index: qemu/hw/pc.c
> ===================================================================
> --- qemu.orig/hw/pc.c	2008-02-01 10:01:47.000000000 -0600
> +++ qemu/hw/pc.c	2008-02-01 10:57:01.000000000 -0600
> @@ -869,7 +869,7 @@
>      } else if (vmsvga_enabled) {
>          if (pci_enabled)
>              pci_vmsvga_init(pci_bus, ds, phys_ram_base + ram_size,
> -                            ram_size, vga_ram_size);
> +                            vga_ram_addr, vga_ram_size);
>          else
>              fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
>      } else {
>   


--------------070400080704010702070002
Content-Type: text/x-patch;
 name="pci_vmsgva_init_fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="pci_vmsgva_init_fix.diff"

Subject: [PATCH 1/6] Fix VMware VGA init call (v2)
Cc: Avi Kivity <avi@qumranet.com>
Cc: Fabrice Bellard <fabrice@bellard.org>
Cc: Paul Brook <paul@codesourcery.com>
Cc: kvm-devel@lists.sourceforge.net

This was never corrected during the ram_alloc() conversion.

Since v1, we update both uses of ram_size.

Index: qemu/hw/pc.c
===================================================================
--- qemu.orig/hw/pc.c	2008-02-01 16:21:40.000000000 -0600
+++ qemu/hw/pc.c	2008-02-01 16:22:04.000000000 -0600
@@ -868,8 +868,8 @@
         }
     } else if (vmsvga_enabled) {
         if (pci_enabled)
-            pci_vmsvga_init(pci_bus, ds, phys_ram_base + ram_size,
-                            ram_size, vga_ram_size);
+            pci_vmsvga_init(pci_bus, ds, phys_ram_base + vga_ram_size,
+                            vga_ram_addr, vga_ram_size);
         else
             fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
     } else {

--------------070400080704010702070002--