[Qemu-commits] [qemu/qemu] b8030a: hw/xen/xen_pt_load_rom: Remove unused includes

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b8030af450b629ce8066512c6f2a69afacf8324a
      
https://github.com/qemu/qemu/commit/b8030af450b629ce8066512c6f2a69afacf8324a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-27 (Thu, 27 Feb 2020)

  Changed paths:
    M hw/xen/xen_pt_load_rom.c

  Log Message:
  -----------
  hw/xen/xen_pt_load_rom: Remove unused includes

xen_pt_load_rom.c does not use any of these includes, remove them.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Paul Durrant <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>


  Commit: 32d0b7be68216f130dc962533c6fc2f9ad848a8b
      
https://github.com/qemu/qemu/commit/32d0b7be68216f130dc962533c6fc2f9ad848a8b
  Author: Paul Durrant <address@hidden>
  Date:   2020-02-27 (Thu, 27 Feb 2020)

  Changed paths:
    M hw/block/dataplane/xen-block.c
    M hw/xen/xen-bus.c
    M include/hw/xen/xen-bus.h

  Log Message:
  -----------
  xen-bus/block: explicitly assign event channels to an AioContext

It is not safe to close an event channel from the QEMU main thread when
that channel's poller is running in IOThread context.

This patch adds a new xen_device_set_event_channel_context() function
to explicitly assign the channel AioContext, and modifies
xen_device_bind_event_channel() to initially assign the channel's poller
to the QEMU main thread context. The code in xen-block's dataplane is
then modified to assign the channel to IOThread context during
xen_block_dataplane_start() and de-assign it during in
xen_block_dataplane_stop(), such that the channel is always assigned
back to main thread context before it is closed. aio_set_fd_handler()
already deals with all the necessary synchronization when moving an fd
between AioContext-s so no extra code is needed to manage this.

Reported-by: Julien Grall <address@hidden>
Signed-off-by: Paul Durrant <address@hidden>
Reviewed-by: Anthony PERARD <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>


  Commit: 5d4c954931ba62661c6a1bc16ce604a012a10007
      
https://github.com/qemu/qemu/commit/5d4c954931ba62661c6a1bc16ce604a012a10007
  Author: Anthony PERARD <address@hidden>
  Date:   2020-02-27 (Thu, 27 Feb 2020)

  Changed paths:
    M exec.c

  Log Message:
  -----------
  Memory: Only call ramblock_ptr when needed in qemu_ram_writeback

It is possible that a ramblock doesn't have memory that QEMU can
access, this is the case with the Xen hypervisor.

In order to avoid to trigger an assert, only call ramblock_ptr() when
needed in qemu_ram_writeback(). This should fix migration of Xen
guests that was broken with bd108a44bc29 ("migration: ram: Switch to
ram block writeback").

Signed-off-by: Anthony PERARD <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>


  Commit: 4ae046b8314de2245218032c8b234c6fdb50478d
      
https://github.com/qemu/qemu/commit/4ae046b8314de2245218032c8b234c6fdb50478d
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-28 (Fri, 28 Feb 2020)

  Changed paths:
    M exec.c
    M hw/block/dataplane/xen-block.c
    M hw/xen/xen-bus.c
    M hw/xen/xen_pt_load_rom.c
    M include/hw/xen/xen-bus.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200227' into 
staging

Xen queue 2020-02-27

* fix for xen-block
* fix in exec.c for migration of xen guest
* one cleanup patch

# gpg: Signature made Thu 27 Feb 2020 11:57:12 GMT
# gpg:                using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Anthony PERARD <address@hidden>" [marginal]
# gpg:                 aka "Anthony PERARD <address@hidden>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
#      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF

* remotes/aperard/tags/pull-xen-20200227:
  Memory: Only call ramblock_ptr when needed in qemu_ram_writeback
  xen-bus/block: explicitly assign event channels to an AioContext
  hw/xen/xen_pt_load_rom: Remove unused includes

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


Compare: https://github.com/qemu/qemu/compare/430f63e250a5...4ae046b8314d