diff mbox series

[2/4] update-linux-headers: move pvpanic.h to correct directory

Message ID 20240603131141.834241-3-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series update-linux-headers: prepare for updating to 6.9+ and for SNP patches | expand

Commit Message

Paolo Bonzini June 3, 2024, 1:11 p.m. UTC 
Linux has <misc/pvpanic.h>, not <linux/pvpanic.h>.  Use the same
directory for QEMU's include/standard-headers/ copy.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/standard-headers/{linux => misc}/pvpanic.h | 0
 hw/misc/pvpanic-isa.c                              | 2 +-
 hw/misc/pvpanic-pci.c                              | 2 +-
 hw/misc/pvpanic.c                                  | 2 +-
 scripts/update-linux-headers.sh                    | 6 ++++--
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename include/standard-headers/{linux => misc}/pvpanic.h (100%)

Comments

Thomas Huth June 3, 2024, 2:58 p.m. UTC | #1 
On 03/06/2024 15.11, Paolo Bonzini wrote:
> Linux has <misc/pvpanic.h>, not <linux/pvpanic.h>.  Use the same
> directory for QEMU's include/standard-headers/ copy.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   include/standard-headers/{linux => misc}/pvpanic.h | 0
>   hw/misc/pvpanic-isa.c                              | 2 +-
>   hw/misc/pvpanic-pci.c                              | 2 +-
>   hw/misc/pvpanic.c                                  | 2 +-
>   scripts/update-linux-headers.sh                    | 6 ++++--
>   5 files changed, 7 insertions(+), 5 deletions(-)
>   rename include/standard-headers/{linux => misc}/pvpanic.h (100%)

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/include/standard-headers/linux/pvpanic.h b/include/standard-headers/misc/pvpanic.h
similarity index 100%
rename from include/standard-headers/linux/pvpanic.h
rename to include/standard-headers/misc/pvpanic.h
diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
index ccec50f61bb..b4f84c41109 100644
--- a/hw/misc/pvpanic-isa.c
+++ b/hw/misc/pvpanic-isa.c
@@ -21,7 +21,7 @@ 
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"
 #include "hw/isa/isa.h"
-#include "standard-headers/linux/pvpanic.h"
+#include "standard-headers/misc/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 83be95d0d24..4d44a881dad 100644
--- a/hw/misc/pvpanic-pci.c
+++ b/hw/misc/pvpanic-pci.c
@@ -21,7 +21,7 @@ 
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"
 #include "hw/pci/pci_device.h"
-#include "standard-headers/linux/pvpanic.h"
+#include "standard-headers/misc/pvpanic.h"
 
 OBJECT_DECLARE_SIMPLE_TYPE(PVPanicPCIState, PVPANIC_PCI_DEVICE)
 
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 1540e9091a4..80289ecf5fe 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -21,7 +21,7 @@ 
 #include "hw/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"
-#include "standard-headers/linux/pvpanic.h"
+#include "standard-headers/misc/pvpanic.h"
 
 static void handle_event(int event)
 {
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index ae34d18572b..7b39cc426e0 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -231,10 +231,12 @@  for i in "$hdrdir"/include/linux/*virtio*.h \
          "$hdrdir/include/linux/const.h" \
          "$hdrdir/include/linux/kernel.h" \
          "$hdrdir/include/linux/vhost_types.h" \
-         "$hdrdir/include/linux/sysinfo.h" \
-         "$hdrdir/include/misc/pvpanic.h"; do
+         "$hdrdir/include/linux/sysinfo.h"; do
     cp_portable "$i" "$output/include/standard-headers/linux"
 done
+mkdir -p "$output/include/standard-headers/misc"
+cp_portable "$hdrdir/include/misc/pvpanic.h" \
+            "$output/include/standard-headers/misc"
 mkdir -p "$output/include/standard-headers/drm"
 cp_portable "$hdrdir/include/drm/drm_fourcc.h" \
             "$output/include/standard-headers/drm"