aboutsummaryrefslogtreecommitdiff
path: root/include/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-06-14 16:32:32 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-06-14 16:32:32 +0100
commit49237b856ae58ee7955be0b959c504c51b014f20 (patch)
tree7b827dc81ed79226b9e4d15f266bcf6de51bdd87 /include/hw
parent1be08a0946b1a189ac72822182c37367e8cd3d87 (diff)
parentb1b23e5bbfb66d9401e2c2b0646fb721d94a3f83 (diff)
downloadqemu-49237b856ae58ee7955be0b959c504c51b014f20.zip
qemu-49237b856ae58ee7955be0b959c504c51b014f20.tar.gz
qemu-49237b856ae58ee7955be0b959c504c51b014f20.tar.bz2
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160614-tag' into staging
Xen 2016/06/14 # gpg: Signature made Tue 14 Jun 2016 16:01:52 BST # gpg: using RSA key 0x894F8F4870E1AE90 # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>" # Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90 * remotes/sstabellini/tags/xen-20160614-tag: xen: Clean up includes xen/blkif: avoid double access to any shared ring request fields Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
-rw-r--r--include/hw/xen/xen.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 6365483..b2cd992 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -8,7 +8,6 @@
*/
#include "qemu-common.h"
-#include "qemu/typedefs.h"
#include "exec/cpu-common.h"
#include "hw/irq.h"