crypto: strengthen the check for key slots overlapping with LUKS header

[qmiga/qemu.git] / disas / nanomips.cpp

diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index c8495b1..9be8df7 100644 (file)
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -27,10 +27,8 @@
  *      Reference Manual", Revision 01.01, April 27, 2018
  */
 
-extern "C" {
 #include "qemu/osdep.h"
-#include "disas/bfd.h"
-}
+#include "disas/dis-asm.h"
 
 #include <cstring>
 #include <stdexcept>
@@ -837,7 +835,7 @@ int NMD::Disassemble(const uint16 * data, std::string & dis,
                                  * an ASE attribute and the requested version
                                  * not having that attribute
                                  */
-                                dis = "ASE attribute missmatch";
+                                dis = "ASE attribute mismatch";
                                 return -5;
                             }
                             disassembly_function dis_fn = table[i].disassembly;