diff options
| author | Peter Maydell | 2017-10-27 15:43:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-27 15:43:02 +0200 |
| commit | a93ece47fd9edbd4558db24300056c9a57d3bcd4 (patch) | |
| tree | 8a331861fe314d46a9bdbe21318775dc1e1044eb /include | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | xen: Log errno rather than return value (diff) | |
| download | qemu-a93ece47fd9edbd4558db24300056c9a57d3bcd4.tar.gz qemu-a93ece47fd9edbd4558db24300056c9a57d3bcd4.tar.xz qemu-a93ece47fd9edbd4558db24300056c9a57d3bcd4.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20171026-tag' into staging
Xen 2017/10/26
# gpg: Signature made Thu 26 Oct 2017 23:57:16 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20171026-tag:
xen: Log errno rather than return value
xen: dont try setting max grants multiple times
xen: add a global indicator for grant copy being available
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/xen_backend.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 8a6fbcbe20..3a27692407 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -16,6 +16,7 @@ /* variables */ extern struct xs_handle *xenstore; extern const char *xen_protocol; +extern bool xen_feature_grant_copy; extern DeviceState *xen_sysdev; extern BusState *xen_sysbus; |