diff options
| author | Stefano Stabellini <sstabellini@kernel.org> | 2017-03-21 13:51:25 -0700 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2017-04-21 12:41:29 -0700 |
| commit | f65eadb6394340ccf7d23533c7844b6e21c056e9 (patch) | |
| tree | 772fd8a08b09aeb6cdf3fe7d42cddaf55ebb8f39 /hw | |
| parent | c1cdd9d5beb052b072c1f57ea634e3c52e9dc17b (diff) | |
| download | qemu-f65eadb6394340ccf7d23533c7844b6e21c056e9.zip qemu-f65eadb6394340ccf7d23533c7844b6e21c056e9.tar.gz qemu-f65eadb6394340ccf7d23533c7844b6e21c056e9.tar.bz2 | |
xen: import ring.h from xen
Do not use the ring.h header installed on the system. Instead, import
the header into the QEMU codebase. This avoids problems when QEMU is
built against a Xen version too old to provide all the ring macros.
Signed-off-by: Stefano Stabellini <stefano@aporeto.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
CC: anthony.perard@citrix.com
CC: jgross@suse.com
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/xen_blkif.h | 2 | ||||
| -rw-r--r-- | hw/usb/xen-usb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h index 3300b6f..3e6e1ea 100644 --- a/hw/block/xen_blkif.h +++ b/hw/block/xen_blkif.h @@ -1,7 +1,7 @@ #ifndef XEN_BLKIF_H #define XEN_BLKIF_H -#include <xen/io/ring.h> +#include "hw/xen/io/ring.h" #include <xen/io/blkif.h> #include <xen/io/protocols.h> diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 8e676e6..370b3d9 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -33,7 +33,7 @@ #include "qapi/qmp/qint.h" #include "qapi/qmp/qstring.h" -#include <xen/io/ring.h> +#include "hw/xen/io/ring.h" #include <xen/io/usbif.h> /* |