CPUID is not available when cpu-level=3

bochs/config.cc

@@ -431,10 +431,10 @@ void bx_init_options()
 #endif
 #endif
 
-#endif // CPU_LEVEL >= 4
-
   cpuid_param->set_options(menu->SHOW_PARENT);
 
+#endif // CPU_LEVEL >= 4
+
   // memory subtree
   bx_list_c *memory = new bx_list_c(root_param, "memory", "Memory Options");
   bx_list_c *stdmem = new bx_list_c(memory, "standard", "Standard Options");
@@ -1758,8 +1758,10 @@ void bx_reset_options()
   // cpu
   SIM->get_param("cpu")->reset();
 
+#if BX_CPU_LEVEL >= 4
   // cpuid
   SIM->get_param("cpuid")->reset();
+#endif
 
   // memory (ram & rom)
   SIM->get_param("memory")->reset();

bochs/cpu/init.cc

@@ -1051,7 +1051,9 @@ void BX_CPU_C::reset(unsigned source)
 #endif
 
   // initialize CPUID values - make sure apicbase already initialized
+#if BX_CPU_LEVEL >= 4
   set_cpuid_defaults();
+#endif
 
   // ignore bad MSRS if user asked for it
 #if BX_CPU_LEVEL >= 5

bochs/gui/win32dialog.cc

@@ -508,7 +508,9 @@ edit_opts_t start_options[] = {
   {"Logfile", "log"},
   {"Log Options", "*"},
   {"CPU", "cpu"},
+#if BX_CPU_LEVEL >= 4
   {"CPUID", "cpuid"},
+#endif
   {"Memory", "memory"},
   {"Clock & CMOS", "clock_cmos"},
   {"PCI", "pci"},