diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2023-01-02 00:39:13 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2023-03-07 17:04:30 +0000 |
| commit | e2abfe5ec67b69fb310fbeaacf7e68d61d16609e (patch) | |
| tree | 6407aa775a6ad79ddc137bef296c936b08b37a9c /hw/block | |
| parent | a9ae1418b36b20ab06fb760b1108f61f49a76164 (diff) | |
| download | qemu-e2abfe5ec67b69fb310fbeaacf7e68d61d16609e.zip qemu-e2abfe5ec67b69fb310fbeaacf7e68d61d16609e.tar.gz qemu-e2abfe5ec67b69fb310fbeaacf7e68d61d16609e.tar.bz2 | |
hw/xen: Rename xen_common.h to xen_native.h
This header is now only for native Xen code, not PV backends that may be
used in Xen emulation. Since the toolstack libraries may depend on the
specific version of Xen headers that they pull in (and will set the
__XEN_TOOLS__ macro to enable internal definitions that they depend on),
the rule is that xen_native.h (and thus the toolstack library headers)
must be included *before* any of the headers in include/hw/xen/interface.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/dataplane/xen-block.c | 3 | ||||
| -rw-r--r-- | hw/block/xen-block.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 8322a1d..734da42 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -23,8 +23,9 @@ #include "qemu/main-loop.h" #include "qemu/memalign.h" #include "qapi/error.h" -#include "hw/xen/xen_common.h" +#include "hw/xen/xen.h" #include "hw/block/xen_blkif.h" +#include "hw/xen/interface/io/ring.h" #include "sysemu/block-backend.h" #include "sysemu/iothread.h" #include "xen-block.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 345b284..8729961 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -19,7 +19,6 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qom/object_interfaces.h" -#include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "hw/qdev-properties.h" #include "hw/xen/xen-block.h" |