[PULL 0/4] Trivial branch for 6.0 patches

[PULL 0/4] Trivial branch for 6.0 patches

[Laurent Vivier]

The following changes since commit 9cd69f1a270235b652766f00b94114f48a2d603f:

  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-01-25=
-1' into staging (2021-01-26 09:51:02 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-6.0-pull-request

for you to fetch changes up to 77182df19f874adfc4ac98248606c154764baaa8:

  target/rx: Fix compiler errors for build with sanitizers (2021-01-29 09:31:=
53 +0100)

----------------------------------------------------------------
Trivial patches 20210129

----------------------------------------------------------------

Doug Evans (1):
  net/slirp.c: Fix spelling error in error message

Greg Kurz (1):
  MAINTAINERS: Update 9pfs tree URL

Philippe Mathieu-Daud=C3=A9 (1):
  tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

Stefan Weil (1):
  target/rx: Fix compiler errors for build with sanitizers

 MAINTAINERS           |  2 +-
 net/slirp.c           |  2 +-
 target/rx/op_helper.c | 12 ++++++------
 tcg/tci.c             |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

--=20
2.29.2

[PULL 1/4] MAINTAINERS: Update 9pfs tree URL

[Laurent Vivier]

From: Greg Kurz <groug@kaod.org>

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 <groug@kaod.org>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <161071814430.152031.14540382419012818908.stgit@bahia.lan>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 34359a99b8e7..fbb228ef2b34 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>
-- 
2.29.2

[PULL 2/4] tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

[Laurent Vivier]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

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é <f4bug@amsat.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20210123094107.2340222-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 tcg/tci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tcg/tci.c b/tcg/tci.c
index 2311aa7d3ab6..3fc82d3c79d7 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)
-- 
2.29.2

[PULL 3/4] net/slirp.c: Fix spelling error in error message

[Laurent Vivier]

From: Doug Evans <dje@google.com>

DNS should be DHCP

Signed-off-by: Doug Evans <dje@google.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Message-Id: <20210122004251.843837-1-dje@google.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 net/slirp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/slirp.c b/net/slirp.c
index 8350c6d45f70..be914c0be058 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;
     }
 
-- 
2.29.2

[PULL 4/4] target/rx: Fix compiler errors for build with sanitizers

[Laurent Vivier]

From: Stefan Weil <sw@weilnetz.de>

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 <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210128172127.46041-1-sw@weilnetz.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 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 59389f49921f..4d315b44492f 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]);
 }
-- 
2.29.2

Re: [PULL 0/4] Trivial branch for 6.0 patches

[Peter Maydell]

On Fri, 29 Jan 2021 at 08:34, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 9cd69f1a270235b652766f00b94114f48a2d603f:
>
>   Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-01-25=
> -1' into staging (2021-01-26 09:51:02 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-6.0-pull-request
>
> for you to fetch changes up to 77182df19f874adfc4ac98248606c154764baaa8:
>
>   target/rx: Fix compiler errors for build with sanitizers (2021-01-29 09:31:=
> 53 +0100)
>
> ----------------------------------------------------------------
> Trivial patches 20210129
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM

Re: [PULL 0/4] Trivial branch for 6.0 patches

[Peter Maydell]

On Mon, 18 Jan 2021 at 11:34, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e0cbcf1eea16e81f116560130a1b36da711fb102:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (=
> 2021-01-17 17:04:40 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/trivial-branch-for-6.0-pull-request
>
> for you to fetch changes up to 580e733321511ab4eda7d6ca14ca157d71ea8728:
>
>   hw/ide/ahci: Replace fprintf() by qemu_log_mask(GUEST_ERROR) (2021-01-18 11=
> :51:26 +0100)
>
> ----------------------------------------------------------------
> Trivial patches 20210118
>
> Fix memory leaks
> Use qemu_log_mask(GUEST_ERROR) rather than error_report().
>
> ----------------------------------------------------------------
>
> Gan Qixin (2):
>   pl031: Use timer_free() in the finalize function to avoid memleaks
>   misc/mos6522: Use timer_free() in the finalize function to avoid
>     memleak
>
> Philippe Mathieu-Daud=C3=A9 (2):
>   hw/virtio-pci: Replace error_report() by qemu_log_mask(GUEST_ERROR)
>   hw/ide/ahci: Replace fprintf() by qemu_log_mask(GUEST_ERROR)

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM

[PULL 0/4] Trivial branch for 6.0 patches

[Laurent Vivier]

The following changes since commit e0cbcf1eea16e81f116560130a1b36da711fb102:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (=
2021-01-17 17:04:40 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/trivial-branch-for-6.0-pull-request

for you to fetch changes up to 580e733321511ab4eda7d6ca14ca157d71ea8728:

  hw/ide/ahci: Replace fprintf() by qemu_log_mask(GUEST_ERROR) (2021-01-18 11=
:51:26 +0100)

----------------------------------------------------------------
Trivial patches 20210118

Fix memory leaks
Use qemu_log_mask(GUEST_ERROR) rather than error_report().

----------------------------------------------------------------

Gan Qixin (2):
  pl031: Use timer_free() in the finalize function to avoid memleaks
  misc/mos6522: Use timer_free() in the finalize function to avoid
    memleak

Philippe Mathieu-Daud=C3=A9 (2):
  hw/virtio-pci: Replace error_report() by qemu_log_mask(GUEST_ERROR)
  hw/ide/ahci: Replace fprintf() by qemu_log_mask(GUEST_ERROR)

 hw/ide/ahci.c          | 8 +++++---
 hw/misc/mos6522.c      | 9 +++++++++
 hw/rtc/pl031.c         | 8 ++++++++
 hw/virtio/virtio-pci.c | 6 ++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

--=20
2.29.2