Menu
▾
▴
[Bochs-cvs] SF.net SVN: bochs:[10341] trunk/bochs
|
From: <ssh...@us...> - 2011-04-30 20:04:49
|
Revision: 10341
http://bochs.svn.sourceforge.net/bochs/?rev=10341&view=rev
Author: sshwarts
Date: 2011-04-30 20:04:42 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
- Configure option --enable-acpi is deprecated and should not be used anymore.
The ACPI support is always automatically compiled in if PCI is compiled in.
The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option.
Updated CHANGES and docs as well.
Modified Paths:
--------------
trunk/bochs/.conf.everything
trunk/bochs/CHANGES
trunk/bochs/config.cc
trunk/bochs/config.h.in
trunk/bochs/configure
trunk/bochs/configure.in
trunk/bochs/doc/docbook/user/user.dbk
trunk/bochs/iodev/acpi.cc
trunk/bochs/iodev/devices.cc
trunk/bochs/iodev/iodev.h
trunk/bochs/iodev/pci2isa.cc
trunk/bochs/main.cc
Modified: trunk/bochs/.conf.everything
===================================================================
--- trunk/bochs/.conf.everything 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/.conf.everything 2011-04-30 20:04:42 UTC (rev 10341)
@@ -22,7 +22,6 @@
--enable-instrumentation=instrument/example1 \
--enable-ne2000 \
--enable-pci \
- --enable-acpi \
--enable-clgd54xx \
--enable-usb \
--enable-usb-ohci \
Modified: trunk/bochs/CHANGES
===================================================================
--- trunk/bochs/CHANGES 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/CHANGES 2011-04-30 20:04:42 UTC (rev 10341)
@@ -26,6 +26,9 @@
The VBE support is always automatically compiled in, in order to enable
VBE support the bochsrc option "vga: extension=" has to be set to "vbe". If
PCI is present, the "pcivga" device can be assigned to PCI slot.
+ - Configure option --enable-acpi is deprecated and should not be used anymore.
+ The ACPI support is always automatically compiled in if PCI is compiled in.
+ The ACPI still could be disabled using .bochsrc 'plugin_ctrl' option.
- I/O Devices
- Networking
Modified: trunk/bochs/config.cc
===================================================================
--- trunk/bochs/config.cc 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/config.cc 2011-04-30 20:04:42 UTC (rev 10341)
@@ -1707,8 +1707,6 @@
#endif
#if BX_SUPPORT_PCI
new bx_param_bool_c(menu, "pci_ide", "Enable 'pci_ide'", "", 1);
-#endif
-#if BX_SUPPORT_ACPI
new bx_param_bool_c(menu, "acpi", "Enable 'acpi'", "", 1);
#endif
#if BX_SUPPORT_APIC
Modified: trunk/bochs/config.h.in
===================================================================
--- trunk/bochs/config.h.in 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/config.h.in 2011-04-30 20:04:42 UTC (rev 10341)
@@ -630,13 +630,6 @@
// CLGD54XX emulation
#define BX_SUPPORT_CLGD54XX 0
-// ACPI controller
-#define BX_SUPPORT_ACPI 0
-
-#if (BX_SUPPORT_ACPI && !BX_SUPPORT_PCI)
- #error To enable ACPI support, you must also enable PCI
-#endif
-
// Experimental host PCI device mapping
#define BX_SUPPORT_PCIDEV 0
@@ -669,7 +662,6 @@
#endif
#define BX_SupportRepeatSpeedups 0
-#define BX_SupportHostAsms 0
#define BX_SUPPORT_TRACE_CACHE 0
Modified: trunk/bochs/configure
===================================================================
(Binary files differ)
Modified: trunk/bochs/configure.in
===================================================================
--- trunk/bochs/configure.in 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/configure.in 2011-04-30 20:04:42 UTC (rev 10341)
@@ -661,23 +661,6 @@
)
AC_SUBST(NE2K_OBJS)
-AC_MSG_CHECKING(for ACPI support)
-AC_ARG_ENABLE(acpi,
- [ --enable-acpi enable ACPI support],
- [if test "$enableval" = yes; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(BX_SUPPORT_ACPI, 1)
- else
- AC_MSG_RESULT(no)
- AC_DEFINE(BX_SUPPORT_ACPI, 0)
- fi],
- [
- AC_MSG_RESULT(no)
- AC_DEFINE(BX_SUPPORT_ACPI, 0)
- ]
- )
-AC_SUBST(BX_SUPPORT_ACPI)
-
AC_MSG_CHECKING(for i440FX PCI support)
AC_ARG_ENABLE(pci,
[ --enable-pci enable limited i440FX PCI support],
@@ -956,22 +939,6 @@
]
)
-AC_MSG_CHECKING(for host specific inline assembly accelerations)
-AC_ARG_ENABLE(host-specific-asms,
- [ --enable-host-specific-asms support for host specific inline assembly],
- [if test "$enableval" = yes; then
- AC_MSG_RESULT(yes)
- speedup_host_specific_asms=1
- else
- AC_MSG_RESULT(no)
- speedup_host_specific_asms=0
- fi],
- [
- AC_MSG_RESULT(no)
- speedup_host_specific_asms=0
- ]
- )
-
AC_MSG_CHECKING(support for configurable MSR registers)
AC_ARG_ENABLE(configurable-msrs,
[ --enable-configurable-msrs support for configurable MSR registers],
@@ -1155,12 +1122,6 @@
AC_DEFINE(BX_SupportRepeatSpeedups, 0)
fi
-if test "$speedup_host_specific_asms" = 1; then
- AC_DEFINE(BX_SupportHostAsms, 1)
-else
- AC_DEFINE(BX_SupportHostAsms, 0)
-fi
-
if test "$speedup_fastcall" = 1; then
AC_DEFINE(BX_FAST_FUNC_CALL, 1)
else
@@ -2804,7 +2765,17 @@
AC_MSG_RESULT(no)
])
+AC_MSG_CHECKING(for ACPI extensions support (deprecated))
+AC_ARG_ENABLE(acpi,
+ [ --enable-acpi use ACPI extensions support (deprecated)],
+ [AC_MSG_RESULT($enableval)
+ AC_MSG_ERROR([DEPRECATED - this feature enabled with PCI configure option and could be turned on through .bochsrc option])
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
+
# Create some subdirectories for when you run configure from some other
# directory.
if test ! -d instrument; then mkdir instrument; fi
Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/doc/docbook/user/user.dbk 2011-04-30 20:04:42 UTC (rev 10341)
@@ -6006,7 +6006,7 @@
</para></listitem>
<listitem><para> ACPI support is required to boot SMP system in most of modern
operating systems. For example WinXP 64 bit require ACPI support even for
-single processor configuration. Still not supported by Bochs. (FIXME)
+single processor configuration.
</para></listitem>
</itemizedlist>
</para>
Modified: trunk/bochs/iodev/acpi.cc
===================================================================
--- trunk/bochs/iodev/acpi.cc 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/iodev/acpi.cc 2011-04-30 20:04:42 UTC (rev 10341)
@@ -30,7 +30,7 @@
#include "iodev.h"
-#if BX_SUPPORT_PCI && BX_SUPPORT_ACPI
+#if BX_SUPPORT_PCI
#include "pci.h"
#include "acpi.h"
Modified: trunk/bochs/iodev/devices.cc
===================================================================
--- trunk/bochs/iodev/devices.cc 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/iodev/devices.cc 2011-04-30 20:04:42 UTC (rev 10341)
@@ -70,10 +70,8 @@
pluginPciBridge = &stubPci;
pluginPci2IsaBridge = &stubPci2Isa;
pluginPciIdeController = &stubPciIde;
-#if BX_SUPPORT_ACPI
pluginACPIController = &stubACPIController;
#endif
-#endif
pluginKeyboard = &stubKeyboard;
pluginDmaDevice = &stubDma;
pluginFloppyDevice = &stubFloppy;
@@ -232,8 +230,6 @@
else if (!strcmp(plugname, BX_PLUGIN_PCI_IDE)) {
PLUG_load_plugin(pci_ide, PLUGTYPE_OPTIONAL);
}
-#endif
-#if BX_SUPPORT_ACPI
else if (!strcmp(plugname, BX_PLUGIN_ACPI)) {
PLUG_load_plugin(acpi, PLUGTYPE_OPTIONAL);
}
Modified: trunk/bochs/iodev/iodev.h
===================================================================
--- trunk/bochs/iodev/iodev.h 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/iodev/iodev.h 2011-04-30 20:04:42 UTC (rev 10341)
@@ -314,7 +314,7 @@
}
};
-#if BX_SUPPORT_ACPI
+#if BX_SUPPORT_PCI
class BOCHSAPI bx_acpi_ctrl_stub_c : public bx_devmodel_c, public bx_pci_device_stub_c {
public:
virtual void generate_smi(Bit8u value) {}
@@ -436,7 +436,7 @@
bx_pci_bridge_stub_c *pluginPciBridge;
bx_pci2isa_stub_c *pluginPci2IsaBridge;
bx_pci_ide_stub_c *pluginPciIdeController;
-#if BX_SUPPORT_ACPI
+#if BX_SUPPORT_PCI
bx_acpi_ctrl_stub_c *pluginACPIController;
#endif
bx_devmodel_c *pluginPitDevice;
@@ -484,7 +484,7 @@
bx_pci_ide_stub_c stubPciIde;
bx_ne2k_stub_c stubNE2k;
bx_speaker_stub_c stubSpeaker;
-#if BX_SUPPORT_ACPI
+#if BX_SUPPORT_PCI
bx_acpi_ctrl_stub_c stubACPIController;
#endif
#if BX_SUPPORT_IODEBUG
Modified: trunk/bochs/iodev/pci2isa.cc
===================================================================
--- trunk/bochs/iodev/pci2isa.cc 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/iodev/pci2isa.cc 2011-04-30 20:04:42 UTC (rev 10341)
@@ -289,10 +289,10 @@
switch (address) {
case 0x00b2:
-#if BX_SUPPORT_ACPI
+#if BX_SUPPORT_PCI
DEV_acpi_generate_smi((Bit8u)value);
#else
- BX_ERROR(("write %08x: APM command register not supported yet", value));
+ BX_ERROR(("write %08x: APM command register not supported without ACPI", value));
#endif
BX_P2I_THIS s.apmc = value & 0xff;
break;
Modified: trunk/bochs/main.cc
===================================================================
--- trunk/bochs/main.cc 2011-04-30 18:47:04 UTC (rev 10340)
+++ trunk/bochs/main.cc 2011-04-30 20:04:42 UTC (rev 10341)
@@ -1080,7 +1080,6 @@
BX_INFO((" Trace cache support: %s",BX_SUPPORT_TRACE_CACHE?"yes":"no"));
BX_INFO((" Fast function calls: %s",BX_FAST_FUNC_CALL?"yes":"no"));
BX_INFO(("Devices configuration"));
- BX_INFO((" ACPI support: %s",BX_SUPPORT_ACPI?"yes":"no"));
BX_INFO((" NE2000 support: %s",BX_SUPPORT_NE2K?"yes":"no"));
BX_INFO((" PCI support: %s, enabled=%s",BX_SUPPORT_PCI?"yes":"no",
SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get() ? "yes" : "no"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|