mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some release preparations:

Browse Source 
- Added warnings for currently not maintained features in the configure script,
  the bochsrc sample and the user doc.
- Removed detection of deprecated bochsrc options "i440fxsupport" and
  "vga_update_interval".
- Legacy bochsrc option "user_shortcut" is now deprecated.
- Removed deprecated configure option --enable-misaligned-sse from user doc.
- Updated some TODO items.
This commit is contained in:
Volker Ruppert 2017-03-21 20:12:07 +00:00
parent a78cb399ac
commit fef9a3b3f7
8 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/.bochsrc
View File

@ -1159,6 +1159,7 @@ speaker: enabled=1, mode=sound
#=======================================================================
# PCIDEV:
# PCI host device mapping
# WARNING: This Bochs feature is not maintained yet and may fail.
#=======================================================================
#pcidev: vendor=0x1234, device=0x5678
@ -1166,6 +1167,7 @@ speaker: enabled=1, mode=sound
# GDBSTUB:
# Enable GDB stub. See user documentation for details.
# Default value is enabled=0.
# WARNING: This Bochs feature is not maintained yet and may fail.
#=======================================================================
#gdbstub: enabled=0, port=1234, text_base=0, data_base=0, bss_base=0

1
bochs/CHANGES
View File

@ -18,6 +18,7 @@ Detailed change log :
- Configure and compile
- Added Android host platform support.
- Configure script now prints warnings for features not maintained yet.
- GUI and display libraries
- Show the runtime configuration in the Bochs VGA window (gui console) instead

11
bochs/TODO
View File

@ -69,7 +69,8 @@ Some of the basic work is done now: The config parameter handling has
been rewritten to a parameter tree and user-defined bochsrc options are now
supported. For most of the optional plugins the config parameter creation and
bochsrc parsing has been moved to the plugin code. Unknown bochsrc options are
now treated as plugin names and Bochs tries to load them.
now treated as plugin names and Bochs tries to load them. The network and
sound modules are now separate plugins.
4. PCI host<->guest proxy
Being able to use a real pci device from inside Bochs would be a
@ -108,7 +109,9 @@ instructions on getting this working.
Status:
The pnic device is present in SVN, but the status is unknown. PCI boot ROM support
has been added for Bochs 2.6. Built-in 'slirp' support for user mode networking
has been added in Bochs 2.6.5.
has been added in Bochs 2.6.5. The 'socket' networking module has been added
in Bochs 2.6.9. It allows interconnecting Bochs instances with multi-port
ethernet hub.
8. Bios
8.1 add "jump table placeholder" and log missing function calls in the bios.
@ -140,8 +143,8 @@ Ben Lunt has been working on USB support. The USB mouse and keypad code
is present in Bochs and almost stable. USB flash disk support has been
started and the runtime device change support should be completed.
Status:
OHCI and UHCI host controller and 7 devices are known to work in Bochs.
USB xHCI support is present, but needs more testing.
OHCI and UHCI host controller and 8 devices are known to work in Bochs.
USB EHCI and xHCI support is now also present.
12. Config file
Benjamen R. Meyer wrote :

27
bochs/config.cc
View File

@ -2259,20 +2259,16 @@ int bx_parse_nic_params(const char *context, const char *param, bx_list_c *base)
bx_bool is_deprecated_option(const char *oldparam, const char **newparam)
{
if (!strcmp(oldparam, "i440fxsupport")) {
// replaced v2.5 / removed v2.6.1
*newparam = "pci";
return 1;
} else if (!strcmp(oldparam, "vga_update_interval")) {
// replaced v2.5 / removed v2.6.1
*newparam = "vga";
return 1;
} else if ((!strcmp(oldparam, "keyboard_serial_delay")) ||
if ((!strcmp(oldparam, "keyboard_serial_delay")) ||
(!strcmp(oldparam, "keyboard_paste_delay")) ||
(!strcmp(oldparam, "keyboard_type")) ||
(!strcmp(oldparam, "keyboard_mapping")) ||
(!strcmp(oldparam, "keyboardmapping"))) {
// replaced v2.6 / removed v2.6.6 SVN
// replaced v2.6 / removed v2.6.7
*newparam = "keyboard";
return 1;
} else if (!strcmp(oldparam, "user_shortcut")) {
// replaced v2.6.1 / removed v2.6.9
*newparam = "keyboard";
return 1;
#if BX_SUPPORT_PCIPNIC
@ -3020,17 +3016,6 @@ static int parse_line_formatted(const char *context, int num_params, char *param
}
SIM->get_param_string(BXPN_LOAD32BITOS_INITRD)->set(&params[4][7]);
}
} else if (!strcmp(params[0], "user_shortcut")) {
// handled by 'keyboard' option since Bochs 2.6.1
if (num_params != 2) {
PARSE_ERR(("%s: user_shortcut directive: wrong # args.", context));
}
if(!strncmp(params[1], "keys=", 4)) {
SIM->get_param_string(BXPN_USER_SHORTCUT)->set(&params[1][5]);
} else {
PARSE_ERR(("%s: user_shortcut directive malformed.", context));
}
PARSE_WARN(("%s: 'user_shortcut' will be replaced by new 'keyboard' option.", context));
} else if (!strcmp(params[0], "user_plugin")) {
#if BX_PLUGINS
char tmpname[80];

12
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 13109 2017-03-12 07:48:08Z vruppert .
# From configure.in Id: configure.in 13117 2017-03-15 16:51:32Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -22461,6 +22461,8 @@ $as_echo "yes" >&6; }
if test "$bx_debugger" = 1; then
as_fn_error $? "--enable-debugger and --enable-gdb-stub are mutually exclusive" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Bochs feature is not maintained yet and may fail" >&5
$as_echo "$as_me: WARNING: This Bochs feature is not maintained yet and may fail" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@ -23351,6 +23353,8 @@ $as_echo "$as_me: Linux detected as host for PCI host device mapping" >&6;}
$as_echo "#define BX_SUPPORT_PCIDEV 1" >>confdefs.h
PCI_OBJS="$PCI_OBJS pcidev.o"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Bochs feature is not maintained yet and may fail" >&5
$as_echo "$as_me: WARNING: This Bochs feature is not maintained yet and may fail" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@ -24691,6 +24695,8 @@ if test "$with_svga" = yes; then
GUI_CFLAGS="$GUI_CFLAGS"
GUI_CXXFLAGS="$GUI_CXXFLAGS"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SVGA)"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Bochs feature is not maintained yet and may fail" >&5
$as_echo "$as_me: WARNING: This Bochs feature is not maintained yet and may fail" >&2;}
fi
if test "$with_rfb" = yes; then
@ -24803,6 +24809,8 @@ if test "$with_macos" = yes; then
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_MACOS)"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_MACOS)"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Bochs feature is not maintained yet and may fail" >&5
$as_echo "$as_me: WARNING: This Bochs feature is not maintained yet and may fail" >&2;}
fi
if test "$with_carbon" = yes; then
@ -24817,6 +24825,8 @@ if test "$with_carbon" = yes; then
PRIMARY_TARGET=bochs.app/.build # only for carbon application
fi
INSTALL_TARGET='install_macosx'
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This Bochs feature is not maintained yet and may fail" >&5
$as_echo "$as_me: WARNING: This Bochs feature is not maintained yet and may fail" >&2;}
fi
if test "$with_term" = yes; then

5
bochs/configure.in
View File

@ -894,6 +894,7 @@ AC_ARG_ENABLE(gdb-stub,
if test "$bx_debugger" = 1; then
AC_MSG_ERROR([[--enable-debugger and --enable-gdb-stub are mutually exclusive]])
fi
AC_MSG_WARN([This Bochs feature is not maintained yet and may fail])
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_GDBSTUB, 0)
@ -1508,6 +1509,7 @@ AC_ARG_ENABLE(pcidev,
esac
AC_DEFINE(BX_SUPPORT_PCIDEV, 1)
PCI_OBJS="$PCI_OBJS pcidev.o"
AC_MSG_WARN([This Bochs feature is not maintained yet and may fail])
else
AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_PCIDEV, 0)
@ -2459,6 +2461,7 @@ if test "$with_svga" = yes; then
GUI_CFLAGS="$GUI_CFLAGS"
GUI_CXXFLAGS="$GUI_CXXFLAGS"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SVGA)"
AC_MSG_WARN([This Bochs feature is not maintained yet and may fail])
fi
if test "$with_rfb" = yes; then
@ -2526,6 +2529,7 @@ if test "$with_macos" = yes; then
AC_DEFINE(BX_WITH_MACOS, 1)
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_MACOS)"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_MACOS)"
AC_MSG_WARN([This Bochs feature is not maintained yet and may fail])
fi
if test "$with_carbon" = yes; then
@ -2539,6 +2543,7 @@ if test "$with_carbon" = yes; then
PRIMARY_TARGET=bochs.app/.build # only for carbon application
fi
INSTALL_TARGET='install_macosx'
AC_MSG_WARN([This Bochs feature is not maintained yet and may fail])
fi
if test "$with_term" = yes; then

17
bochs/doc/docbook/user/user.dbk
View File

@ -1985,6 +1985,7 @@ In Bochs 1.3 and before, the X11 GUI was always the default.
<entry>--with-carbon</entry>
<entry>Compile for MacOS X with the Carbon GUI. See the
.conf.macosx file for the correct MacOS X compile options.
WARNING: This Bochs feature is not maintained yet and may fail.
</entry>
</row>
<row>
@ -2028,7 +2029,8 @@ In Bochs 1.3 and before, the X11 GUI was always the default.
configure on a platform which supports running configure, so that
you may then transfer the configured code over to the
real compile environment.
</entry>
WARNING: This Bochs feature is not maintained yet and may fail.
</entry>
</row>
<row>
<entry>--with-wx</entry>
@ -2042,7 +2044,8 @@ In Bochs 1.3 and before, the X11 GUI was always the default.
<entry>Use SVGALIB library for Linux. This allows a full-screen
text and graphics display without X windows. The SVGALIB port
was written by Igor Popik.
</entry>
WARNING: This Bochs feature is not maintained yet and may fail.
</entry>
</row>
<row>
<entry>--with-nogui</entry>
@ -2143,7 +2146,8 @@ to explicitly turn it off.
needs to use the x86 hardware debugging facilities such as
DR0..DR7, instruction and data breakpoints etc., then you
should use this option. Otherwise don't use it, as it
will slow down the emulation.</entry>
will slow down the emulation.
</entry>
</row>
<row>
<entry>--enable-monitor-mwait</entry>
@ -2155,11 +2159,6 @@ to explicitly turn it off.
<entry>yes if cpu level &gt;= 4</entry>
<entry>support for alignment check in the CPU and #AC exception</entry>
</row>
<row>
<entry>--enable-misaligned-sse</entry>
<entry>no</entry>
<entry>support for AMD's misaligned SSE extension</entry>
</row>
<row>
<entry>--enable-configurable-msrs</entry>
<entry>no</entry>
@ -2341,6 +2340,7 @@ to explicitly turn it off.
<entry>
Enable support for the remote GDB stub. See <link linkend="debugging-with-gdb">Using Bochs and the remote GDB stub</link>.
NOTE: This feature cannot be used if the Bochs debugger is also enabled.
WARNING: This Bochs feature is not maintained yet and may fail.
</entry>
</row>
<row>
@ -2377,6 +2377,7 @@ to explicitly turn it off.
<entry>
Enable PCI host device mapping support. This requires <option>--enable-pci</option>
to be set as well as Linux 2.4, 2.6 or 3.x as host.
WARNING: This Bochs feature is not maintained yet and may fail.
</entry>
</row>
<row>

4
bochs/doc/man/bochsrc.5
View File

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochsrc 5 "20 Mar 2017" "bochsrc" "The Bochs Project"
.TH bochsrc 5 "21 Mar 2017" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@ -1281,7 +1281,7 @@ Example:
The vendor and device arguments should contain the vendor ID respectively the
device ID of the PCI device you want to map within Bochs.
.B The PCI mapping is still very experimental.
.B The PCI mapping is still very experimental and not maintained yet.
.TP
.I "user_plugin:"