On Thu, Feb 08, 2024 at 09:02:20PM +0100, Thomas Weißschuh wrote:
> misc/pvpanic.h from the Linux UAPI does not define a Linux UAPI but a
> qemu device API.
>
> This leads to a weird process when updates to the interface are needed:
> 1) Change to the specification in the qemu tree
> 2) Change to the header in the Linux tree
> 3) Re-import of the header into Qemu.
>
> The kernel prefers to drop the header anyways.
>
> Prepare for the removal from the Linux UAPI headers by moving the
> contents to the existing pvpanic.h header.
>
> Link: https://lore.kernel.org/lkml/2023110431-pacemaker-pruning-0e4c@gregkh/
> Reviewed-by: Thomas Huth <th...@redhat.com>
> Reviewed-by: Cornelia Huck <coh...@redhat.com>
> Signed-off-by: Thomas Weißschuh <tho...@t-8ch.de>
I don't think I agree with greg. The interaction is with hypervisor
not with userspace but linux does not have a separate
directory for that and the implications are mostly the same.
> ---
> hw/misc/pvpanic-isa.c | 1 -
> hw/misc/pvpanic-pci.c | 1 -
> hw/misc/pvpanic.c | 1 -
> include/hw/misc/pvpanic.h | 3 +++
> include/standard-headers/linux/pvpanic.h | 9 ---------
> scripts/update-linux-headers.sh | 3 +--
> 6 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
> index ccec50f61bbd..ef438a31fbe9 100644
> --- a/hw/misc/pvpanic-isa.c
> +++ b/hw/misc/pvpanic-isa.c
> @@ -21,7 +21,6 @@
> #include "hw/misc/pvpanic.h"
> #include "qom/object.h"
> #include "hw/isa/isa.h"
> -#include "standard-headers/linux/pvpanic.h"
> #include "hw/acpi/acpi_aml_interface.h"
>
> OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE)
> diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c
> index c01e4ce8646a..01e269b55284 100644
> --- a/hw/misc/pvpanic-pci.c
> +++ b/hw/misc/pvpanic-pci.c
> @@ -21,7 +21,6 @@
> #include "hw/misc/pvpanic.h"
> #include "qom/object.h"
> #include "hw/pci/pci_device.h"
> -#include "standard-headers/linux/pvpanic.h"
>
> OBJECT_DECLARE_SIMPLE_TYPE(PVPanicPCIState, PVPANIC_PCI_DEVICE)
>
> diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
> index 1540e9091a45..4915ef256e74 100644
> --- a/hw/misc/pvpanic.c
> +++ b/hw/misc/pvpanic.c
> @@ -21,7 +21,6 @@
> #include "hw/qdev-properties.h"
> #include "hw/misc/pvpanic.h"
> #include "qom/object.h"
> -#include "standard-headers/linux/pvpanic.h"
>
> static void handle_event(int event)
> {
> diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> index fab94165d03d..dffca827f77a 100644
> --- a/include/hw/misc/pvpanic.h
> +++ b/include/hw/misc/pvpanic.h
> @@ -18,6 +18,9 @@
> #include "exec/memory.h"
> #include "qom/object.h"
>
> +#define PVPANIC_PANICKED (1 << 0)
> +#define PVPANIC_CRASH_LOADED (1 << 1)
> +
> #define TYPE_PVPANIC_ISA_DEVICE "pvpanic"
> #define TYPE_PVPANIC_PCI_DEVICE "pvpanic-pci"
>
> diff --git a/include/standard-headers/linux/pvpanic.h
> b/include/standard-headers/linux/pvpanic.h
> deleted file mode 100644
> index 54b7485390d3..000000000000
> --- a/include/standard-headers/linux/pvpanic.h
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -
> -#ifndef __PVPANIC_H__
> -#define __PVPANIC_H__
> -
> -#define PVPANIC_PANICKED (1 << 0)
> -#define PVPANIC_CRASH_LOADED (1 << 1)
> -
> -#endif /* __PVPANIC_H__ */
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index a0006eec6fd1..c4fea51c93fd 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -218,8 +218,7 @@ for i in "$tmpdir"/include/linux/*virtio*.h \
> "$tmpdir/include/linux/const.h" \
> "$tmpdir/include/linux/kernel.h" \
> "$tmpdir/include/linux/vhost_types.h" \
> - "$tmpdir/include/linux/sysinfo.h" \
> - "$tmpdir/include/misc/pvpanic.h"; do
> + "$tmpdir/include/linux/sysinfo.h"; do
> cp_portable "$i" "$output/include/standard-headers/linux"
> done
> mkdir -p "$output/include/standard-headers/drm"
>
> --
> 2.43.0
