aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-04-17 21:18:04 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-04-18 22:18:59 +0200
commit3979fca4b69fc31c372687cd0bb6950592f248bd (patch)
treebf85b05c1fe2c499ad3c1d839a196938a9ed7520 /include
parent30cc98315f59d4baf30e386211292abdfabd98dc (diff)
disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h
Commit dc99065b5f9 (v0.1.0) added dis-asm.h from binutils. Commit 43d4145a986 (v0.1.5) inlined bfd.h into dis-asm.h to remove the dependency on binutils. Commit 76cad71136b (v1.4.0) moved dis-asm.h to include/disas/bfd.h. The new name is confusing when you try to match against (pre GPLv3+) binutils. Rename it back. Keep it in the same directory, of course. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190417191805.28198-17-armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/disas/dis-asm.h (renamed from include/disas/bfd.h)0
-rw-r--r--include/qom/cpu.h2
2 files changed, 1 insertions, 1 deletions
diff --git a/include/disas/bfd.h b/include/disas/dis-asm.h
index 41b61c85f9..41b61c85f9 100644
--- a/include/disas/bfd.h
+++ b/include/disas/dis-asm.h
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 9972e07786..e9bec3a5bc 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -21,7 +21,7 @@
#define QEMU_CPU_H
#include "hw/qdev-core.h"
-#include "disas/bfd.h"
+#include "disas/dis-asm.h"
#include "exec/hwaddr.h"
#include "exec/memattrs.h"
#include "qapi/qapi-types-run-state.h"