From owner-svn-soc-all@FreeBSD.ORG  Tue Jul  3 19:59:35 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id E0262106566C
	for <svn-soc-all@FreeBSD.org>; Tue,  3 Jul 2012 19:59:32 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 03 Jul 2012 19:59:32 +0000
Date: Tue, 03 Jul 2012 19:59:32 +0000
From: syuu@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120703195932.E0262106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238929 - soc2012/syuu/bhyve-bios/usr.sbin/bhyve
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 19:59:35 -0000

Author: syuu
Date: Tue Jul  3 19:59:32 2012
New Revision: 238929
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238929

Log:
  Null handler for INT 18h

Modified:
  soc2012/syuu/bhyve-bios/usr.sbin/bhyve/Makefile
  soc2012/syuu/bhyve-bios/usr.sbin/bhyve/fbsdrun.c

Modified: soc2012/syuu/bhyve-bios/usr.sbin/bhyve/Makefile
==============================================================================
--- soc2012/syuu/bhyve-bios/usr.sbin/bhyve/Makefile	Tue Jul  3 19:26:29 2012	(r238928)
+++ soc2012/syuu/bhyve-bios/usr.sbin/bhyve/Makefile	Tue Jul  3 19:59:32 2012	(r238929)
@@ -8,7 +8,7 @@
 SRCS+=  instruction_emul.c mevent.c
 SRCS+=	pci_emul.c pci_hostbridge.c pci_passthru.c pci_virtio_block.c
 SRCS+=	pci_virtio_net.c pci_uart.c pit_8254.c post.c rtc.c uart.c xmsr.c
-SRCS+=  bios_call.c bios_int10.c
+SRCS+=  bios_call.c bios_int10.c bios_int18.c
 
 NO_MAN=
 

Modified: soc2012/syuu/bhyve-bios/usr.sbin/bhyve/fbsdrun.c
==============================================================================
--- soc2012/syuu/bhyve-bios/usr.sbin/bhyve/fbsdrun.c	Tue Jul  3 19:26:29 2012	(r238928)
+++ soc2012/syuu/bhyve-bios/usr.sbin/bhyve/fbsdrun.c	Tue Jul  3 19:59:32 2012	(r238929)
@@ -445,8 +445,8 @@
 	}
 		
 	if (emulate_bios_call(ctx, *pvcpu, intno) != 0) {
-		fprintf(stderr, "Failed to emulate BIOS call at 0x%lx\n", 
-			vmexit->rip);
+		fprintf(stderr, "Failed to emulate INT %x at 0x%lx\n", 
+			intno, vmexit->rip);
 		return (VMEXIT_ABORT);
 	}