From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH] qemu-unregister-c0000.patch
Date: Mon, 23 May 2005 17:15:58 -0700
Message-ID: <20050524001558.GA24432@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

QEMU fixes

 - VMX domain owns 0xcxxxx. 
 - guard the fprintf with a log level check

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

--- 1.1/tools/ioemu/hw/pc.c	2005-05-19 15:04:52 -07:00
+++ edited/tools/ioemu/hw/pc.c	2005-05-23 16:37:18 -07:00
@@ -419,11 +419,11 @@
     ret = load_image(buf, phys_ram_base + vga_bios_offset);
 #endif 
 
+#ifndef NOBIOS
     /* setup basic memory access */
     cpu_register_physical_memory(0xc0000, 0x10000, 
                                  vga_bios_offset | IO_MEM_ROM);
 
-#ifndef NOBIOS
     /* map the last 128KB of the BIOS in ISA space */
     isa_bios_size = bios_size;
     if (isa_bios_size > (128 * 1024))
===== tools/ioemu/target-i386-dm/helper2.c 1.2 vs edited =====
--- 1.2/tools/ioemu/target-i386-dm/helper2.c	2005-05-20 10:01:22 -07:00
+++ edited/tools/ioemu/target-i386-dm/helper2.c	2005-05-23 16:35:40 -07:00
@@ -313,7 +313,8 @@
 
 	intr = &(((vcpu_iodata_t *) shared_page)->vp_intr[0]);
 	atomic_set_bit(vector, intr);
-        fprintf(logfile, "injecting vector: %x\n", vector);
+        if (loglevel & CPU_LOG_INT)
+                fprintf(logfile, "injecting vector: %x\n", vector);
 	env->send_event = 1;
 }