[Qemu-commits] [qemu/qemu] be21c3: virtio-console: Fix VIRTIO_CONSOLE() cast macro

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: be21c336162f5f4269131faffb1c6461cf57b74a
      
https://github.com/qemu/qemu/commit/be21c336162f5f4269131faffb1c6461cf57b74a
  Author: Andreas Färber <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M hw/char/virtio-console.c

  Log Message:
  -----------
  virtio-console: Fix VIRTIO_CONSOLE() cast macro

Commit 0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM
cast cleanup for VirtConsole) broke virtserialport since it shares
functions and state struct with virtconsole. Let virtconsole inherit
from virtserialport, and use virtserialport type for casting.

Note that virtio-serial-port is the abstract base type in
virtio-serial-bus.c, whereas virtserialport is the user-instantiatable
type in virtio-console.c. Therefore using TYPE_VIRTIO_CONSOLE_SERIAL_PORT.

Reported-by: Richard W.M. Jones <address@hidden>
Acked-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: f33f991185bccd22963c256437b9d8ea63361ff5
      
https://github.com/qemu/qemu/commit/f33f991185bccd22963c256437b9d8ea63361ff5
  Author: Andreas Färber <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M tests/virtio-console-test.c

  Log Message:
  -----------
  virtio-console-test: Test virtserialport as well

A test is only as good as its coverage - testing virtserialport in
addition to virtconsole showed that commit
0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM cast
cleanup for VirtConsole) broke virtserialport.

Acked-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: cb201b4872f16dfbce63f8648b2584631e2e965f
      
https://github.com/qemu/qemu/commit/cb201b4872f16dfbce63f8648b2584631e2e965f
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  qtest: Fix crash if SIGABRT during qtest_init()

If an assertion fails during qtest_init() the SIGABRT handler is
invoked.  This is the correct behavior since we need to kill the QEMU
process to avoid leaking it when the test dies.

The global_qtest pointer used by the SIGABRT handler is currently only
assigned after qtest_init() returns.  This results in a segfault if an
assertion failure occurs during qtest_init().

Move global_qtest assignment inside qtest_init().  Not pretty but let's
face it - the signal handler depends on global state.

Reported-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Tested-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 01c22f2cdd4fcf02276ea10f48253850a5fd7259
      
https://github.com/qemu/qemu/commit/01c22f2cdd4fcf02276ea10f48253850a5fd7259
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M main-loop.c
    M stubs/Makefile.objs
    A stubs/qtest.c

  Log Message:
  -----------
  main-loop: Suppress "I/O thread spun" warnings for qtest

When running under qtest we don't actually have any vcpu threads
to be starved, so the warning about the I/O thread spinning isn't
relevant, and the way qtest manipulates the simulated clock means
the warning is produced a lot as a false positive. Suppress it if
qtest_enabled(), so 'make check' output is less noisy.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: b19fc63cadb2815d5bcb1ec25b22849e455cbb31
      
https://github.com/qemu/qemu/commit/b19fc63cadb2815d5bcb1ec25b22849e455cbb31
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M hw/char/virtio-console.c
    M main-loop.c
    M stubs/Makefile.objs
    A stubs/qtest.c
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/virtio-console-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into 
staging

QOM/QTest infrastructure fixes

* QOM cast fix for virtserialport and regression test
* QTest error handling fix
* QTest output cleanup

# gpg: Signature made Thu 13 Mar 2014 20:43:34 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/qom-devices-for-2.0:
  main-loop: Suppress "I/O thread spun" warnings for qtest
  qtest: Fix crash if SIGABRT during qtest_init()
  virtio-console-test: Test virtserialport as well
  virtio-console: Fix VIRTIO_CONSOLE() cast macro

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


Compare: https://github.com/qemu/qemu/compare/90c5d39cb847...b19fc63cadb2