[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/76] i386: import & use bootparam.h
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 37/76] i386: import & use bootparam.h |
Date: |
Tue, 5 Feb 2019 19:14:47 +0100 |
From: Li Zhijian <address@hidden>
it's from v4.20-rc5.
CC: Stefano Garzarella <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/pc.c | 8 +------
include/standard-headers/asm-x86/bootparam.h | 34 ++++++++++++++++++++++++++++
scripts/update-linux-headers.sh | 6 +++++
3 files changed, 41 insertions(+), 7 deletions(-)
create mode 100644 include/standard-headers/asm-x86/bootparam.h
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 00166d1..9664822 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -76,6 +76,7 @@
#include "hw/usb.h"
#include "hw/i386/intel_iommu.h"
#include "hw/net/ne2000-isa.h"
+#include "standard-headers/asm-x86/bootparam.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
@@ -1059,13 +1060,6 @@ static long get_file_size(FILE *f)
return size;
}
-/* setup_data types */
-#define SETUP_NONE 0
-#define SETUP_E820_EXT 1
-#define SETUP_DTB 2
-#define SETUP_PCI 3
-#define SETUP_EFI 4
-
struct setup_data {
uint64_t next;
uint32_t type;
diff --git a/include/standard-headers/asm-x86/bootparam.h
b/include/standard-headers/asm-x86/bootparam.h
new file mode 100644
index 0000000..67d4f01
--- /dev/null
+++ b/include/standard-headers/asm-x86/bootparam.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _ASM_X86_BOOTPARAM_H
+#define _ASM_X86_BOOTPARAM_H
+
+/* setup_data types */
+#define SETUP_NONE 0
+#define SETUP_E820_EXT 1
+#define SETUP_DTB 2
+#define SETUP_PCI 3
+#define SETUP_EFI 4
+#define SETUP_APPLE_PROPERTIES 5
+#define SETUP_JAILHOUSE 6
+
+/* ram_size flags */
+#define RAMDISK_IMAGE_START_MASK 0x07FF
+#define RAMDISK_PROMPT_FLAG 0x8000
+#define RAMDISK_LOAD_FLAG 0x4000
+
+/* loadflags */
+#define LOADED_HIGH (1<<0)
+#define KASLR_FLAG (1<<1)
+#define QUIET_FLAG (1<<5)
+#define KEEP_SEGMENTS (1<<6)
+#define CAN_USE_HEAP (1<<7)
+
+/* xloadflags */
+#define XLF_KERNEL_64 (1<<0)
+#define XLF_CAN_BE_LOADED_ABOVE_4G (1<<1)
+#define XLF_EFI_HANDOVER_32 (1<<2)
+#define XLF_EFI_HANDOVER_64 (1<<3)
+#define XLF_EFI_KEXEC (1<<4)
+
+
+#endif /* _ASM_X86_BOOTPARAM_H */
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 0a964fe..3578cfe 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -120,6 +120,12 @@ for arch in $ARCHLIST; do
cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
cp_portable "$tmpdir/include/asm/kvm_para.h"
"$output/include/standard-headers/asm-$arch"
+ # Remove everything except the macros from bootparam.h avoiding the
+ # unnecessary import of several video/ist/etc headers
+ sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \
+ "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"
+ cp_portable "$tmpdir/bootparam.h" \
+ "$output/include/standard-headers/asm-$arch"
fi
done
--
1.8.3.1
- [Qemu-devel] [PULL 19/76] hw/i386/pc: use PVH option rom, (continued)
- [Qemu-devel] [PULL 19/76] hw/i386/pc: use PVH option rom, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 26/76] contrib/elf2dmp: fix elf.h including, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 12/76] elf-ops.h: Add get_elf_note_type(), Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 21/76] hw/i386/pc: enable PVH only for machine type >= 4.0, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 27/76] contrib/elf2dmp: use GLib in ELF processing, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 29/76] contrib/elf2dmp: fix structures definitions, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 28/76] contrib/elf2dmp: use GLib in PDB processing, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 32/76] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 38/76] i386: allow to load initrd below 4 GB for recent linux, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 42/76] scsi-generic: avoid possible out-of-bounds access to r->buf, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 37/76] i386: import & use bootparam.h,
Paolo Bonzini <=
- [Qemu-devel] [PULL 47/76] vfio: move conditional up to hw/Makefile.objs, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 14/76] pvh: Boot uncompressed kernel using direct boot ABI, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 31/76] configure: enable elf2dmp build for Windows hosts, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 16/76] linuxboot_dma: remove duplicate definitions of FW_CFG, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 04/76] vhost-user-test: skip if there is no memory at address 0, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 45/76] arm: disable CONFIG_SERIAL_ISA, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 44/76] qemu-options: Remove deprecated "-virtioconsole" option, Paolo Bonzini, 2019/02/05
- [Qemu-devel] [PULL 49/76] build: actually use CONFIG_PAM, Paolo Bonzini, 2019/02/05