mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-05 01:33:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trivial patches pull request 20211023

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmF0VNISHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748B5sP/i7jOKcLv+slO9wekWL9bjm2w4tQ6RQ/
 Z67z16Yc4rx8RWUILRe2ZpzsTsijazULrfJ/VBkrGxWwZ1RsSudATU53PgM5GtE+
 YM6z4j6j03QfnGCqFlnMvIPfBYEtL3Sc8x7IkiO1iWDDoijgItJPfplBM8s/WUsd
 HOXF7dDjuQV9v6uGBI1tb52rANB4d54YWLzQ0nDagujd36PznJLzHJoUM06670xn
 TFe4Hmg/eGmvmfKWYxI6HLaMx7zF27pqFlfts9JYporysD2ObaAQmxBw9IGzRvJN
 OYbUQqd39k2EpSUdHKwn8xKcnF09GtHpbY2O2HXSYmJ0suYIiAZKLfkAinrwa40K
 h4gbs8GMOIn4HaZ0zxdC4cOWy7UBeTZ6nXsRo5iYXcQ20E6LmyliE/RBv50Uudpu
 eMYb/zL/FV/Kh8E0MQVd8KzM1Kpg2EbIvInIlCtsxbWkqUynqCbijLCHaa5WlH0l
 +cYq8zMASV9B5D10wbnUMiQh8Lq5dYs/DqUUTh16TOXp0Z4EJtprkFtm1rVUkl0Z
 Jl7R5N9q6+VK8ydE4HUYvzNotAeqU8voBk1ywnMCLKslj4kwJ6em1zQY/1zWIw3D
 PS8BPi6CPIZmdFUTfcYXr+1u4NMsPB0c/1KwrCsqe9wouv2eLHLiWEh2c+0UVBoW
 CcbYn6PVLbRF
 =UER7
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging

Trivial patches pull request 20211023

# gpg: Signature made Sat 23 Oct 2021 11:30:42 AM PDT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]

* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
  analyze-migration.py: fix extract contents ('-x') errors
  analyze-migration.py: fix a long standing typo
  README: Fix some documentation URLs
  hw/nvram: Fix Memory Leak in Xilinx ZynqMP eFuse device
  hw/nvram: Fix Memory Leak in Xilinx Versal eFuse device
  hw/nvram: Fix Memory Leak in Xilinx eFuse QOM
  softmmu/physmem.c: Fix typo in comment
  MAINTAINERS: Add myself as reviewer of 'Machine core' API
  disas/nios2: Simplify endianess conversion
  disas/nios2: Fix style in print_insn_nios2()
  po: update turkish translation

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-10-23 14:30:10 -07:00
commit c5b2f55981
11 changed files with 86 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -1617,6 +1617,7 @@ F: pc-bios/bios-microvm.bin
Machine core Machine core
M: Eduardo Habkost <ehabkost@redhat.com> M: Eduardo Habkost <ehabkost@redhat.com>
M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
R: Philippe Mathieu-Daudé <philmd@redhat.com>
S: Supported S: Supported
F: cpu.c F: cpu.c
F: hw/core/cpu.c F: hw/core/cpu.c

14
README.rst
View File

@ -59,9 +59,9 @@ of other UNIX targets. The simple steps to build QEMU are:
Additional information can also be found online via the QEMU website: Additional information can also be found online via the QEMU website:
* `<https://qemu.org/Hosts/Linux>`_ * `<https://wiki.qemu.org/Hosts/Linux>`_
* `<https://qemu.org/Hosts/Mac>`_ * `<https://wiki.qemu.org/Hosts/Mac>`_
* `<https://qemu.org/Hosts/W32>`_ * `<https://wiki.qemu.org/Hosts/W32>`_
Submitting patches Submitting patches
@ -84,8 +84,8 @@ the Developers Guide.
Additional information on submitting patches can be found online via Additional information on submitting patches can be found online via
the QEMU website the QEMU website
* `<https://qemu.org/Contribute/SubmitAPatch>`_ * `<https://wiki.qemu.org/Contribute/SubmitAPatch>`_
* `<https://qemu.org/Contribute/TrivialPatches>`_ * `<https://wiki.qemu.org/Contribute/TrivialPatches>`_
The QEMU website is also maintained under source control. The QEMU website is also maintained under source control.
@ -144,7 +144,7 @@ reported via GitLab.
For additional information on bug reporting consult: For additional information on bug reporting consult:
* `<https://qemu.org/Contribute/ReportABug>`_ * `<https://wiki.qemu.org/Contribute/ReportABug>`_
ChangeLog ChangeLog
@ -168,4 +168,4 @@ main methods being email and IRC
Information on additional methods of contacting the community can be Information on additional methods of contacting the community can be
found online via the QEMU website: found online via the QEMU website:
* `<https://qemu.org/Contribute/StartHere>`_ * `<https://wiki.qemu.org/Contribute/StartHere>`_

71
disas/nios2.c
View File

@ -3478,54 +3478,37 @@ nios2_disassemble (bfd_vma address, unsigned long opcode,
instruction word at the address given, and prints the disassembled instruction word at the address given, and prints the disassembled
instruction on the stream info->stream using info->fprintf_func. */ instruction on the stream info->stream using info->fprintf_func. */
static int int print_insn_nios2(bfd_vma address, disassemble_info *info)
print_insn_nios2 (bfd_vma address, disassemble_info *info,
enum bfd_endian endianness)
{ {
bfd_byte buffer[INSNLEN]; bfd_byte buffer[INSNLEN];
int status; int status;
status = (*info->read_memory_func) (address, buffer, INSNLEN, info); status = (*info->read_memory_func)(address, buffer, INSNLEN, info);
if (status == 0) if (status == 0) {
{ unsigned long insn;
unsigned long insn; if (info->endian == BFD_ENDIAN_BIG) {
if (endianness == BFD_ENDIAN_BIG) insn = (unsigned long) bfd_getb32(buffer);
insn = (unsigned long) bfd_getb32 (buffer); } else {
else insn = (unsigned long) bfd_getl32(buffer);
insn = (unsigned long) bfd_getl32 (buffer); }
return nios2_disassemble (address, insn, info); return nios2_disassemble(address, insn, info);
} }
/* We might have a 16-bit R2 instruction at the end of memory. Try that. */ /* We might have a 16-bit R2 instruction at the end of memory. Try that. */
if (info->mach == bfd_mach_nios2r2) if (info->mach == bfd_mach_nios2r2) {
{ status = (*info->read_memory_func)(address, buffer, 2, info);
status = (*info->read_memory_func) (address, buffer, 2, info); if (status == 0) {
if (status == 0) unsigned long insn;
{ if (info->endian == BFD_ENDIAN_BIG) {
unsigned long insn; insn = (unsigned long) bfd_getb16(buffer);
if (endianness == BFD_ENDIAN_BIG) } else {
insn = (unsigned long) bfd_getb16 (buffer); insn = (unsigned long) bfd_getl16(buffer);
else }
insn = (unsigned long) bfd_getl16 (buffer); return nios2_disassemble(address, insn, info);
return nios2_disassemble (address, insn, info); }
}
} }
/* If we got here, we couldn't read anything. */ /* If we got here, we couldn't read anything. */
(*info->memory_error_func) (status, address, info); (*info->memory_error_func)(status, address, info);
return -1; return -1;
}
/* These two functions are the main entry points, accessed from
disassemble.c. */
int
print_insn_big_nios2 (bfd_vma address, disassemble_info *info)
{
return print_insn_nios2 (address, info, BFD_ENDIAN_BIG);
}
int
print_insn_little_nios2 (bfd_vma address, disassemble_info *info)
{
return print_insn_nios2 (address, info, BFD_ENDIAN_LITTLE);
} }

9
hw/nvram/xlnx-efuse.c
View File

@ -144,10 +144,11 @@ static bool efuse_ro_bits_find(XlnxEFuse *s, uint32_t k)
bool xlnx_efuse_set_bit(XlnxEFuse *s, unsigned int bit) bool xlnx_efuse_set_bit(XlnxEFuse *s, unsigned int bit)
{ {
if (efuse_ro_bits_find(s, bit)) { if (efuse_ro_bits_find(s, bit)) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, "%s: WARN: " qemu_log_mask(LOG_GUEST_ERROR, "%s: WARN: "
"Ignored setting of readonly efuse bit<%u,%u>!\n", "Ignored setting of readonly efuse bit<%u,%u>!\n",
object_get_canonical_path(OBJECT(s)), path, (bit / 32), (bit % 32));
(bit / 32), (bit % 32));
return false; return false;
} }
@ -202,9 +203,11 @@ static void efuse_realize(DeviceState *dev, Error **errp)
efuse_ro_bits_sort(s); efuse_ro_bits_sort(s);
if ((s->efuse_size % 32) != 0) { if ((s->efuse_size % 32) != 0) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
error_setg(errp, error_setg(errp,
"%s.efuse-size: %u: property value not multiple of 32.", "%s.efuse-size: %u: property value not multiple of 32.",
object_get_canonical_path(OBJECT(dev)), s->efuse_size); path, s->efuse_size);
return; return;
} }

20
hw/nvram/xlnx-versal-efuse-ctrl.c
View File

@ -439,9 +439,11 @@ static void efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64)
* up to guest to do so (or by reset). * up to guest to do so (or by reset).
*/ */
if (efuse_pgm_locked(s, bit)) { if (efuse_pgm_locked(s, bit)) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: Denied setting of efuse<%u, %u, %u>\n", "%s: Denied setting of efuse<%u, %u, %u>\n",
object_get_canonical_path(OBJECT(s)), path,
FIELD_EX32(bit, EFUSE_PGM_ADDR, PAGE), FIELD_EX32(bit, EFUSE_PGM_ADDR, PAGE),
FIELD_EX32(bit, EFUSE_PGM_ADDR, ROW), FIELD_EX32(bit, EFUSE_PGM_ADDR, ROW),
FIELD_EX32(bit, EFUSE_PGM_ADDR, COLUMN)); FIELD_EX32(bit, EFUSE_PGM_ADDR, COLUMN));
@ -478,9 +480,11 @@ static void efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)
s->regs[R_EFUSE_RD_DATA] = xlnx_versal_efuse_read_row(s->efuse, s->regs[R_EFUSE_RD_DATA] = xlnx_versal_efuse_read_row(s->efuse,
bit, &denied); bit, &denied);
if (denied) { if (denied) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: Denied reading of efuse<%u, %u>\n", "%s: Denied reading of efuse<%u, %u>\n",
object_get_canonical_path(OBJECT(s)), path,
FIELD_EX32(bit, EFUSE_RD_ADDR, PAGE), FIELD_EX32(bit, EFUSE_RD_ADDR, PAGE),
FIELD_EX32(bit, EFUSE_RD_ADDR, ROW)); FIELD_EX32(bit, EFUSE_RD_ADDR, ROW));
@ -625,9 +629,11 @@ static void efuse_ctrl_reg_write(void *opaque, hwaddr addr,
s = XLNX_VERSAL_EFUSE_CTRL(dev); s = XLNX_VERSAL_EFUSE_CTRL(dev);
if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) { if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s[reg_0x%02lx]: Attempt to write locked register.\n", "%s[reg_0x%02lx]: Attempt to write locked register.\n",
object_get_canonical_path(OBJECT(s)), (long)addr); path, (long)addr);
} else { } else {
register_write_memory(opaque, addr, data, size); register_write_memory(opaque, addr, data, size);
} }
@ -681,16 +687,20 @@ static void efuse_ctrl_realize(DeviceState *dev, Error **errp)
const uint32_t lks_sz = sizeof(XlnxEFuseLkSpec) / 2; const uint32_t lks_sz = sizeof(XlnxEFuseLkSpec) / 2;
if (!s->efuse) { if (!s->efuse) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE", error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE",
object_get_canonical_path(OBJECT(dev))); path);
return; return;
} }
/* Sort property-defined pgm-locks for bsearch lookup */ /* Sort property-defined pgm-locks for bsearch lookup */
if ((s->extra_pg0_lock_n16 % lks_sz) != 0) { if ((s->extra_pg0_lock_n16 % lks_sz) != 0) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
error_setg(errp, error_setg(errp,
"%s.pg0-lock: array property item-count not multiple of %u", "%s.pg0-lock: array property item-count not multiple of %u",
object_get_canonical_path(OBJECT(dev)), lks_sz); path, lks_sz);
return; return;
} }

18
hw/nvram/xlnx-zynqmp-efuse.c
View File

@ -434,11 +434,12 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64)
if (!errmsg) { if (!errmsg) {
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 0); ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 0);
} else { } else {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 1); ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 1);
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s - eFuse write error: %s; addr=0x%x\n", "%s - eFuse write error: %s; addr=0x%x\n",
object_get_canonical_path(OBJECT(s)), path, errmsg, (unsigned)val64);
errmsg, (unsigned)val64);
} }
ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_DONE, 1); ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_DONE, 1);
@ -448,6 +449,7 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64)
static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64) static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)
{ {
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(reg->opaque); XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(reg->opaque);
g_autofree char *path = NULL;
/* /*
* Grant reads only to allowed bits; reference sources: * Grant reads only to allowed bits; reference sources:
@ -538,10 +540,10 @@ static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)
return; return;
denied: denied:
path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: Denied efuse read from array %u, row %u\n", "%s: Denied efuse read from array %u, row %u\n",
object_get_canonical_path(OBJECT(s)), path, efuse_ary, efuse_row);
efuse_ary, efuse_row);
s->regs[R_EFUSE_RD_DATA] = 0; s->regs[R_EFUSE_RD_DATA] = 0;
@ -731,9 +733,11 @@ static void zynqmp_efuse_reg_write(void *opaque, hwaddr addr,
s = XLNX_ZYNQMP_EFUSE(dev); s = XLNX_ZYNQMP_EFUSE(dev);
if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) { if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s[reg_0x%02lx]: Attempt to write locked register.\n", "%s[reg_0x%02lx]: Attempt to write locked register.\n",
object_get_canonical_path(OBJECT(s)), (long)addr); path, (long)addr);
} else { } else {
register_write_memory(opaque, addr, data, size); register_write_memory(opaque, addr, data, size);
} }
@ -784,8 +788,10 @@ static void zynqmp_efuse_realize(DeviceState *dev, Error **errp)
XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(dev); XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(dev);
if (!s->efuse) { if (!s->efuse) {
g_autofree char *path = object_get_canonical_path(OBJECT(s));
error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE", error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE",
object_get_canonical_path(OBJECT(dev))); path);
return; return;
} }

3
include/disas/dis-asm.h
View File

@ -455,8 +455,7 @@ int print_insn_crisv32 (bfd_vma, disassemble_info*);
int print_insn_crisv10 (bfd_vma, disassemble_info*); int print_insn_crisv10 (bfd_vma, disassemble_info*);
int print_insn_microblaze (bfd_vma, disassemble_info*); int print_insn_microblaze (bfd_vma, disassemble_info*);
int print_insn_ia64 (bfd_vma, disassemble_info*); int print_insn_ia64 (bfd_vma, disassemble_info*);
int print_insn_big_nios2 (bfd_vma, disassemble_info*); int print_insn_nios2(bfd_vma, disassemble_info*);
int print_insn_little_nios2 (bfd_vma, disassemble_info*);
int print_insn_xtensa (bfd_vma, disassemble_info*); int print_insn_xtensa (bfd_vma, disassemble_info*);
int print_insn_riscv32 (bfd_vma, disassemble_info*); int print_insn_riscv32 (bfd_vma, disassemble_info*);
int print_insn_riscv64 (bfd_vma, disassemble_info*); int print_insn_riscv64 (bfd_vma, disassemble_info*);

25
po/tr.po
View File

@ -1,14 +1,15 @@
# Turkish translation for QEMU. # Turkish translation for QEMU.
# This file is put in the public domain. # This file is put in the public domain.
# Ozan Çağlayan <ozancag@gmail.com>, 2013. # Ozan Çağlayan <ozancag@gmail.com>, 2013.
# Oğuz Ersen <oguzersen@protonmail.com>, 2021.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: QEMU 1.4.50\n" "Project-Id-Version: QEMU 1.4.50\n"
"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n" "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
"POT-Creation-Date: 2018-07-18 07:56+0200\n" "POT-Creation-Date: 2018-07-18 07:56+0200\n"
"PO-Revision-Date: 2013-04-22 18:35+0300\n" "PO-Revision-Date: 2021-08-15 22:17+0300\n"
"Last-Translator: Ozan Çağlayan <ozancag@gmail.com>\n" "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
"Language-Team: Türkçe <>\n" "Language-Team: Türkçe <>\n"
"Language: tr\n" "Language: tr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -33,24 +34,22 @@ msgid "Power _Down"
msgstr "_Kapat" msgstr "_Kapat"
msgid "_Quit" msgid "_Quit"
msgstr "" msgstr "_Çıkış"
msgid "_Fullscreen" msgid "_Fullscreen"
msgstr "" msgstr "_Tam Ekran"
msgid "_Copy" msgid "_Copy"
msgstr "" msgstr "_Kopyala"
#, fuzzy
msgid "Zoom _In" msgid "Zoom _In"
msgstr "Yakınlaş ve Sığ_dır" msgstr "_Yakınlaş"
#, fuzzy
msgid "Zoom _Out" msgid "Zoom _Out"
msgstr "Yakınlaş ve Sığ_dır" msgstr "_Uzaklaş"
msgid "Best _Fit" msgid "Best _Fit"
msgstr "" msgstr "_En Uygun"
msgid "Zoom To _Fit" msgid "Zoom To _Fit"
msgstr "Yakınlaş ve Sığ_dır" msgstr "Yakınlaş ve Sığ_dır"
@ -62,13 +61,13 @@ msgid "_Grab Input"
msgstr "Girdiyi _Yakala" msgstr "Girdiyi _Yakala"
msgid "Show _Tabs" msgid "Show _Tabs"
msgstr "Se_kmeleri Göster" msgstr "_Sekmeleri Göster"
msgid "Detach Tab" msgid "Detach Tab"
msgstr "" msgstr "Sekmeyi Ayır"
msgid "Show Menubar" msgid "Show Menubar"
msgstr "" msgstr "Menü Çubuğunu Göster"
msgid "_Machine" msgid "_Machine"
msgstr "_Makine" msgstr "_Makine"

6
scripts/analyze-migration.py
View File

@ -588,7 +588,7 @@ if args.extract:
dump.read(desc_only = True) dump.read(desc_only = True)
print("desc.json") print("desc.json")
f = open("desc.json", "wb") f = open("desc.json", "w")
f.truncate() f.truncate()
f.write(jsonenc.encode(dump.vmsd_desc)) f.write(jsonenc.encode(dump.vmsd_desc))
f.close() f.close()
@ -596,7 +596,7 @@ if args.extract:
dump.read(write_memory = True) dump.read(write_memory = True)
dict = dump.getDict() dict = dump.getDict()
print("state.json") print("state.json")
f = open("state.json", "wb") f = open("state.json", "w")
f.truncate() f.truncate()
f.write(jsonenc.encode(dict)) f.write(jsonenc.encode(dict))
f.close() f.close()
@ -610,4 +610,4 @@ elif args.dump == "desc":
dump.read(desc_only = True) dump.read(desc_only = True)
print(jsonenc.encode(dump.vmsd_desc)) print(jsonenc.encode(dump.vmsd_desc))
else: else:
raise Exception("Please specify either -x, -d state or -d dump") raise Exception("Please specify either -x, -d state or -d desc")

2
softmmu/physmem.c
View File

@ -2633,7 +2633,7 @@ static void tcg_log_global_after_sync(MemoryListener *listener)
* In record/replay mode this causes a deadlock, because * In record/replay mode this causes a deadlock, because
* run_on_cpu waits for rr mutex. Therefore no races are possible * run_on_cpu waits for rr mutex. Therefore no races are possible
* in this case and no need for making run_on_cpu when * in this case and no need for making run_on_cpu when
* record/replay is not enabled. * record/replay is enabled.
*/ */
cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener); cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener);
run_on_cpu(cpuas->cpu, do_nothing, RUN_ON_CPU_NULL); run_on_cpu(cpuas->cpu, do_nothing, RUN_ON_CPU_NULL);

6
target/nios2/cpu.c
View File

@ -147,11 +147,7 @@ static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
{ {
/* NOTE: NiosII R2 is not supported yet. */ /* NOTE: NiosII R2 is not supported yet. */
info->mach = bfd_arch_nios2; info->mach = bfd_arch_nios2;
#ifdef TARGET_WORDS_BIGENDIAN info->print_insn = print_insn_nios2;
info->print_insn = print_insn_big_nios2;
#else
info->print_insn = print_insn_little_nios2;
#endif
} }
static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)