diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-03 14:16:55 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-06-05 11:01:05 +0200 |
| commit | b8116f4cbaa0f64bb07564f20b3b5219e23c8bff (patch) | |
| tree | acd761e49a8fd348708ecc1f99a9b0a4094c9fc9 | |
| parent | ef7c70f020ca1fe9e7c98ea2cd9d6ba3c5714716 (diff) | |
| download | focaccia-qemu-b8116f4cbaa0f64bb07564f20b3b5219e23c8bff.tar.gz focaccia-qemu-b8116f4cbaa0f64bb07564f20b3b5219e23c8bff.zip | |
update-linux-headers: move pvpanic.h to correct directory
Linux has <misc/pvpanic.h>, not <linux/pvpanic.h>. Use the same directory for QEMU's include/standard-headers/ copy. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/misc/pvpanic-isa.c | 2 | ||||
| -rw-r--r-- | hw/misc/pvpanic-pci.c | 2 | ||||
| -rw-r--r-- | hw/misc/pvpanic.c | 2 | ||||
| -rw-r--r-- | include/standard-headers/misc/pvpanic.h (renamed from include/standard-headers/linux/pvpanic.h) | 0 | ||||
| -rwxr-xr-x | scripts/update-linux-headers.sh | 6 |
5 files changed, 7 insertions, 5 deletions
diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c index ccec50f61b..b4f84c4110 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 83be95d0d2..4d44a881da 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 1540e9091a..80289ecf5f 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/include/standard-headers/linux/pvpanic.h b/include/standard-headers/misc/pvpanic.h index 54b7485390..54b7485390 100644 --- a/include/standard-headers/linux/pvpanic.h +++ b/include/standard-headers/misc/pvpanic.h diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 57a48837aa..7e93acb3b5 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" |