Fixed panic in case x86-64 support is not present (Bochs 2.6.7 P4-SMP release

binaries are already fixed).
Usual updates after release (version strings, release tag).

bochs/configure.in

@@ -8,13 +8,13 @@ AC_CONFIG_HEADER(ltdlconf.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.6.7"
-VER_STRING="2.6.7"
+VERSION="2.6.7.svn"
+VER_STRING="2.6.7.svn"
 dnl // WIN_VER_STRING format is "a, b, c, d"
 dnl // c should be > 90 for pre-release of next version otherwise patch level
 dnl // d should be 0 for release and 1 for svn version
-WIN_VER_STRING="2, 6, 7, 0"
-REL_STRING="Built from SVN snapshot on November 2, 2014"
+WIN_VER_STRING="2, 6, 7, 1"
+REL_STRING="Built from SVN snapshot after release 2.6.7"
 
 changequote(<<, >>)
 changequote([, ])

bochs/cpu/generic_cpuid.cc

@@ -1042,6 +1042,7 @@ void bx_generic_cpuid_t::init_vmx_extensions_bitmask(void)
   if (vmx_enabled) {
     features_bitmask |= BX_VMX_VIRTUAL_NMI;
 
+#if BX_SUPPORT_X86_64
     static bx_bool x86_64_enabled = SIM->get_param_bool(BXPN_CPUID_X86_64)->get();
     if (x86_64_enabled) {
       features_bitmask |= BX_VMX_TPR_SHADOW |
@@ -1070,8 +1071,9 @@ void bx_generic_cpuid_t::init_vmx_extensions_bitmask(void)
       }
 #endif
     }
+#endif
   }
-  
+
   this->vmx_extensions_bitmask = features_bitmask;
 }
 #endif

bochs/doc/docbook/user/user.dbk

@@ -1129,6 +1129,11 @@ The <replaceable>tagname</replaceable> tells which release you want, and it can
       </row>
     </thead>
     <tbody>
+      <row>
+        <entry>2.6.7 (bugfix)</entry>
+        <entry>REL_2_6_7_FINAL</entry>
+        <entry>12531</entry>
+      </row>
       <row>
         <entry>2.6.6 (bugfix)</entry>
         <entry>REL_2_6_6_FINAL</entry>