mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
Removal of deprecated code
- Remove the Nios II target and hardware - Remove pvrdma device and rdmacm-mux helper - Remove GlusterFS RDMA protocol handling - Update Sriram Yagnaraman mail address -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmYpE0YACgkQ4+MsLN6t wN5PIA//egomANjRHAUAf9tdjljgT/JR49ejM7iInyxspR/xaiq0TlP2kP6aDNps y1HAWBwfj5lGxeMgQ1mSKJGka3v2AIPWb7RbNT+9AaiWHv+sx5OrEytozUsFHLo8 gSgRQocq0NY2a9dPbtkDqfbmq/rkCC7wgZzwroHsyOdiqYsWDKPJFleBDMjGmEaf colhiDmhUPgvE3NNpwfEVNh/2SzxUxY8k5FHal6qij5z56ZqBglgnziDZEvGVCZ1 uF4Hca/kh7TV2MVsdStPbGWZYDhJ/Np/2FnRoThD1Hc4qq8d/SH997m2F94tSOud YeH54Vp5lmCeYgba5y8VP0ZPx/b9XnTtLvKggNdoqB+T2LBWPRt8kehqoaxvammF ALzbY/t2vUxL6nIVbosOaTyqVOXvynk3/Js5S0jbnlu+vP2WvvFEzfYKIs2DIA8w z56o/rG4KfyxF0aDB+CvLNwtJS8THqeivPqmYoKTdN9FPpN2RyBNLITrKo389ygF 3oWy3+xsKGIPdNFY0a4l25xntqWNhND89ejzyL9M6G1cQ9RdEmTIUGTrinPQQmfP oHIJMBeTdj7EqPL4LB3BR/htw9U5PobeMNYKFsRkS39PjGDqba5wbIdk3w5/Rcxa s/PKdspDKWPwZ5jhcLD0qxAGJFnqM2UFjPo+U8qyI3RXKXFAn0E= =c8Aj -----END PGP SIGNATURE----- Merge tag 'housekeeping-20240424' of https://github.com/philmd/qemu into staging Removal of deprecated code - Remove the Nios II target and hardware - Remove pvrdma device and rdmacm-mux helper - Remove GlusterFS RDMA protocol handling - Update Sriram Yagnaraman mail address # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmYpE0YACgkQ4+MsLN6t # wN5PIA//egomANjRHAUAf9tdjljgT/JR49ejM7iInyxspR/xaiq0TlP2kP6aDNps # y1HAWBwfj5lGxeMgQ1mSKJGka3v2AIPWb7RbNT+9AaiWHv+sx5OrEytozUsFHLo8 # gSgRQocq0NY2a9dPbtkDqfbmq/rkCC7wgZzwroHsyOdiqYsWDKPJFleBDMjGmEaf # colhiDmhUPgvE3NNpwfEVNh/2SzxUxY8k5FHal6qij5z56ZqBglgnziDZEvGVCZ1 # uF4Hca/kh7TV2MVsdStPbGWZYDhJ/Np/2FnRoThD1Hc4qq8d/SH997m2F94tSOud # YeH54Vp5lmCeYgba5y8VP0ZPx/b9XnTtLvKggNdoqB+T2LBWPRt8kehqoaxvammF # ALzbY/t2vUxL6nIVbosOaTyqVOXvynk3/Js5S0jbnlu+vP2WvvFEzfYKIs2DIA8w # z56o/rG4KfyxF0aDB+CvLNwtJS8THqeivPqmYoKTdN9FPpN2RyBNLITrKo389ygF # 3oWy3+xsKGIPdNFY0a4l25xntqWNhND89ejzyL9M6G1cQ9RdEmTIUGTrinPQQmfP # oHIJMBeTdj7EqPL4LB3BR/htw9U5PobeMNYKFsRkS39PjGDqba5wbIdk3w5/Rcxa # s/PKdspDKWPwZ5jhcLD0qxAGJFnqM2UFjPo+U8qyI3RXKXFAn0E= # =c8Aj # -----END PGP SIGNATURE----- # gpg: Signature made Wed 24 Apr 2024 07:12:22 AM PDT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] * tag 'housekeeping-20240424' of https://github.com/philmd/qemu: block/gluster: Remove deprecated RDMA protocol handling hw/rdma: Remove deprecated pvrdma device and rdmacm-mux helper hw/timer: Remove the ALTERA_TIMER model target/nios2: Remove the deprecated Nios II target MAINTAINERS: Update Sriram Yagnaraman mail address Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
commit
85b597413d
135 changed files with 40 additions and 17218 deletions
|
@ -99,7 +99,6 @@
|
|||
--disable-opengl \
|
||||
--disable-parallels \
|
||||
--disable-pie \
|
||||
--disable-pvrdma \
|
||||
--disable-qcow1 \
|
||||
--disable-qed \
|
||||
--disable-qom-cast-debug \
|
||||
|
|
|
@ -36,9 +36,6 @@ microblaze
|
|||
mips
|
||||
~ (/qemu)?((/include)?/hw/mips/.*|/target/mips/.*)
|
||||
|
||||
nios2
|
||||
~ (/qemu)?((/include)?/hw/nios2/.*|/target/nios2/.*)
|
||||
|
||||
openrisc
|
||||
~ (/qemu)?((/include)?/hw/openrisc/.*|/target/openrisc/.*)
|
||||
|
||||
|
|
|
@ -94,7 +94,6 @@ mkdir "$TMP/asm"
|
|||
> "$TMP/asm/bitsperlong.h"
|
||||
|
||||
generate_syscall_nr arm64 64 "$output/linux-user/aarch64/syscall_nr.h"
|
||||
generate_syscall_nr nios2 32 "$output/linux-user/nios2/syscall_nr.h"
|
||||
generate_syscall_nr openrisc 32 "$output/linux-user/openrisc/syscall_nr.h"
|
||||
|
||||
generate_syscall_nr riscv 32 "$output/linux-user/riscv/syscall32_nr.h"
|
||||
|
|
|
@ -163,7 +163,6 @@ meson_options_help() {
|
|||
printf "%s\n" ' pixman pixman support'
|
||||
printf "%s\n" ' plugins TCG plugins via shared library loading'
|
||||
printf "%s\n" ' png PNG support with libpng'
|
||||
printf "%s\n" ' pvrdma Enable PVRDMA support'
|
||||
printf "%s\n" ' qcow1 qcow1 image format support'
|
||||
printf "%s\n" ' qed qed image format support'
|
||||
printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)'
|
||||
|
@ -428,8 +427,6 @@ _meson_option_parse() {
|
|||
--enable-png) printf "%s" -Dpng=enabled ;;
|
||||
--disable-png) printf "%s" -Dpng=disabled ;;
|
||||
--prefix=*) quote_sh "-Dprefix=$2" ;;
|
||||
--enable-pvrdma) printf "%s" -Dpvrdma=enabled ;;
|
||||
--disable-pvrdma) printf "%s" -Dpvrdma=disabled ;;
|
||||
--enable-qcow1) printf "%s" -Dqcow1=enabled ;;
|
||||
--disable-qcow1) printf "%s" -Dqcow1=disabled ;;
|
||||
--enable-qed) printf "%s" -Dqed=enabled ;;
|
||||
|
|
|
@ -37,7 +37,6 @@ mappings = {
|
|||
"m68k" : "m68k",
|
||||
"MicroBlaze" : "microblaze",
|
||||
"mips:isa64" : ["mips64", "mips64el"],
|
||||
"nios2" : "nios2",
|
||||
"or1k" : "or1k",
|
||||
"powerpc:common" : "ppc",
|
||||
"powerpc:common64" : ["ppc64", "ppc64le"],
|
||||
|
|
|
@ -55,7 +55,6 @@ cp_portable() {
|
|||
-e 'linux/if_ether' \
|
||||
-e 'input-event-codes' \
|
||||
-e 'sys/' \
|
||||
-e 'pvrdma_verbs' \
|
||||
-e 'drm.h' \
|
||||
-e 'limits' \
|
||||
-e 'linux/const' \
|
||||
|
@ -230,32 +229,6 @@ mkdir -p "$output/include/standard-headers/drm"
|
|||
cp_portable "$tmpdir/include/drm/drm_fourcc.h" \
|
||||
"$output/include/standard-headers/drm"
|
||||
|
||||
rm -rf "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
|
||||
mkdir -p "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
|
||||
|
||||
# Remove the unused functions from pvrdma_verbs.h avoiding the unnecessary
|
||||
# import of several infiniband/networking/other headers
|
||||
tmp_pvrdma_verbs="$tmpdir/pvrdma_verbs.h"
|
||||
# Parse the entire file instead of single lines to match
|
||||
# function declarations expanding over multiple lines
|
||||
# and strip the declarations starting with pvrdma prefix.
|
||||
sed -e '1h;2,$H;$!d;g' -e 's/[^};]*pvrdma[^(| ]*([^)]*);//g' \
|
||||
"$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h" > \
|
||||
"$tmp_pvrdma_verbs";
|
||||
|
||||
for i in "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h" \
|
||||
"$tmp_pvrdma_verbs"; do \
|
||||
cp_portable "$i" \
|
||||
"$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/"
|
||||
done
|
||||
|
||||
rm -rf "$output/include/standard-headers/rdma/"
|
||||
mkdir -p "$output/include/standard-headers/rdma/"
|
||||
for i in "$tmpdir/include/rdma/vmw_pvrdma-abi.h"; do
|
||||
cp_portable "$i" \
|
||||
"$output/include/standard-headers/rdma/"
|
||||
done
|
||||
|
||||
cat <<EOF >$output/include/standard-headers/linux/types.h
|
||||
/* For QEMU all types are already defined via osdep.h, so this
|
||||
* header does not need to do anything.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue