diff options
| author | Peter Maydell | 2021-05-13 21:13:24 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-05-13 21:13:24 +0200 |
| commit | 2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426 (patch) | |
| tree | d7b6b804dc1306dda29fc775b7e91791d8ad5277 /include/hw/elf_ops.h | |
| parent | Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210511' into staging (diff) | |
| parent | Drop the deprecated unicore32 target (diff) | |
| download | qemu-2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426.tar.gz qemu-2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426.tar.xz qemu-2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging
Miscellaneous patches for 2021-05-12
# gpg: Signature made Wed 12 May 2021 17:22:15 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2021-05-12:
Drop the deprecated unicore32 target
Drop the deprecated lm32 target
block: Drop the sheepdog block driver
Remove the deprecated moxie target
monitor/qmp: fix race on CHR_EVENT_CLOSED without OOB
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/elf_ops.h')
| -rw-r--r-- | include/hw/elf_ops.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 6ee458e7bc..1c37cec4ae 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -368,14 +368,6 @@ static int glue(load_elf, SZ)(const char *name, int fd, } } break; - case EM_MOXIE: - if (ehdr.e_machine != EM_MOXIE) { - if (ehdr.e_machine != EM_MOXIE_OLD) { - ret = ELF_LOAD_WRONG_ARCH; - goto fail; - } - } - break; case EM_MIPS: case EM_NANOMIPS: if ((ehdr.e_machine != EM_MIPS) && |