From: Gabe Black <gblack@eecs.umich.edu>
Date: Sat, 21 Apr 2012 22:00:23 +0000 (-0700)
Subject: X86: Report an error if there's no kernel object, don't blindly use it.
X-Git-Tag: stable_2012_06_28~115
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=29329e61b7ca28e14173fb01fdc21396a5507b5d;p=gem5.git

X86: Report an error if there's no kernel object, don't blindly use it.

This way the user gets a nice message instead of a less nice segfault.
---

diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index effe1e994..87fb61edc 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -114,6 +114,9 @@ X86System::initState()
 {
     System::initState();
 
+    if (!kernel)
+        fatal("No kernel to load.\n");
+
     if (kernel->getArch() == ObjectFile::I386)
         fatal("Loading a 32 bit x86 kernel is not supported.\n");