summary refs log tree commit diff stats
path: root/include/standard-headers/asm-x86/bootparam.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-07-25 13:49:41 +0100
committerPeter Maydell <peter.maydell@linaro.org>2022-07-25 13:49:41 +0100
commit616a6459d878999b37c7cfbf1ed8d4ca84b3751f (patch)
tree298a156beaf064924fe109524932123bc0b369eb /include/standard-headers/asm-x86/bootparam.h
parent5288bee45fbd33203b61f8c76e41b15bb5913e6e (diff)
parent67f7e426e53833a5db75b0d813e8d537b8a75bd2 (diff)
downloadfocaccia-qemu-616a6459d878999b37c7cfbf1ed8d4ca84b3751f.tar.gz
focaccia-qemu-616a6459d878999b37c7cfbf1ed8d4ca84b3751f.zip
Merge tag 'for-upstream2' of https://gitlab.com/bonzini/qemu into staging
* Bug fixes
* Pass random seed to x86 and other FDT platforms

# gpg: Signature made Fri 22 Jul 2022 18:26:45 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream2' of https://gitlab.com/bonzini/qemu:
  hw/i386: pass RNG seed via setup_data entry
  hw/rx: pass random seed to fdt
  hw/mips: boston: pass random seed to fdt
  hw/nios2: virt: pass random seed to fdt
  oss-fuzz: ensure base_copy is a generic-fuzzer
  oss-fuzz: remove binaries from qemu-bundle tree
  accel/kvm: Avoid Coverity warning in query_stats()
  docs: Add caveats for Windows as the build platform

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/standard-headers/asm-x86/bootparam.h')
-rw-r--r--include/standard-headers/asm-x86/bootparam.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/standard-headers/asm-x86/bootparam.h b/include/standard-headers/asm-x86/bootparam.h
index 072e2ed546..b2aaad10e5 100644
--- a/include/standard-headers/asm-x86/bootparam.h
+++ b/include/standard-headers/asm-x86/bootparam.h
@@ -10,6 +10,7 @@
 #define SETUP_EFI			4
 #define SETUP_APPLE_PROPERTIES		5
 #define SETUP_JAILHOUSE			6
+#define SETUP_RNG_SEED			9
 
 #define SETUP_INDIRECT			(1<<31)