From 1a0019533514e83a2bbabc0dd50b3cfa2a099b98 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Fri, 15 Jan 2021 14:42:24 +0100 Subject: [PATCH 1/4] MAINTAINERS: Update 9pfs tree URL I've already moved my repositories to gitlab for extra CI coverage, and I won't use the ones at github anymore. Signed-off-by: Greg Kurz Reviewed-by: Christian Schoenebeck Message-Id: <161071814430.152031.14540382419012818908.stgit@bahia.lan> Signed-off-by: Laurent Vivier --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 34359a99b8..fbb228ef2b 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 From 5fa6ab7ecc54fe5f9bbd971496c78a5b014103b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 23 Jan 2021 10:41:07 +0100 Subject: [PATCH 2/4] tcg/tci: Restrict tci_write_reg16() to 64-bit hosts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restrict tci_write_reg16() to 64-bit hosts to fix on 32-bit ones: [520/1115] Compiling C object libqemu-arm-linux-user.fa.p/tcg_tci.c.o FAILED: libqemu-arm-linux-user.fa.p/tcg_tci.c.o tcg/tci.c:132:1: error: 'tci_write_reg16' defined but not used [-Werror=unused-function] tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value) ^~~~~~~~~~~~~~~ Fixes: 2f160e0f979 ("tci: Add implementation for INDEX_op_ld16u_i64") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Message-Id: <20210123094107.2340222-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- tcg/tci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tcg/tci.c b/tcg/tci.c index 2311aa7d3a..3fc82d3c79 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -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) From 0c373c017808764630cdfa52018bc1cfbe8ad8db Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 21 Jan 2021 16:42:51 -0800 Subject: [PATCH 3/4] net/slirp.c: Fix spelling error in error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DNS should be DHCP Signed-off-by: Doug Evans Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Samuel Thibault Message-Id: <20210122004251.843837-1-dje@google.com> Signed-off-by: Laurent Vivier --- net/slirp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/slirp.c b/net/slirp.c index 8350c6d45f..be914c0be0 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; } From 77182df19f874adfc4ac98248606c154764baaa8 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 28 Jan 2021 18:21:27 +0100 Subject: [PATCH 4/4] target/rx: Fix compiler errors for build with sanitizers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gcc (Debian 10.2.1-6) 10.2.1 20210110 aborts builds with enabled sanitizers: ../../../target/rx/op_helper.c: In function ‘helper_scmpu’: ../../../target/rx/op_helper.c:213:24: error: ‘tmp1’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 213 | env->psw_c = (tmp0 >= tmp1); | ~~~~~~^~~~~~~~ ../../../target/rx/op_helper.c:213:24: error: ‘tmp0’ may be used uninitialized in this function [-Werror=maybe-uninitialized] ../../../target/rx/op_helper.c: In function ‘helper_suntil’: ../../../target/rx/op_helper.c:299:23: error: ‘tmp’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 299 | env->psw_c = (tmp <= env->regs[2]); | ~~~~~^~~~~~~~~~~~~~~~ ../../../target/rx/op_helper.c: In function ‘helper_swhile’: ../../../target/rx/op_helper.c:318:23: error: ‘tmp’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 318 | env->psw_c = (tmp <= env->regs[2]); | ~~~~~^~~~~~~~~~~~~~~~ Rewriting the code fixes those errors. Signed-off-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20210128172127.46041-1-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- target/rx/op_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 59389f4992..4d315b4449 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]); }