[Qemu-commits] [qemu/qemu] d297e5: xen: Fix ring.h header

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d297e533a5f653336dbc1c5a24ea196391dff9f5
      
https://github.com/qemu/qemu/commit/d297e533a5f653336dbc1c5a24ea196391dff9f5
  Author: Anthony PERARD <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M include/hw/xen/interface/io/ring.h

  Log Message:
  -----------
  xen: Fix ring.h header

The xen_[rw]?mb() macros defined in ring.h can't be used and the fact
that there are gated behind __XEN_INTERFACE_VERSION__ means that it
needs to be defined somewhere. QEMU doesn't implement interfaces with
the Xen hypervisor so defining __XEN_INTERFACE_VERSION__ is pointless.
This leads to:
    include/hw/xen/io/ring.h:47:5: error: "__XEN_INTERFACE_VERSION__"
        is not defined, evaluates to 0 [-Werror=undef]

Cleanup ring.h. The xen_*mb() macros are already defined in xenctrl.h
which is included in xen_common.h.

Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
[aperard: Adding the comment proposed upstream]
Signed-off-by: Anthony PERARD <address@hidden>


  Commit: ba7fdd64b6714af7e42dfbe5969caf62c0823f75
      
https://github.com/qemu/qemu/commit/ba7fdd64b6714af7e42dfbe5969caf62c0823f75
  Author: Igor Druzhinin <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M hw/i386/xen/xen-hvm.c

  Log Message:
  -----------
  xen: cleanup IOREQ server on exit

Device model is supposed to destroy IOREQ server for itself.

Signed-off-by: Igor Druzhinin <address@hidden>
Acked-by: Paul Durrant <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>


  Commit: cb3231460747552d70af9d546dc53d8195bcb796
      
https://github.com/qemu/qemu/commit/cb3231460747552d70af9d546dc53d8195bcb796
  Author: Anthony PERARD <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M hw/xen/xen-bus.c

  Log Message:
  -----------
  xen-bus: Fix backend state transition on device reset

When a frontend wants to reset its state and the backend one, it
starts with setting "Closing", then waits for the backend (QEMU) to do
the same.

But when QEMU is setting "Closing" to its state, it triggers an event
(xenstore watch) that re-execute xen_device_backend_changed() and set
the backend state to "Closed". QEMU should wait for the frontend to
set "Closed" before doing the same.

Before setting "Closed" to the backend_state, we are also going to
check if there is a frontend. If that the case, when the backend state
is set to "Closing" the frontend should react and sets its state to
"Closing" then "Closed". The backend should wait for that to happen.

Fixes: b6af8926fb858c4f1426e5acb2cfc1f0580ec98a
Signed-off-by: Anthony PERARD <address@hidden>
Reviewed-by: Paul Durrant <address@hidden>
Message-Id: <address@hidden>


  Commit: 705be570941b38cd1cbebc68f7f671ce7532ecb0
      
https://github.com/qemu/qemu/commit/705be570941b38cd1cbebc68f7f671ce7532ecb0
  Author: Anthony PERARD <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M hw/xen/xen-bus.c

  Log Message:
  -----------
  xen-bus: Avoid rewriting identical values to xenstore

When QEMU receives a xenstore watch event suggesting that the "state"
of the frontend changed, it records this in its own state but it also
re-write the value back into xenstore even so there were no change.
This triggers an unnecessary xenstore watch event which QEMU will
process again (and maybe the frontend as well). Also QEMU could
potentially write an already old value.

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


  Commit: 23919ddfd56135cad3cb468a8f54d5a595f024f4
      
https://github.com/qemu/qemu/commit/23919ddfd56135cad3cb468a8f54d5a595f024f4
  Author: Peter Maydell <address@hidden>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M hw/i386/xen/xen-hvm.c
    M hw/xen/xen-bus.c
    M include/hw/xen/interface/io/ring.h

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

Xen queue

* Fixes for xen-bus and exit cleanup.
* Build fix.

# gpg: Signature made Tue 27 Aug 2019 14:31:10 BST
# 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-20190827:
  xen-bus: Avoid rewriting identical values to xenstore
  xen-bus: Fix backend state transition on device reset
  xen: cleanup IOREQ server on exit
  xen: Fix ring.h header

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


Compare: https://github.com/qemu/qemu/compare/dac03af5d548...23919ddfd561