[Qemu-commits] [qemu/qemu] 711077: tests: fix usb-hcd-ehci-test compilation

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7110776b01fac48e4a2f49b6b8d5020ecfc158a1
      
https://github.com/qemu/qemu/commit/7110776b01fac48e4a2f49b6b8d5020ecfc158a1
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M tests/usb-hcd-ehci-test.c

  Log Message:
  -----------
  tests: fix usb-hcd-ehci-test compilation

Fixes commit
e5758de4e836c3b2edc2befd904651fc6967d74f ("tests/libqtest: Make
qtest_qmp_device_add/del independent from global_qtest")

and commit
dd210749727530cdef7c335040edbf81c3c5d041 ("tests/libqtest: Use
libqtest-single.h in tests that require global_qtest").

Cc: Thomas Huth <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 343143a6651bb440a1661fbaf163ef6d9b05721a
      
https://github.com/qemu/qemu/commit/343143a6651bb440a1661fbaf163ef6d9b05721a
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M tests/Makefile.include

  Log Message:
  -----------
  tests: fix echi/ehci typo

While at it, simplify using $(land).

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Fixes: dad5ddcea3b661 ("check: Only test usb-ehci when it is compiled in")
Signed-off-by: Thomas Huth <address@hidden>


  Commit: cd4fc142074f47fdcc850676a13d29bb3facc100
      
https://github.com/qemu/qemu/commit/cd4fc142074f47fdcc850676a13d29bb3facc100
  Author: Thomas Huth <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M hw/m68k/next-cube.c

  Log Message:
  -----------
  hw/m68k/next-cube: Avoid static RTC variables and introduce control register

Coverity currently complains that the "if (0x00 & (0x80 >> (phase - 8))"
in next-cube.c can never be true. Right it is. The "0x00" is meant as value
of the control register of the RTC, which is currently not implemented yet.
Thus, let's add a register variable for this now. However, the RTC
registers are currently defined as static variables in nextscr2_write(),
which is quite ugly. Thus let's also move the RTC variables to the main
machine state instead. In the long run, we should likely even refactor
the whole RTC code into a separate device in a separate file, but that's
something for calm winter nights later... as a first step, cleaning up
the static variables and shutting up the warning from Coverity should
be sufficient.

Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: e423455c4f23a1a828901c78fe6d03b7dde79319
      
https://github.com/qemu/qemu/commit/e423455c4f23a1a828901c78fe6d03b7dde79319
  Author: Thomas Huth <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M hw/core/loader.c

  Log Message:
  -----------
  hw/core/loader: Fix possible crash in rom_copy()

Both, "rom->addr" and "addr" are derived from the binary image
that can be loaded with the "-kernel" paramer. The code in
rom_copy() then calculates:

    d = dest + (rom->addr - addr);

and uses "d" as destination in a memcpy() some lines later. Now with
bad kernel images, it is possible that rom->addr is smaller than addr,
thus "rom->addr - addr" gets negative and the memcpy() then tries to
copy contents from the image to a bad memory location. This could
maybe be used to inject code from a kernel image into the QEMU binary,
so we better fix it with an additional sanity check here.

Cc: address@hidden
Reported-by: Guangming Liu
Buglink: https://bugs.launchpad.net/qemu/+bug/1844635
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 3d5e90a50bd4ffa199166e01a365f5c5995534ae
      
https://github.com/qemu/qemu/commit/3d5e90a50bd4ffa199166e01a365f5c5995534ae
  Author: Thomas Huth <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M tests/cdrom-test.c
    M vl.c

  Log Message:
  -----------
  Disallow colons in the parameter of "-accel"

Everybody who used something like "-machine accel=kvm:tcg" in the past
might be tempted to specify a similar list with the -accel parameter,
too, for example "-accel kvm:tcg". However, this is not how this
options is thought to be used, since each "-accel" should only take care
of one specific accelerator.

In the long run, we really should rework the "-accel" code completely,
so that it does not set "-machine accel=..." anymore internally, but
is completely independent from "-machine". For the short run, let's
make sure that users cannot use "-accel xyz:tcg", so that we avoid
that we have to deal with such cases in the wild later.

Message-Id: <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 7f21573c822805a8e6be379d9bcf3ad9effef3dc
      
https://github.com/qemu/qemu/commit/7f21573c822805a8e6be379d9bcf3ad9effef3dc
  Author: Peter Maydell <address@hidden>
  Date:   2019-10-01 (Tue, 01 Oct 2019)

  Changed paths:
    M hw/core/loader.c
    M hw/m68k/next-cube.c
    M tests/Makefile.include
    M tests/cdrom-test.c
    M tests/usb-hcd-ehci-test.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2019-10-01' into staging

- Fix and re-enable the usb-hcd-ehci-test
- Silence a Coverity warning in hw/m68k/next-cube.c
- Fix crash that can occur when using bad binaries with "-kernel"
- Disallow colons in the "-accel" parameter

# gpg: Signature made Tue 01 Oct 2019 11:03:13 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-10-01:
  Disallow colons in the parameter of "-accel"
  hw/core/loader: Fix possible crash in rom_copy()
  hw/m68k/next-cube: Avoid static RTC variables and introduce control register
  tests: fix echi/ehci typo
  tests: fix usb-hcd-ehci-test compilation

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/2094695689f7...7f21573c8228