diff --git a/bochs/.bochsrc b/bochs/.bochsrc
index 41e8ea0af..a6f8c927e 100644
--- a/bochs/.bochsrc
+++ b/bochs/.bochsrc
@@ -590,7 +590,7 @@ log: bochsout.txt
#=======================================================================
# LOG CONTROLS
#
-# Bochs now has four severity levels for event logging.
+# Bochs has four severity levels for event logging.
# panic: cannot proceed. If you choose to continue after a panic,
# don't be surprised if you get strange behavior or crashes.
# error: something went wrong, but it is probably safe to continue the
@@ -605,7 +605,7 @@ log: bochsout.txt
#
# It is also possible to specify the 'action' to do for each Bochs facility
# separately (e.g. crash on panics from everything except the cdrom, and only
-# report those). TODO: add 'log function' module list to the user documentation.
+# report those). See the 'log function' module list in the user documentation.
#
# If you are experiencing many panics, it can be helpful to change
# the panic action to report instead of fatal. However, be aware
diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk
index 9647bdfc1..175cac9ed 100644
--- a/bochs/doc/docbook/user/user.dbk
+++ b/bochs/doc/docbook/user/user.dbk
@@ -5244,58 +5244,351 @@ config file.
Some of the device names reported in the panic message are abbreviations,
- since the length of the names is limited to 5 characters. This small list
- may help you finding out the name of the device that caused the panic.
+ since the length of the 'prefix' is limited to 5 characters. This table
+ may help you finding out the name of the device that caused the panic. It
+ shows the name used for setting up the log actions per device and a short
+ description.
Device prefixes
-
+
Prefix
+ Name
Description
+
+ ACPI
+ ACPI
+ PIIX4 ACPI controller
+
+
+ APIC0
+ apic0
+ APIC of first CPU
+
+
+ BIOS
+ BIOS
+ System BIOS
+
+
+ BUSM
+ busmouse
+ Busmouse
+
+
+ BXVGA
+ BXVGA
+ VGA adapter with VBE support
+
+
+ CD1
+ CD1
+ Lowlevel CD-ROM support for the first device (if configured, there can be CD2, CD3, CD4, ...)
+
CLVGA
+ cirrus
Cirrus SVGA
+
+ CMOS
+ CMOS
+ CMOS RAM + RTC
+
+
+ CPU0
+ cpu0
+ First CPU (SMP emulation can have cpu1, cpu2, cpu3,...)
+
+
+ CTRL
+ siminterface
+ Simulator interface
+
+
+ DEV
+ devices
+ Devices subsystem
+
+
+ DMA
+ DMA
+ DMA controller
+
+
+ E1000
+ E1000
+ Intel(R) Gigabit Ethernet
+
+
+ E1370
+ es1370
+ ES1370 soundcard
+
EFIRQ
+ extfpuirq
External FPU IRQ
+
+ FDD
+ floppy
+ Floppy controller
+
+
+ GAME
+ gameport
+ Standard PC gameport
+
+
+ GDBST
+ GDBST
+ GDB stub support
+
+
+ GUI
+ GUI
+ Generic GUI code
+
+
+ HD
+ harddrv
+ IDE HD/CD emulation
+
+
+ IMG
+ hdimage
+ Disk image support
+
+
+ IO
+ logio
+ Bochs logging subsystem
+
IOAP
+ ioapic
I/O APIC
+
+ IODBG
+ iodebug
+ I/O interface to debugger
+
+
+ KBD
+ keyboard
+ PS/2 keyboard and mouse
+
KMAP
+ keymap
Keyboard mapping
+
+ MEM0
+ memory
+ Memory management
+
+
+ MGUI
+ MGUI
+ MacOS9 / MacOSX gui
+
+
+ NE2K
+ NE2K
+ NE2000 ethernet adapter
+
+
+ NGUI
+ NGUI
+ GUI without input/output interface ("nogui")
+
+
+ OHCI
+ usb_ohci
+ USB OHCI controller
+
P2I
+ pci2isa
PCI-to-ISA bridge
+
+ PAR
+ parallel
+ Parallel port support
+
+
+ PCI
+ PCI
+ i440FX PCI bridge
+
+
+ PCI2H
+ pcidev
+ Host PCI device mapping
+
+
+ PIC
+ PIC
+ Programmable interrupt controller
+
PIDE
+ pci_ide
PCI IDE controller
+ PIT
+ PIT
+ I/O interface for 82C54 timer
+
+
+ PIT81
+ pit82c54
+ 82C54 timer core
+
+
+ PLGIN
PLGIN
Plugin interface
+
+ PNIC
+ pcipnic
+ PCI pseudo NIC
+
+
+ RFB
+ RFB
+ RFB gui
+
+
+ SB16
+ SB16
+ SB16 soundcard
+
+
+ SCSIC
+ SCSIC
+ SCSI CD-ROM emulation for USB
+
+
+ SCSID
+ SCSID
+ SCSI hard drive emulation for USB
+
+
+ SER
+ serial
+ Serial port emulation
+
+
+ SDL
+ SDL
+ SDL gui
+
+
+ SERR
+ serial_raw
+ Lowlevel serial port support
+
+
+ SPEAK
+ speaker
+ Lowlevel support for the PC speaker
+
STIME
+ slowdown_timer
Slowdown timer
+
+ SVGA
+ SVGA
+ SVGA gui
+
+
+ SYS
+ pc_system
+ CPU-to-devices interface and timing control
+
+
+ TGUI
+ TGUI
+ Term gui
+
+
+ UHCI
+ usb_uhci
+ USB UHCI controller
+
UNMP
+ unmappped
Unmapped I/O handler
+
+ USBHI
+ usb_hid
+ USB HID device emulation
+
+
+ USBHB
+ usb_hub
+ External USB hub emulation
+
+
+ USBMS
+ usb_msd
+ USB MSD (disk/cdrom) emulation
+
+
+ USBPR
+ usb_printer
+ USB printer emulation
+
+
+ VBIOS
+ vgabios
+ VGA BIOS
+
+
+ VGA
+ VGA
+ Standard VGA
+
VTIME
+ virt_timer
Virtual timer
+
+ WGUI
+ WGUI
+ WIN32 gui
+
+
+ WX
+ WX
+ wxWidgets gui
+
+
+ XGUI
+ XGUI
+ X11 gui
+
+
+ XHCI
+ usb_xhci
+ USB xHCI controller
+