diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-29 10:10:43 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-29 10:10:43 +0000 |
commit | 5101d00d2f1138a73344dc4833587f76d7a5fa5c (patch) | |
tree | a981291ca7b48519da6d12632e066179f927e79c | |
parent | 7e7eb9f852a46b51a71ae9d82590b2e4d28827ee (diff) | |
parent | 77182df19f874adfc4ac98248606c154764baaa8 (diff) | |
download | qemu-5101d00d2f1138a73344dc4833587f76d7a5fa5c.zip qemu-5101d00d2f1138a73344dc4833587f76d7a5fa5c.tar.gz qemu-5101d00d2f1138a73344dc4833587f76d7a5fa5c.tar.bz2 |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-pull-request' into staging
Trivial patches 20210129
# gpg: Signature made Fri 29 Jan 2021 08:32:17 GMT
# 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]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-6.0-pull-request:
target/rx: Fix compiler errors for build with sanitizers
net/slirp.c: Fix spelling error in error message
tcg/tci: Restrict tci_write_reg16() to 64-bit hosts
MAINTAINERS: Update 9pfs tree URL
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | net/slirp.c | 2 | ||||
-rw-r--r-- | target/rx/op_helper.c | 12 | ||||
-rw-r--r-- | tcg/tci.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 34359a9..fbb228e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1828,7 +1828,7 @@ X: hw/9pfs/xen-9p* F: fsdev/ F: docs/interop/virtfs-proxy-helper.rst F: tests/qtest/virtio-9p-test.c -T: git https://github.com/gkurz/qemu.git 9p-next +T: git https://gitlab.com/gkurz/qemu.git 9p-next virtio-blk M: Stefan Hajnoczi <stefanha@redhat.com> diff --git a/net/slirp.c b/net/slirp.c index 8350c6d..be914c0 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -473,7 +473,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, return -1; } if (dhcp.s_addr == host.s_addr || dhcp.s_addr == dns.s_addr) { - error_setg(errp, "DNS must be different from host and DNS"); + error_setg(errp, "DHCP must be different from host and DNS"); return -1; } diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 59389f4..4d315b4 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -201,14 +201,14 @@ void helper_scmpu(CPURXState *env) if (env->regs[3] == 0) { return; } - while (env->regs[3] != 0) { + do { tmp0 = cpu_ldub_data_ra(env, env->regs[1]++, GETPC()); tmp1 = cpu_ldub_data_ra(env, env->regs[2]++, GETPC()); env->regs[3]--; if (tmp0 != tmp1 || tmp0 == '\0') { break; } - } + } while (env->regs[3] != 0); env->psw_z = tmp0 - tmp1; env->psw_c = (tmp0 >= tmp1); } @@ -287,14 +287,14 @@ void helper_suntil(CPURXState *env, uint32_t sz) if (env->regs[3] == 0) { return ; } - while (env->regs[3] != 0) { + do { tmp = cpu_ldufn[sz](env, env->regs[1], GETPC()); env->regs[1] += 1 << sz; env->regs[3]--; if (tmp == env->regs[2]) { break; } - } + } while (env->regs[3] != 0); env->psw_z = tmp - env->regs[2]; env->psw_c = (tmp <= env->regs[2]); } @@ -306,14 +306,14 @@ void helper_swhile(CPURXState *env, uint32_t sz) if (env->regs[3] == 0) { return ; } - while (env->regs[3] != 0) { + do { tmp = cpu_ldufn[sz](env, env->regs[1], GETPC()); env->regs[1] += 1 << sz; env->regs[3]--; if (tmp != env->regs[2]) { break; } - } + } while (env->regs[3] != 0); env->psw_z = env->regs[3]; env->psw_c = (tmp <= env->regs[2]); } @@ -128,11 +128,13 @@ static void tci_write_reg8(tcg_target_ulong *regs, TCGReg index, uint8_t value) tci_write_reg(regs, index, value); } +#if TCG_TARGET_REG_BITS == 64 static void tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value) { tci_write_reg(regs, index, value); } +#endif static void tci_write_reg32(tcg_target_ulong *regs, TCGReg index, uint32_t value) |