summaryrefslogtreecommitdiffstats
path: root/share/examples
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2013-10-29 00:18:11 +0000
committerneel <neel@FreeBSD.org>2013-10-29 00:18:11 +0000
commitd070810920804ed2e9d01852678f71e040b11111 (patch)
tree47128869b5c253f570744e0fafa81de84f18758b /share/examples
parent2408916435d4e7b386518f4f13de0c4c8359018c (diff)
downloadFreeBSD-src-d070810920804ed2e9d01852678f71e040b11111.zip
FreeBSD-src-d070810920804ed2e9d01852678f71e040b11111.tar.gz
Add support for PCI-to-ISA LPC bridge emulation. If the LPC bus is attached
to a virtual machine then we implicitly create COM1 and COM2 ISA devices. Prior to this change the only way of attaching a COM port to the virtual machine was by presenting it as a PCI device that is mapped at the legacy I/O address 0x3F8 or 0x2F8. There were some issues with the original approach: - It did not work at all with UEFI because UEFI will reprogram the PCI device BARs and remap the COM1/COM2 ports at non-legacy addresses. - OpenBSD GENERIC kernel does not create a /dev/console because it expects the uart device at the legacy 0x3F8/0x2F8 address to be an ISA device. - It was functional with a FreeBSD guest but caused the console to appear on /dev/ttyu2 which was not intuitive. The uart emulation is now independent of the bus on which it resides. Thus it is possible to have uart devices on the PCI bus in addition to the legacy COM1/COM2 devices behind the LPC bus. The command line option to attach ISA COM1/COM2 ports to a virtual machine is "-s <bus>,lpc -l com1,stdio". The command line option to create a PCI-attached uart device is: "-s <bus>,uart[,stdio]" The command line option to create PCI-attached COM1/COM2 device is: "-S <bus>,uart[,stdio]". This style of creating COM ports is deprecated. Discussed with: grehan Reviewed by: grehan Submitted by: Tycho Nightingale (tycho.nightingale@pluribusnetworks.com) M share/examples/bhyve/vmrun.sh AM usr.sbin/bhyve/legacy_irq.c AM usr.sbin/bhyve/legacy_irq.h M usr.sbin/bhyve/Makefile AM usr.sbin/bhyve/uart_emul.c M usr.sbin/bhyve/bhyverun.c AM usr.sbin/bhyve/uart_emul.h M usr.sbin/bhyve/pci_uart.c M usr.sbin/bhyve/pci_emul.c M usr.sbin/bhyve/inout.c M usr.sbin/bhyve/pci_emul.h M usr.sbin/bhyve/inout.h AM usr.sbin/bhyve/pci_lpc.c AM usr.sbin/bhyve/pci_lpc.h
Diffstat (limited to 'share/examples')
-rwxr-xr-xshare/examples/bhyve/vmrun.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index edb6048..94aa76b 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -162,7 +162,7 @@ while [ 1 ]; do
exit 1
fi
BOOTDISK=${isofile}
- installer_opt="-s 3:0,virtio-blk,${BOOTDISK}"
+ installer_opt="-s 31:0,virtio-blk,${BOOTDISK}"
else
BOOTDISK=${virtio_diskdev}
installer_opt=""
@@ -176,10 +176,11 @@ while [ 1 ]; do
${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -AI -H -P \
-g ${gdbport} \
-s 0:0,hostbridge \
- -s 1:0,virtio-net,${tapdev} \
- -s 2:0,virtio-blk,${virtio_diskdev} \
+ -s 1:0,lpc \
+ -s 2:0,virtio-net,${tapdev} \
+ -s 3:0,virtio-blk,${virtio_diskdev} \
+ -l com1,stdio \
${installer_opt} \
- -S 31,uart,stdio \
${vmname}
if [ $? -ne 0 ]; then
break
OpenPOWER on IntegriCloud