You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
3.6 KiB
96 lines
3.6 KiB
1 month ago
|
From 00e250d9df1949d363758a34e3f46d8c71be054f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Date: Mon, 3 Jun 2024 14:16:55 +0200
|
||
|
|
Subject: [PATCH 051/100] update-linux-headers: move pvpanic.h to correct
|
||
|
|
directory
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-MergeRequest: 245: SEV-SNP support
|
||
|
|
RH-Jira: RHEL-39544
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [51/91] 10efff5bbcb867ba34f3f9ff8045381ea96f94c7 (bonzini/rhel-qemu-kvm)
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit b8116f4cbaa0f64bb07564f20b3b5219e23c8bff)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
hw/misc/pvpanic-isa.c | 2 +-
|
||
|
|
hw/misc/pvpanic-pci.c | 2 +-
|
||
|
|
hw/misc/pvpanic.c | 2 +-
|
||
|
|
include/standard-headers/{linux => misc}/pvpanic.h | 0
|
||
|
|
scripts/update-linux-headers.sh | 6 ++++--
|
||
|
|
5 files changed, 7 insertions(+), 5 deletions(-)
|
||
|
|
rename include/standard-headers/{linux => misc}/pvpanic.h (100%)
|
||
|
|
|
||
|
|
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
|
||
|
|
similarity index 100%
|
||
|
|
rename from include/standard-headers/linux/pvpanic.h
|
||
|
|
rename to include/standard-headers/misc/pvpanic.h
|
||
|
|
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
|
||
|
|
index 78c0f2c43e..90759dcfe0 100755
|
||
|
|
--- a/scripts/update-linux-headers.sh
|
||
|
|
+++ b/scripts/update-linux-headers.sh
|
||
|
|
@@ -232,10 +232,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"
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|