a3434a2d56
A Xen public header have been imported into QEMU (by
f65eadb639 "xen: import ring.h from xen"), but there are other header
that depends on ring.h which come from the system when building QEMU.
This patch resolves the issue of having headers from the system
importing a different copie of ring.h.
This patch is prompt by the build issue described in the previous
patch: 'Revert xen/io/ring.h of "Clean up a few header guard symbols"'
ring.h and the new imported headers are moved to
"include/hw/xen/interface" as those describe interfaces with a guest.
The imported headers are cleaned up a bit while importing them: some
part of the file that QEMU doesn't use are removed (description
of how to make hypercall in grant_table.h have been removed).
Other cleanup:
- xen-mapcache.c and xen-legacy-backend.c don't need grant_table.h.
- xenfb.c doesn't need event_channel.h.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Message-Id: <20190621105441.3025-3-anthony.perard@citrix.com>
47 lines
1.7 KiB
C
47 lines
1.7 KiB
C
/******************************************************************************
|
|
* console.h
|
|
*
|
|
* Console I/O interface for Xen guest OSes.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Copyright (c) 2005, Keir Fraser
|
|
*/
|
|
|
|
#ifndef __XEN_PUBLIC_IO_CONSOLE_H__
|
|
#define __XEN_PUBLIC_IO_CONSOLE_H__
|
|
|
|
typedef uint32_t XENCONS_RING_IDX;
|
|
|
|
#define MASK_XENCONS_IDX(idx, ring) ((idx) & (sizeof(ring)-1))
|
|
|
|
struct xencons_interface {
|
|
char in[1024];
|
|
char out[2048];
|
|
XENCONS_RING_IDX in_cons, in_prod;
|
|
XENCONS_RING_IDX out_cons, out_prod;
|
|
};
|
|
|
|
#ifdef XEN_WANT_FLEX_CONSOLE_RING
|
|
#include "ring.h"
|
|
DEFINE_XEN_FLEX_RING(xencons);
|
|
#endif
|
|
|
|
#endif /* __XEN_PUBLIC_IO_CONSOLE_H__ */
|