Index: stable/10/usr.sbin/bhyve/consport.c
===================================================================
--- stable/10/usr.sbin/bhyve/consport.c	(revision 262226)
+++ stable/10/usr.sbin/bhyve/consport.c	(revision 262227)
@@ -1,141 +1,144 @@
 /*-
  * Copyright (c) 2011 NetApp, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/select.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
 #include <stdbool.h>
 
 #include "inout.h"
+#include "pci_lpc.h"
 
 #define	BVM_CONSOLE_PORT	0x220
 #define	BVM_CONS_SIG		('b' << 8 | 'v')
 
 static struct termios tio_orig, tio_new;
 
 static void
 ttyclose(void)
 {
 	tcsetattr(STDIN_FILENO, TCSANOW, &tio_orig);
 }
 
 static void
 ttyopen(void)
 {
 	tcgetattr(STDIN_FILENO, &tio_orig);
 
 	cfmakeraw(&tio_new);
 	tcsetattr(STDIN_FILENO, TCSANOW, &tio_new);	
 
 	atexit(ttyclose);
 }
 
 static bool
 tty_char_available(void)
 {
         fd_set rfds;
         struct timeval tv;
 
         FD_ZERO(&rfds);
         FD_SET(STDIN_FILENO, &rfds);
         tv.tv_sec = 0;
         tv.tv_usec = 0;
         if (select(STDIN_FILENO + 1, &rfds, NULL, NULL, &tv) > 0) {
 		return (true);
 	} else {
 		return (false);
 	}
 }
 
 static int
 ttyread(void)
 {
 	char rb;
 
 	if (tty_char_available()) {
 		read(STDIN_FILENO, &rb, 1);
 		return (rb & 0xff);
 	} else {
 		return (-1);
 	}
 }
 
 static void
 ttywrite(unsigned char wb)
 {
 	(void) write(STDOUT_FILENO, &wb, 1);
 }
 
 static int
 console_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 		uint32_t *eax, void *arg)
 {
 	static int opened;
 
 	if (bytes == 2 && in) {
 		*eax = BVM_CONS_SIG;
 		return (0);
 	}
 
 	if (bytes != 4)
 		return (-1);
 
 	if (!opened) {
 		ttyopen();
 		opened = 1;
 	}
 	
 	if (in)
 		*eax = ttyread();
 	else
 		ttywrite(*eax);
 
 	return (0);
 }
+
+SYSRES_IO(BVM_CONSOLE_PORT, 4);
 
 static struct inout_port consport = {
 	"bvmcons",
 	BVM_CONSOLE_PORT,
 	1,
 	IOPORT_F_INOUT,
 	console_handler
 };
 
 void
 init_bvmcons(void)
 {
 
 	register_inout(&consport);
 }
Index: stable/10/usr.sbin/bhyve/dbgport.c
===================================================================
--- stable/10/usr.sbin/bhyve/dbgport.c	(revision 262226)
+++ stable/10/usr.sbin/bhyve/dbgport.c	(revision 262227)
@@ -1,139 +1,142 @@
 /*-
  * Copyright (c) 2011 NetApp, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/uio.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 
 #include "inout.h"
 #include "dbgport.h"
+#include "pci_lpc.h"
 
 #define	BVM_DBG_PORT	0x224
 #define	BVM_DBG_SIG	('B' << 8 | 'V')
 
 static int listen_fd, conn_fd;
 
 static struct sockaddr_in sin;
 
 static int
 dbg_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 	    uint32_t *eax, void *arg)
 {
 	char ch;
 	int nwritten, nread, printonce;
 
 	if (bytes == 2 && in) {
 		*eax = BVM_DBG_SIG;
 		return (0);
 	}
 
 	if (bytes != 4)
 		return (-1);
 
 again:
 	printonce = 0;
 	while (conn_fd < 0) {
 		if (!printonce) {
 			printf("Waiting for connection from gdb\r\n");
 			printonce = 1;
 		}
 		conn_fd = accept(listen_fd, NULL, NULL);
 		if (conn_fd >= 0)
 			fcntl(conn_fd, F_SETFL, O_NONBLOCK);
 		else if (errno != EINTR)
 			perror("accept");
 	}
 
 	if (in) {
 		nread = read(conn_fd, &ch, 1);
 		if (nread == -1 && errno == EAGAIN)
 			*eax = -1;
 		else if (nread == 1)
 			*eax = ch;
 		else {
 			close(conn_fd);
 			conn_fd = -1;
 			goto again;
 		}
 	} else {
 		ch = *eax;
 		nwritten = write(conn_fd, &ch, 1);
 		if (nwritten != 1) {
 			close(conn_fd);
 			conn_fd = -1;
 			goto again;
 		}
 	}
 	return (0);
 }
 
 static struct inout_port dbgport = {
 	"bvmdbg",
 	BVM_DBG_PORT,
 	1,
 	IOPORT_F_INOUT,
 	dbg_handler
 };
+
+SYSRES_IO(BVM_DBG_PORT, 4);
 
 void
 init_dbgport(int sport)
 {
 	conn_fd = -1;
 
 	if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		perror("socket");
 		exit(1);
 	}
 
 	sin.sin_len = sizeof(sin);
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = htonl(INADDR_ANY);
 	sin.sin_port = htons(sport);
 
 	if (bind(listen_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		perror("bind");
 		exit(1);
 	}
 
 	if (listen(listen_fd, 1) < 0) {
 		perror("listen");
 		exit(1);
 	}
 
 	register_inout(&dbgport);
 }
Index: stable/10
===================================================================
--- stable/10	(revision 262226)
+++ stable/10	(revision 262227)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r261607