diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-27 15:52:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-27 15:52:36 +0100 |
| commit | 23919ddfd56135cad3cb468a8f54d5a595f024f4 (patch) | |
| tree | cd0383fd2ad62e8e46a39b17164989b83508e733 /include | |
| parent | dac03af5d5482ec7ee9c23db467bb7230b33c0d9 (diff) | |
| parent | 705be570941b38cd1cbebc68f7f671ce7532ecb0 (diff) | |
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 "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
# gpg: aka "Anthony PERARD <anthony.perard@citrix.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/interface/io/ring.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/hw/xen/interface/io/ring.h b/include/hw/xen/interface/io/ring.h index 1adacf09f9..5d048b335c 100644 --- a/include/hw/xen/interface/io/ring.h +++ b/include/hw/xen/interface/io/ring.h @@ -33,6 +33,13 @@ * - standard integers types (uint8_t, uint16_t, etc) * They are provided by stdint.h of the standard headers. * + * Before using the different macros, you need to provide the following + * macros: + * - xen_mb() a memory barrier + * - xen_rmb() a read memory barrier + * - xen_wmb() a write memory barrier + * Example of those can be found in xenctrl.h. + * * In addition, if you intend to use the FLEX macros, you also need to * provide the following, before invoking the FLEX macros: * - size_t @@ -42,12 +49,6 @@ * and grant_table.h from the Xen public headers. */ -#if __XEN_INTERFACE_VERSION__ < 0x00030208 -#define xen_mb() mb() -#define xen_rmb() rmb() -#define xen_wmb() wmb() -#endif - typedef unsigned int RING_IDX; /* Round a 32-bit unsigned constant down to the nearest power of two. */ |