diff --git a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch index 632d69e..60c33f1 100644 --- a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch +++ b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch @@ -48,77 +48,79 @@ Signed-off-by: Danilo C. L. de Paula Rebase notes (5.0.0-rc4): - Update slirp directory to commit 2faae0f778 (used upstream) + +Signed-off-by: Danilo C. L. de Paula --- .gitmodules | 3 - slirp/.clang-format | 58 ++ slirp/.gitignore | 10 + slirp/.gitlab-ci.yml | 27 + slirp/.gitpublish | 3 + - slirp/CHANGELOG.md | 88 +++ + slirp/CHANGELOG.md | 88 ++ slirp/COPYRIGHT | 62 ++ slirp/Makefile | 62 ++ slirp/README.md | 60 ++ slirp/build-aux/git-version-gen | 158 ++++ slirp/build-aux/meson-dist | 16 + - slirp/meson.build | 134 ++++ - slirp/src/arp_table.c | 91 +++ - slirp/src/bootp.c | 369 ++++++++++ - slirp/src/bootp.h | 129 ++++ - slirp/src/cksum.c | 179 +++++ - slirp/src/debug.h | 51 ++ - slirp/src/dhcpv6.c | 224 ++++++ + slirp/meson.build | 134 +++ + slirp/src/arp_table.c | 91 ++ + slirp/src/bootp.c | 369 ++++++++ + slirp/src/bootp.h | 129 +++ + slirp/src/cksum.c | 179 ++++ + slirp/src/debug.h | 51 + + slirp/src/dhcpv6.c | 224 +++++ slirp/src/dhcpv6.h | 68 ++ - slirp/src/dnssearch.c | 306 ++++++++ - slirp/src/if.c | 213 ++++++ + slirp/src/dnssearch.c | 306 ++++++ + slirp/src/if.c | 213 +++++ slirp/src/if.h | 25 + - slirp/src/ip.h | 242 ++++++ - slirp/src/ip6.h | 214 ++++++ - slirp/src/ip6_icmp.c | 434 +++++++++++ - slirp/src/ip6_icmp.h | 219 ++++++ + slirp/src/ip.h | 242 +++++ + slirp/src/ip6.h | 214 +++++ + slirp/src/ip6_icmp.c | 434 +++++++++ + slirp/src/ip6_icmp.h | 219 +++++ slirp/src/ip6_input.c | 78 ++ slirp/src/ip6_output.c | 39 + - slirp/src/ip_icmp.c | 489 +++++++++++++ - slirp/src/ip_icmp.h | 166 +++++ - slirp/src/ip_input.c | 461 ++++++++++++ - slirp/src/ip_output.c | 169 +++++ + slirp/src/ip_icmp.c | 489 ++++++++++ + slirp/src/ip_icmp.h | 166 ++++ + slirp/src/ip_input.c | 461 +++++++++ + slirp/src/ip_output.c | 169 ++++ slirp/src/libslirp-version.h.in | 24 + - slirp/src/libslirp.h | 171 +++++ + slirp/src/libslirp.h | 171 ++++ slirp/src/libslirp.map | 30 + slirp/src/main.h | 16 + - slirp/src/mbuf.c | 224 ++++++ - slirp/src/mbuf.h | 127 ++++ - slirp/src/misc.c | 390 ++++++++++ + slirp/src/mbuf.c | 224 +++++ + slirp/src/mbuf.h | 127 +++ + slirp/src/misc.c | 390 ++++++++ slirp/src/misc.h | 72 ++ - slirp/src/ncsi-pkt.h | 445 +++++++++++ - slirp/src/ncsi.c | 192 +++++ - slirp/src/ndp_table.c | 87 +++ - slirp/src/sbuf.c | 168 +++++ + slirp/src/ncsi-pkt.h | 445 +++++++++ + slirp/src/ncsi.c | 192 ++++ + slirp/src/ndp_table.c | 87 ++ + slirp/src/sbuf.c | 168 ++++ slirp/src/sbuf.h | 27 + - slirp/src/slirp.c | 1185 ++++++++++++++++++++++++++++++ - slirp/src/slirp.h | 283 +++++++ - slirp/src/socket.c | 957 ++++++++++++++++++++++++ - slirp/src/socket.h | 164 +++++ - slirp/src/state.c | 379 ++++++++++ + slirp/src/slirp.c | 1185 ++++++++++++++++++++++++ + slirp/src/slirp.h | 283 ++++++ + slirp/src/socket.c | 957 +++++++++++++++++++ + slirp/src/socket.h | 164 ++++ + slirp/src/state.c | 379 ++++++++ slirp/src/stream.c | 120 +++ slirp/src/stream.h | 35 + - slirp/src/tcp.h | 169 +++++ - slirp/src/tcp_input.c | 1539 +++++++++++++++++++++++++++++++++++++++ - slirp/src/tcp_output.c | 516 +++++++++++++ - slirp/src/tcp_subr.c | 980 +++++++++++++++++++++++++ - slirp/src/tcp_timer.c | 286 ++++++++ - slirp/src/tcp_timer.h | 130 ++++ + slirp/src/tcp.h | 169 ++++ + slirp/src/tcp_input.c | 1539 +++++++++++++++++++++++++++++++ + slirp/src/tcp_output.c | 516 +++++++++++ + slirp/src/tcp_subr.c | 980 ++++++++++++++++++++ + slirp/src/tcp_timer.c | 286 ++++++ + slirp/src/tcp_timer.h | 130 +++ slirp/src/tcp_var.h | 161 ++++ slirp/src/tcpip.h | 104 +++ - slirp/src/tftp.c | 462 ++++++++++++ + slirp/src/tftp.c | 462 ++++++++++ slirp/src/tftp.h | 52 ++ - slirp/src/udp.c | 361 +++++++++ - slirp/src/udp.h | 90 +++ - slirp/src/udp6.c | 173 +++++ - slirp/src/util.c | 428 +++++++++++ - slirp/src/util.h | 189 +++++ + slirp/src/udp.c | 361 ++++++++ + slirp/src/udp.h | 90 ++ + slirp/src/udp6.c | 173 ++++ + slirp/src/util.c | 428 +++++++++ + slirp/src/util.h | 189 ++++ slirp/src/version.c | 8 + - slirp/src/vmstate.c | 444 +++++++++++ - slirp/src/vmstate.h | 391 ++++++++++ + slirp/src/vmstate.c | 444 +++++++++ + slirp/src/vmstate.h | 391 ++++++++ 70 files changed, 16423 insertions(+), 3 deletions(-) create mode 100644 slirp/.clang-format create mode 100644 slirp/.gitignore @@ -192,7 +194,7 @@ Rebase notes (5.0.0-rc4): diff --git a/slirp/.clang-format b/slirp/.clang-format new file mode 100644 -index 0000000..17fb49f +index 0000000000..17fb49fe65 --- /dev/null +++ b/slirp/.clang-format @@ -0,0 +1,58 @@ @@ -256,7 +258,7 @@ index 0000000..17fb49f +... diff --git a/slirp/CHANGELOG.md b/slirp/CHANGELOG.md new file mode 100644 -index 0000000..67b0a74 +index 0000000000..67b0a74195 --- /dev/null +++ b/slirp/CHANGELOG.md @@ -0,0 +1,88 @@ @@ -350,7 +352,7 @@ index 0000000..67b0a74 +[4.0.0]: https://gitlab.freedesktop.org/slirp/libslirp/commits/v4.0.0 diff --git a/slirp/COPYRIGHT b/slirp/COPYRIGHT new file mode 100644 -index 0000000..ed49512 +index 0000000000..ed49512dbc --- /dev/null +++ b/slirp/COPYRIGHT @@ -0,0 +1,62 @@ @@ -418,7 +420,7 @@ index 0000000..ed49512 +copyrights. diff --git a/slirp/Makefile b/slirp/Makefile new file mode 100644 -index 0000000..8857b41 +index 0000000000..8857b4159b --- /dev/null +++ b/slirp/Makefile @@ -0,0 +1,62 @@ @@ -486,7 +488,7 @@ index 0000000..8857b41 +-include $(DEPS) diff --git a/slirp/README.md b/slirp/README.md new file mode 100644 -index 0000000..dc11e5f +index 0000000000..dc11e5f18b --- /dev/null +++ b/slirp/README.md @@ -0,0 +1,60 @@ @@ -552,7 +554,7 @@ index 0000000..dc11e5f +See the [COPYRIGHT](COPYRIGHT) file for details. diff --git a/slirp/build-aux/git-version-gen b/slirp/build-aux/git-version-gen new file mode 100755 -index 0000000..5617eb8 +index 0000000000..5617eb8d4e --- /dev/null +++ b/slirp/build-aux/git-version-gen @@ -0,0 +1,158 @@ @@ -716,7 +718,7 @@ index 0000000..5617eb8 +# End: diff --git a/slirp/build-aux/meson-dist b/slirp/build-aux/meson-dist new file mode 100755 -index 0000000..80d534f +index 0000000000..80d534fec6 --- /dev/null +++ b/slirp/build-aux/meson-dist @@ -0,0 +1,16 @@ @@ -738,7 +740,7 @@ index 0000000..80d534f +echo "$1" > "$MESON_DIST_ROOT/.tarball-version" diff --git a/slirp/meson.build b/slirp/meson.build new file mode 100644 -index 0000000..3a27149 +index 0000000000..3a27149373 --- /dev/null +++ b/slirp/meson.build @@ -0,0 +1,134 @@ @@ -878,7 +880,7 @@ index 0000000..3a27149 +) diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c new file mode 100644 -index 0000000..054fbf5 +index 0000000000..054fbf5e10 --- /dev/null +++ b/slirp/src/arp_table.c @@ -0,0 +1,91 @@ @@ -975,7 +977,7 @@ index 0000000..054fbf5 +} diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c new file mode 100644 -index 0000000..46e9681 +index 0000000000..46e96810ab --- /dev/null +++ b/slirp/src/bootp.c @@ -0,0 +1,369 @@ @@ -1350,7 +1352,7 @@ index 0000000..46e9681 +} diff --git a/slirp/src/bootp.h b/slirp/src/bootp.h new file mode 100644 -index 0000000..a57fa51 +index 0000000000..a57fa51bcb --- /dev/null +++ b/slirp/src/bootp.h @@ -0,0 +1,129 @@ @@ -1485,7 +1487,7 @@ index 0000000..a57fa51 +#endif diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c new file mode 100644 -index 0000000..4d08380 +index 0000000000..4d08380a4e --- /dev/null +++ b/slirp/src/cksum.c @@ -0,0 +1,179 @@ @@ -1670,7 +1672,7 @@ index 0000000..4d08380 +} diff --git a/slirp/src/debug.h b/slirp/src/debug.h new file mode 100644 -index 0000000..47712bd +index 0000000000..47712bd78b --- /dev/null +++ b/slirp/src/debug.h @@ -0,0 +1,51 @@ @@ -1727,7 +1729,7 @@ index 0000000..47712bd +#endif /* DEBUG_H_ */ diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c new file mode 100644 -index 0000000..77b451b +index 0000000000..77b451b910 --- /dev/null +++ b/slirp/src/dhcpv6.c @@ -0,0 +1,224 @@ @@ -1957,7 +1959,7 @@ index 0000000..77b451b +} diff --git a/slirp/src/dhcpv6.h b/slirp/src/dhcpv6.h new file mode 100644 -index 0000000..d12c49b +index 0000000000..d12c49b36c --- /dev/null +++ b/slirp/src/dhcpv6.h @@ -0,0 +1,68 @@ @@ -2031,7 +2033,7 @@ index 0000000..d12c49b +#endif diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c new file mode 100644 -index 0000000..e8f14e3 +index 0000000000..e8f14e34bb --- /dev/null +++ b/slirp/src/dnssearch.c @@ -0,0 +1,306 @@ @@ -2343,7 +2345,7 @@ index 0000000..e8f14e3 +} diff --git a/slirp/src/if.c b/slirp/src/if.c new file mode 100644 -index 0000000..23190b5 +index 0000000000..23190b5593 --- /dev/null +++ b/slirp/src/if.c @@ -0,0 +1,213 @@ @@ -2562,7 +2564,7 @@ index 0000000..23190b5 +} diff --git a/slirp/src/if.h b/slirp/src/if.h new file mode 100644 -index 0000000..7cf9d27 +index 0000000000..7cf9d2750e --- /dev/null +++ b/slirp/src/if.h @@ -0,0 +1,25 @@ @@ -2593,7 +2595,7 @@ index 0000000..7cf9d27 +#endif diff --git a/slirp/src/ip.h b/slirp/src/ip.h new file mode 100644 -index 0000000..e5d4aa8 +index 0000000000..e5d4aa8a6d --- /dev/null +++ b/slirp/src/ip.h @@ -0,0 +1,242 @@ @@ -2841,7 +2843,7 @@ index 0000000..e5d4aa8 +#endif diff --git a/slirp/src/ip6.h b/slirp/src/ip6.h new file mode 100644 -index 0000000..0630309 +index 0000000000..0630309d29 --- /dev/null +++ b/slirp/src/ip6.h @@ -0,0 +1,214 @@ @@ -3061,7 +3063,7 @@ index 0000000..0630309 +#endif diff --git a/slirp/src/ip6_icmp.c b/slirp/src/ip6_icmp.c new file mode 100644 -index 0000000..28ec2be +index 0000000000..28ec2bee35 --- /dev/null +++ b/slirp/src/ip6_icmp.c @@ -0,0 +1,434 @@ @@ -3501,7 +3503,7 @@ index 0000000..28ec2be +} diff --git a/slirp/src/ip6_icmp.h b/slirp/src/ip6_icmp.h new file mode 100644 -index 0000000..c37e60f +index 0000000000..c37e60f28d --- /dev/null +++ b/slirp/src/ip6_icmp.h @@ -0,0 +1,219 @@ @@ -3726,7 +3728,7 @@ index 0000000..c37e60f +#endif diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c new file mode 100644 -index 0000000..dfcbfd6 +index 0000000000..dfcbfd6a78 --- /dev/null +++ b/slirp/src/ip6_input.c @@ -0,0 +1,78 @@ @@ -3810,7 +3812,7 @@ index 0000000..dfcbfd6 +} diff --git a/slirp/src/ip6_output.c b/slirp/src/ip6_output.c new file mode 100644 -index 0000000..b861106 +index 0000000000..b86110662c --- /dev/null +++ b/slirp/src/ip6_output.c @@ -0,0 +1,39 @@ @@ -3855,7 +3857,7 @@ index 0000000..b861106 +} diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c new file mode 100644 -index 0000000..fe0add4 +index 0000000000..fe0add438d --- /dev/null +++ b/slirp/src/ip_icmp.c @@ -0,0 +1,489 @@ @@ -4350,7 +4352,7 @@ index 0000000..fe0add4 +} diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h new file mode 100644 -index 0000000..84707db +index 0000000000..84707db247 --- /dev/null +++ b/slirp/src/ip_icmp.h @@ -0,0 +1,166 @@ @@ -4522,7 +4524,7 @@ index 0000000..84707db +#endif diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c new file mode 100644 -index 0000000..89a01d4 +index 0000000000..89a01d45aa --- /dev/null +++ b/slirp/src/ip_input.c @@ -0,0 +1,461 @@ @@ -4989,7 +4991,7 @@ index 0000000..89a01d4 +} diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c new file mode 100644 -index 0000000..22916a3 +index 0000000000..22916a37df --- /dev/null +++ b/slirp/src/ip_output.c @@ -0,0 +1,169 @@ @@ -5164,7 +5166,7 @@ index 0000000..22916a3 +} diff --git a/slirp/src/libslirp-version.h.in b/slirp/src/libslirp-version.h.in new file mode 100644 -index 0000000..faa6c85 +index 0000000000..faa6c85952 --- /dev/null +++ b/slirp/src/libslirp-version.h.in @@ -0,0 +1,24 @@ @@ -5194,7 +5196,7 @@ index 0000000..faa6c85 +#endif /* LIBSLIRP_VERSION_H_ */ diff --git a/slirp/src/libslirp.h b/slirp/src/libslirp.h new file mode 100644 -index 0000000..fb4c7e8 +index 0000000000..fb4c7e882c --- /dev/null +++ b/slirp/src/libslirp.h @@ -0,0 +1,171 @@ @@ -5371,7 +5373,7 @@ index 0000000..fb4c7e8 +#endif /* LIBSLIRP_H */ diff --git a/slirp/src/libslirp.map b/slirp/src/libslirp.map new file mode 100644 -index 0000000..72aab91 +index 0000000000..72aab912f4 --- /dev/null +++ b/slirp/src/libslirp.map @@ -0,0 +1,30 @@ @@ -5407,7 +5409,7 @@ index 0000000..72aab91 +} SLIRP_4.1; diff --git a/slirp/src/main.h b/slirp/src/main.h new file mode 100644 -index 0000000..3b3f883 +index 0000000000..3b3f883703 --- /dev/null +++ b/slirp/src/main.h @@ -0,0 +1,16 @@ @@ -5429,7 +5431,7 @@ index 0000000..3b3f883 +#endif diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c new file mode 100644 -index 0000000..54ec721 +index 0000000000..54ec721eb5 --- /dev/null +++ b/slirp/src/mbuf.c @@ -0,0 +1,224 @@ @@ -5659,7 +5661,7 @@ index 0000000..54ec721 +} diff --git a/slirp/src/mbuf.h b/slirp/src/mbuf.h new file mode 100644 -index 0000000..546e785 +index 0000000000..546e7852c5 --- /dev/null +++ b/slirp/src/mbuf.h @@ -0,0 +1,127 @@ @@ -5792,7 +5794,7 @@ index 0000000..546e785 +#endif diff --git a/slirp/src/misc.c b/slirp/src/misc.c new file mode 100644 -index 0000000..e6bc0a2 +index 0000000000..e6bc0a207d --- /dev/null +++ b/slirp/src/misc.c @@ -0,0 +1,390 @@ @@ -6189,7 +6191,7 @@ index 0000000..e6bc0a2 \ No newline at end of file diff --git a/slirp/src/misc.h b/slirp/src/misc.h new file mode 100644 -index 0000000..81b370c +index 0000000000..81b370cfb1 --- /dev/null +++ b/slirp/src/misc.h @@ -0,0 +1,72 @@ @@ -6267,7 +6269,7 @@ index 0000000..81b370c +#endif diff --git a/slirp/src/ncsi-pkt.h b/slirp/src/ncsi-pkt.h new file mode 100644 -index 0000000..7795ad8 +index 0000000000..7795ad83ee --- /dev/null +++ b/slirp/src/ncsi-pkt.h @@ -0,0 +1,445 @@ @@ -6718,7 +6720,7 @@ index 0000000..7795ad8 +#endif /* NCSI_PKT_H */ diff --git a/slirp/src/ncsi.c b/slirp/src/ncsi.c new file mode 100644 -index 0000000..ddd980d +index 0000000000..ddd980d869 --- /dev/null +++ b/slirp/src/ncsi.c @@ -0,0 +1,192 @@ @@ -6916,7 +6918,7 @@ index 0000000..ddd980d +} diff --git a/slirp/src/ndp_table.c b/slirp/src/ndp_table.c new file mode 100644 -index 0000000..110d6ea +index 0000000000..110d6ea0e4 --- /dev/null +++ b/slirp/src/ndp_table.c @@ -0,0 +1,87 @@ @@ -7009,7 +7011,7 @@ index 0000000..110d6ea +} diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c new file mode 100644 -index 0000000..2fb9176 +index 0000000000..2fb9176144 --- /dev/null +++ b/slirp/src/sbuf.c @@ -0,0 +1,168 @@ @@ -7183,7 +7185,7 @@ index 0000000..2fb9176 +} diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h new file mode 100644 -index 0000000..01886fb +index 0000000000..01886fbd01 --- /dev/null +++ b/slirp/src/sbuf.h @@ -0,0 +1,27 @@ @@ -7216,7 +7218,7 @@ index 0000000..01886fb +#endif diff --git a/slirp/src/slirp.c b/slirp/src/slirp.c new file mode 100644 -index 0000000..14458e8 +index 0000000000..14458e8510 --- /dev/null +++ b/slirp/src/slirp.c @@ -0,0 +1,1185 @@ @@ -8407,7 +8409,7 @@ index 0000000..14458e8 +} diff --git a/slirp/src/slirp.h b/slirp/src/slirp.h new file mode 100644 -index 0000000..32634bc +index 0000000000..32634bcc00 --- /dev/null +++ b/slirp/src/slirp.h @@ -0,0 +1,283 @@ @@ -8696,7 +8698,7 @@ index 0000000..32634bc +#endif diff --git a/slirp/src/socket.c b/slirp/src/socket.c new file mode 100644 -index 0000000..4cd9a64 +index 0000000000..4cd9a64b3c --- /dev/null +++ b/slirp/src/socket.c @@ -0,0 +1,957 @@ @@ -9659,7 +9661,7 @@ index 0000000..4cd9a64 +} diff --git a/slirp/src/socket.h b/slirp/src/socket.h new file mode 100644 -index 0000000..a6a1e5e +index 0000000000..a6a1e5e214 --- /dev/null +++ b/slirp/src/socket.h @@ -0,0 +1,164 @@ @@ -9829,7 +9831,7 @@ index 0000000..a6a1e5e +#endif /* SLIRP_SOCKET_H */ diff --git a/slirp/src/state.c b/slirp/src/state.c new file mode 100644 -index 0000000..22af77b +index 0000000000..22af77b256 --- /dev/null +++ b/slirp/src/state.c @@ -0,0 +1,379 @@ @@ -10214,7 +10216,7 @@ index 0000000..22af77b +} diff --git a/slirp/src/stream.c b/slirp/src/stream.c new file mode 100644 -index 0000000..6cf326f +index 0000000000..6cf326f669 --- /dev/null +++ b/slirp/src/stream.c @@ -0,0 +1,120 @@ @@ -10340,7 +10342,7 @@ index 0000000..6cf326f +} diff --git a/slirp/src/stream.h b/slirp/src/stream.h new file mode 100644 -index 0000000..08bb5b6 +index 0000000000..08bb5b6610 --- /dev/null +++ b/slirp/src/stream.h @@ -0,0 +1,35 @@ @@ -10381,7 +10383,7 @@ index 0000000..08bb5b6 +#endif /* STREAM_H_ */ diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h new file mode 100644 -index 0000000..70a9760 +index 0000000000..70a9760664 --- /dev/null +++ b/slirp/src/tcp.h @@ -0,0 +1,169 @@ @@ -10556,7 +10558,7 @@ index 0000000..70a9760 +#endif diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c new file mode 100644 -index 0000000..d55b0c8 +index 0000000000..d55b0c81dc --- /dev/null +++ b/slirp/src/tcp_input.c @@ -0,0 +1,1539 @@ @@ -12101,7 +12103,7 @@ index 0000000..d55b0c8 +} diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c new file mode 100644 -index 0000000..383fe31 +index 0000000000..383fe31dcf --- /dev/null +++ b/slirp/src/tcp_output.c @@ -0,0 +1,516 @@ @@ -12623,7 +12625,7 @@ index 0000000..383fe31 +} diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c new file mode 100644 -index 0000000..a1016d9 +index 0000000000..a1016d90df --- /dev/null +++ b/slirp/src/tcp_subr.c @@ -0,0 +1,980 @@ @@ -13609,7 +13611,7 @@ index 0000000..a1016d9 +} diff --git a/slirp/src/tcp_timer.c b/slirp/src/tcp_timer.c new file mode 100644 -index 0000000..102023e +index 0000000000..102023e7cd --- /dev/null +++ b/slirp/src/tcp_timer.c @@ -0,0 +1,286 @@ @@ -13901,7 +13903,7 @@ index 0000000..102023e +} diff --git a/slirp/src/tcp_timer.h b/slirp/src/tcp_timer.h new file mode 100644 -index 0000000..584a559 +index 0000000000..584a5594e4 --- /dev/null +++ b/slirp/src/tcp_timer.h @@ -0,0 +1,130 @@ @@ -14037,7 +14039,7 @@ index 0000000..584a559 +#endif diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h new file mode 100644 -index 0000000..c8da8cb +index 0000000000..c8da8cbd16 --- /dev/null +++ b/slirp/src/tcp_var.h @@ -0,0 +1,161 @@ @@ -14204,7 +14206,7 @@ index 0000000..c8da8cb +#endif diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h new file mode 100644 -index 0000000..d3df021 +index 0000000000..d3df021493 --- /dev/null +++ b/slirp/src/tcpip.h @@ -0,0 +1,104 @@ @@ -14314,7 +14316,7 @@ index 0000000..d3df021 +#endif diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c new file mode 100644 -index 0000000..c209145 +index 0000000000..c209145282 --- /dev/null +++ b/slirp/src/tftp.c @@ -0,0 +1,462 @@ @@ -14782,7 +14784,7 @@ index 0000000..c209145 +} diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h new file mode 100644 -index 0000000..c47bb43 +index 0000000000..c47bb43c7d --- /dev/null +++ b/slirp/src/tftp.h @@ -0,0 +1,52 @@ @@ -14840,7 +14842,7 @@ index 0000000..c47bb43 +#endif diff --git a/slirp/src/udp.c b/slirp/src/udp.c new file mode 100644 -index 0000000..6bde20f +index 0000000000..6bde20fafa --- /dev/null +++ b/slirp/src/udp.c @@ -0,0 +1,361 @@ @@ -15207,7 +15209,7 @@ index 0000000..6bde20f +} diff --git a/slirp/src/udp.h b/slirp/src/udp.h new file mode 100644 -index 0000000..c3b83fd +index 0000000000..c3b83fdc56 --- /dev/null +++ b/slirp/src/udp.h @@ -0,0 +1,90 @@ @@ -15303,7 +15305,7 @@ index 0000000..c3b83fd +#endif diff --git a/slirp/src/udp6.c b/slirp/src/udp6.c new file mode 100644 -index 0000000..6f9486b +index 0000000000..6f9486bbca --- /dev/null +++ b/slirp/src/udp6.c @@ -0,0 +1,173 @@ @@ -15482,7 +15484,7 @@ index 0000000..6f9486b +} diff --git a/slirp/src/util.c b/slirp/src/util.c new file mode 100644 -index 0000000..570c53f +index 0000000000..570c53f303 --- /dev/null +++ b/slirp/src/util.c @@ -0,0 +1,428 @@ @@ -15916,7 +15918,7 @@ index 0000000..570c53f +} diff --git a/slirp/src/util.h b/slirp/src/util.h new file mode 100644 -index 0000000..d67b3d0 +index 0000000000..d67b3d0de9 --- /dev/null +++ b/slirp/src/util.h @@ -0,0 +1,189 @@ @@ -16111,7 +16113,7 @@ index 0000000..d67b3d0 +#endif diff --git a/slirp/src/version.c b/slirp/src/version.c new file mode 100644 -index 0000000..93e0be9 +index 0000000000..93e0be9c24 --- /dev/null +++ b/slirp/src/version.c @@ -0,0 +1,8 @@ @@ -16125,7 +16127,7 @@ index 0000000..93e0be9 +} diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c new file mode 100644 -index 0000000..68cc172 +index 0000000000..68cc1729c5 --- /dev/null +++ b/slirp/src/vmstate.c @@ -0,0 +1,444 @@ @@ -16575,7 +16577,7 @@ index 0000000..68cc172 +} diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h new file mode 100644 -index 0000000..94c6a4b +index 0000000000..94c6a4bc7b --- /dev/null +++ b/slirp/src/vmstate.h @@ -0,0 +1,391 @@ @@ -16971,5 +16973,5 @@ index 0000000..94c6a4b + +#endif -- -1.8.3.1 +2.27.0 diff --git a/0005-Initial-redhat-build.patch b/0005-Initial-redhat-build.patch index 696916e..c2d0dad 100644 --- a/0005-Initial-redhat-build.patch +++ b/0005-Initial-redhat-build.patch @@ -126,6 +126,8 @@ Merged patches (weekly-200610): Merged patches (weekly-200617): - 44b8bd0 spec: Fix python shenigans for tests + +Signed-off-by: Danilo C. L. de Paula --- .gitignore | 1 + Makefile | 3 +- @@ -133,7 +135,7 @@ Merged patches (weekly-200617): redhat/Makefile | 86 + redhat/Makefile.common | 53 + redhat/README.tests | 39 + - redhat/qemu-kvm.spec.template | 2961 +++++++++++++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 2961 +++++++++++++++++++++++++++ redhat/qemu-pr-helper.service | 2 +- redhat/scripts/extract_build_cmd.py | 2 +- redhat/scripts/process-patches.sh | 7 +- @@ -146,7 +148,7 @@ Merged patches (weekly-200617): create mode 100644 redhat/qemu-kvm.spec.template diff --git a/Makefile b/Makefile -index b1b8a5a..88b7565 100644 +index b1b8a5a6d0..88b7565246 100644 --- a/Makefile +++ b/Makefile @@ -549,6 +549,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM @@ -167,7 +169,7 @@ index b1b8a5a..88b7565 100644 $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" diff --git a/configure b/configure -index ee6c3c6..bd957a5 100755 +index ee6c3c6792..bd957a5a26 100755 --- a/configure +++ b/configure @@ -2610,6 +2610,7 @@ if test "$seccomp" != "no" ; then @@ -179,7 +181,7 @@ index ee6c3c6..bd957a5 100755 # xen probe diff --git a/tests/check-block.sh b/tests/check-block.sh -index 8e29c86..e9bcb5a 100755 +index 8e29c868e5..e9bcb5ac27 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -53,6 +53,8 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then @@ -192,7 +194,7 @@ index 8e29c86..e9bcb5a 100755 ret=0 diff --git a/ui/vnc.c b/ui/vnc.c -index 527ad25..8099c0e 100644 +index 527ad25124..8099c0ee13 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3970,7 +3970,7 @@ void vnc_display_open(const char *id, Error **errp) @@ -205,5 +207,5 @@ index 527ad25..8099c0e 100644 if (saslErr != SASL_OK) { error_setg(errp, "Failed to initialize SASL auth: %s", -- -1.8.3.1 +2.27.0 diff --git a/0006-Enable-disable-devices-for-RHEL.patch b/0006-Enable-disable-devices-for-RHEL.patch index 0ea7715..12b0b4a 100644 --- a/0006-Enable-disable-devices-for-RHEL.patch +++ b/0006-Enable-disable-devices-for-RHEL.patch @@ -78,19 +78,21 @@ Merged patches (weekly-200520): Merged patches (weekly-200610): - 559d589 Revert "RHEL: disable hostmem-memfd" - 441128e enable ramfb + +Signed-off-by: Danilo C. L. de Paula --- - default-configs/aarch64-rh-devices.mak | 22 ++++++++ - default-configs/aarch64-softmmu.mak | 10 ++-- - default-configs/ppc64-rh-devices.mak | 34 +++++++++++ - default-configs/ppc64-softmmu.mak | 10 ++-- - default-configs/rh-virtio.mak | 10 ++++ - default-configs/s390x-rh-devices.mak | 15 +++++ + default-configs/aarch64-rh-devices.mak | 22 ++++++ + default-configs/aarch64-softmmu.mak | 10 ++- + default-configs/ppc64-rh-devices.mak | 34 +++++++++ + default-configs/ppc64-softmmu.mak | 10 ++- + default-configs/rh-virtio.mak | 10 +++ + default-configs/s390x-rh-devices.mak | 15 ++++ default-configs/s390x-softmmu.mak | 4 +- - default-configs/x86_64-rh-devices.mak | 100 +++++++++++++++++++++++++++++++++ + default-configs/x86_64-rh-devices.mak | 100 +++++++++++++++++++++++++ default-configs/x86_64-softmmu.mak | 4 +- hw/acpi/ich9.c | 4 +- hw/arm/Makefile.objs | 2 +- - hw/block/fdc.c | 10 ++++ + hw/block/fdc.c | 10 +++ hw/bt/Makefile.objs | 3 + hw/cpu/Makefile.objs | 5 +- hw/display/cirrus_vga.c | 3 + @@ -99,15 +101,15 @@ Merged patches (weekly-200610): hw/net/e1000.c | 2 + hw/ppc/spapr_cpu_core.c | 2 + hw/usb/Makefile.objs | 4 +- - qemu-options.hx | 4 -- + qemu-options.hx | 4 - redhat/qemu-kvm.spec.template | 5 +- softmmu/vl.c | 2 +- target/arm/cpu.c | 4 +- target/arm/cpu_tcg.c | 3 + - target/i386/cpu.c | 17 +++--- - target/ppc/cpu-models.c | 10 ++++ + target/i386/cpu.c | 17 +++-- + target/ppc/cpu-models.c | 10 +++ target/s390x/cpu_models.c | 3 + - target/s390x/kvm.c | 8 +++ + target/s390x/kvm.c | 8 ++ 29 files changed, 274 insertions(+), 33 deletions(-) create mode 100644 default-configs/aarch64-rh-devices.mak create mode 100644 default-configs/ppc64-rh-devices.mak @@ -118,7 +120,7 @@ Merged patches (weekly-200610): diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak new file mode 100644 -index 0000000..f0cf5a1 +index 0000000000..f0cf5a1b22 --- /dev/null +++ b/default-configs/aarch64-rh-devices.mak @@ -0,0 +1,22 @@ @@ -145,7 +147,7 @@ index 0000000..f0cf5a1 +CONFIG_NVDIMM=y +CONFIG_ACPI_APEI=y diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak -index 958b1e0..8f6867d 100644 +index 958b1e08e4..8f6867d48a 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -1,8 +1,10 @@ @@ -165,7 +167,7 @@ index 958b1e0..8f6867d 100644 +include aarch64-rh-devices.mak diff --git a/default-configs/ppc64-rh-devices.mak b/default-configs/ppc64-rh-devices.mak new file mode 100644 -index 0000000..ecbe53f +index 0000000000..ecbe53fe63 --- /dev/null +++ b/default-configs/ppc64-rh-devices.mak @@ -0,0 +1,34 @@ @@ -204,7 +206,7 @@ index 0000000..ecbe53f +CONFIG_XIVE_SPAPR=y +CONFIG_XIVE_KVM=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak -index ae0841f..040e557 100644 +index ae0841fa3a..040e5575e7 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -1,11 +1,13 @@ @@ -227,7 +229,7 @@ index ae0841f..040e557 100644 +include ppc64-rh-devices.mak diff --git a/default-configs/rh-virtio.mak b/default-configs/rh-virtio.mak new file mode 100644 -index 0000000..94ede1b +index 0000000000..94ede1b5f6 --- /dev/null +++ b/default-configs/rh-virtio.mak @@ -0,0 +1,10 @@ @@ -243,7 +245,7 @@ index 0000000..94ede1b +CONFIG_VIRTIO_SERIAL=y diff --git a/default-configs/s390x-rh-devices.mak b/default-configs/s390x-rh-devices.mak new file mode 100644 -index 0000000..c3c73fe +index 0000000000..c3c73fe752 --- /dev/null +++ b/default-configs/s390x-rh-devices.mak @@ -0,0 +1,15 @@ @@ -263,7 +265,7 @@ index 0000000..c3c73fe +CONFIG_VIRTIO_CCW=y +CONFIG_WDT_DIAG288=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak -index f2287a1..3e2e388 100644 +index f2287a133f..3e2e388e91 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -10,4 +10,6 @@ @@ -276,7 +278,7 @@ index f2287a1..3e2e388 100644 +include s390x-rh-devices.mak diff --git a/default-configs/x86_64-rh-devices.mak b/default-configs/x86_64-rh-devices.mak new file mode 100644 -index 0000000..d59b6d9 +index 0000000000..d59b6d9bb5 --- /dev/null +++ b/default-configs/x86_64-rh-devices.mak @@ -0,0 +1,100 @@ @@ -381,7 +383,7 @@ index 0000000..d59b6d9 +CONFIG_TPM_EMULATOR=y +CONFIG_TPM_PASSTHROUGH=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak -index 64b2ee2..b5de7e5 100644 +index 64b2ee2960..b5de7e5279 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -1,3 +1,5 @@ @@ -392,7 +394,7 @@ index 64b2ee2..b5de7e5 100644 + +include x86_64-rh-devices.mak diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c -index 2d204ba..7ead029 100644 +index 2d204babc6..7ead029e68 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -374,8 +374,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) @@ -407,7 +409,7 @@ index 2d204ba..7ead029 100644 object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs -index 534a6a1..bd62442 100644 +index 534a6a119e..bd62442b54 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -28,7 +28,7 @@ obj-$(CONFIG_VEXPRESS) += vexpress.o @@ -420,7 +422,7 @@ index 534a6a1..bd62442 100644 obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index 3425d56..f4ae220 100644 +index 3425d56e2a..f4ae220905 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -47,6 +47,8 @@ @@ -449,7 +451,7 @@ index 3425d56..f4ae220 100644 return; diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs new file mode 100644 -index 0000000..e678e9e +index 0000000000..e678e9ee3c --- /dev/null +++ b/hw/bt/Makefile.objs @@ -0,0 +1,3 @@ @@ -457,7 +459,7 @@ index 0000000..e678e9e +#common-obj-y += hci-csr.o + diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs -index 8db9e8a..1601ea9 100644 +index 8db9e8a7b3..1601ea93c7 100644 --- a/hw/cpu/Makefile.objs +++ b/hw/cpu/Makefile.objs @@ -1,5 +1,6 @@ @@ -470,7 +472,7 @@ index 8db9e8a..1601ea9 100644 +common-obj-y += core.o +# cluster.o diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index 212d6f5..f2504e5 100644 +index 212d6f5e61..f2504e5649 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2958,6 +2958,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp) @@ -484,7 +486,7 @@ index 212d6f5..f2504e5 100644 Also accept 8 MB/16 MB for backward compatibility. */ if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 && diff --git a/hw/ide/piix.c b/hw/ide/piix.c -index b402a93..d3621a4 100644 +index b402a93636..d3621a45d9 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -221,7 +221,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) @@ -507,7 +509,7 @@ index b402a93..d3621a4 100644 static const TypeInfo piix4_ide_info = { diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c -index 29d633c..1442f46 100644 +index 29d633ca94..1442f46195 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -599,6 +599,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) @@ -520,7 +522,7 @@ index 29d633c..1442f46 100644 static const TypeInfo i8042_info = { diff --git a/hw/net/e1000.c b/hw/net/e1000.c -index a18f80e..960b2f0 100644 +index a18f80e369..960b2f00ee 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1797,6 +1797,7 @@ static const E1000Info e1000_devices[] = { @@ -540,7 +542,7 @@ index a18f80e..960b2f0 100644 static void e1000_register_types(void) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c -index 26ad566..bfdf6b3 100644 +index 26ad566f42..bfdf6b3e5c 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -396,10 +396,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = { @@ -557,7 +559,7 @@ index 26ad566..bfdf6b3 100644 DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"), DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"), diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs -index fa5c3fa..854094c 100644 +index fa5c3fa1b8..854094c4f2 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -30,7 +30,9 @@ common-obj-$(CONFIG_USB_NETWORK) += dev-network.o @@ -572,7 +574,7 @@ index fa5c3fa..854094c 100644 smartcard.mo-libs := $(SMARTCARD_LIBS) endif diff --git a/qemu-options.hx b/qemu-options.hx -index fa1b19d..b969944 100644 +index fa1b19de4c..b9699440a3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2248,10 +2248,6 @@ ERST @@ -587,7 +589,7 @@ index fa1b19d..b969944 100644 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" diff --git a/softmmu/vl.c b/softmmu/vl.c -index 9da2e23..6509057 100644 +index 9da2e23144..6509057752 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -145,7 +145,7 @@ static Chardev **serial_hds; @@ -600,7 +602,7 @@ index 9da2e23..6509057 100644 static int no_reboot; int no_shutdown = 0; diff --git a/target/arm/cpu.c b/target/arm/cpu.c -index 5050e18..79adfe2 100644 +index 5050e1843a..79adfe25c4 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2335,7 +2335,9 @@ static void arm_cpu_register_types(void) @@ -615,7 +617,7 @@ index 5050e18..79adfe2 100644 } } diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c -index 00b0e08..94d429b 100644 +index 00b0e08f33..94d429b61c 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -655,6 +655,9 @@ static void arm_tcg_cpu_register_types(void) @@ -629,7 +631,7 @@ index 00b0e08..94d429b 100644 arm_cpu_register(&arm_tcg_cpus[i]); } diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 36cbd3d..55a30cd 100644 +index 36cbd3d027..55a30cd4d9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1825,20 +1825,21 @@ static CPUCaches epyc_rome_cache_info = { @@ -663,7 +665,7 @@ index 36cbd3d..55a30cd 100644 CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM, .xlevel = 0x8000000A, diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c -index 4ad1686..16b2185 100644 +index 4ad16863c0..16b2185fd8 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -66,6 +66,7 @@ @@ -733,7 +735,7 @@ index 4ad1686..16b2185 100644 { NULL, NULL } }; diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c -index 2fa609b..f6bee32 100644 +index 2fa609bffe..f6bee3204c 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -404,6 +404,9 @@ static void check_unavailable_features(const S390CPUModel *max_model, @@ -747,7 +749,7 @@ index 2fa609b..f6bee32 100644 /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index f2f75d2..8970e4c 100644 +index f2f75d2a57..8970e4c374 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2494,6 +2494,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) @@ -766,5 +768,5 @@ index f2f75d2..8970e4c 100644 prop.ibc = s390_ibc_from_cpu_model(model); /* configure cpu features indicated via STFL(e) */ -- -1.8.3.1 +2.27.0 diff --git a/0007-Machine-type-related-general-changes.patch b/0007-Machine-type-related-general-changes.patch index 5117133..467366b 100644 --- a/0007-Machine-type-related-general-changes.patch +++ b/0007-Machine-type-related-general-changes.patch @@ -41,25 +41,27 @@ Merged patches (weekly-200506): Conflicts: hw/core/machine.c + +Signed-off-by: Danilo C. L. de Paula --- hw/acpi/ich9.c | 15 ++++ hw/acpi/piix4.c | 5 +- hw/arm/virt.c | 2 +- hw/char/serial.c | 16 ++++ - hw/core/machine.c | 170 +++++++++++++++++++++++++++++++++++++++++++ + hw/core/machine.c | 170 +++++++++++++++++++++++++++++++++++ hw/display/vga-isa.c | 2 +- hw/i386/pc_piix.c | 2 + hw/i386/pc_q35.c | 2 + - hw/net/e1000e.c | 21 ++++++ + hw/net/e1000e.c | 21 +++++ hw/net/rtl8139.c | 4 +- hw/rtc/mc146818rtc.c | 6 ++ - hw/smbios/smbios.c | 46 +++++++++++- + hw/smbios/smbios.c | 46 +++++++++- hw/timer/i8254_common.c | 2 +- hw/usb/hcd-uhci.c | 4 +- hw/usb/hcd-xhci.c | 20 +++++ hw/usb/hcd-xhci.h | 2 + include/hw/acpi/ich9.h | 3 + - include/hw/boards.h | 24 ++++++ + include/hw/boards.h | 24 +++++ include/hw/firmware/smbios.h | 5 +- include/hw/i386/pc.h | 3 + include/hw/usb.h | 4 + @@ -68,7 +70,7 @@ Conflicts: 23 files changed, 354 insertions(+), 11 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c -index 7ead029..3b8501f 100644 +index 7ead029e68..3b8501fa38 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -369,6 +369,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) @@ -101,7 +103,7 @@ index 7ead029..3b8501f 100644 &pm->disable_s3, OBJ_PROP_FLAG_READWRITE); object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index 283422e..f664201 100644 +index 283422e0d3..f6642011c6 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -276,6 +276,7 @@ static const VMStateDescription vmstate_acpi = { @@ -124,7 +126,7 @@ index 283422e..f664201 100644 DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_hotplug_bridge, true), diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 7d9f715..e30b837 100644 +index 7d9f7157da..e30b837135 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1450,7 +1450,7 @@ static void virt_build_smbios(VirtMachineState *vms) @@ -137,7 +139,7 @@ index 7d9f715..e30b837 100644 smbios_get_tables(MACHINE(vms), NULL, 0, &smbios_tables, &smbios_tables_len, &smbios_anchor, &smbios_anchor_len); diff --git a/hw/char/serial.c b/hw/char/serial.c -index 9eebcb2..11d2d08 100644 +index 9eebcb27e7..11d2d08912 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -35,6 +35,7 @@ @@ -192,7 +194,7 @@ index 9eebcb2..11d2d08 100644 } diff --git a/hw/core/machine.c b/hw/core/machine.c -index 211b4e0..ef6b320 100644 +index 211b4e077a..ef6b320ea7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -28,6 +28,176 @@ @@ -373,7 +375,7 @@ index 211b4e0..ef6b320 100644 { "virtio-balloon-device", "page-poison", "false" }, { "vmport", "x-read-set-eax", "off" }, diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c -index 3aaeeec..d88f52a 100644 +index 3aaeeeca1e..d88f52a587 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -84,7 +84,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) @@ -386,7 +388,7 @@ index 3aaeeec..d88f52a 100644 }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index fae487f..18815e8 100644 +index fae487f57d..18815e8302 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -179,6 +179,8 @@ static void pc_init1(MachineState *machine, @@ -399,7 +401,7 @@ index fae487f..18815e8 100644 } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index acd6d40..a1131e6 100644 +index acd6d405f0..a1131e6825 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -204,6 +204,8 @@ static void pc_q35_init(MachineState *machine) @@ -412,7 +414,7 @@ index acd6d40..a1131e6 100644 } diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c -index fda3451..be64a6b 100644 +index fda34518c9..be64a6b56f 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -79,6 +79,11 @@ typedef struct E1000EState { @@ -486,7 +488,7 @@ index fda3451..be64a6b 100644 e1000e_prop_disable_vnet, bool), DEFINE_PROP_SIGNED("subsys_ven", E1000EState, subsys_ven, diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c -index ab93d78..48a8135 100644 +index ab93d78ab3..48a81354fc 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3179,7 +3179,7 @@ static int rtl8139_pre_save(void *opaque) @@ -509,7 +511,7 @@ index ab93d78..48a8135 100644 VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State), diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c -index 7a38540..377d861 100644 +index 7a38540cb9..377d861913 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -43,6 +43,7 @@ @@ -533,7 +535,7 @@ index 7a38540..377d861 100644 } diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c -index ffd9872..7818b90 100644 +index ffd98727ee..7818b90c96 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -56,6 +56,9 @@ static bool smbios_legacy = true; @@ -615,7 +617,7 @@ index ffd9872..7818b90 100644 SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer); SMBIOS_SET_DEFAULT(type3.version, version); diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c -index 050875b..32935da 100644 +index 050875b497..32935da46c 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -231,7 +231,7 @@ static const VMStateDescription vmstate_pit_common = { @@ -628,7 +630,7 @@ index 050875b..32935da 100644 vmstate_pit_channel, PITChannelState), VMSTATE_INT64(channels[0].next_transition_time, diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c -index 37f7beb..2741edc 100644 +index 37f7beb3fa..2741edc589 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1219,12 +1219,14 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp) @@ -648,7 +650,7 @@ index 37f7beb..2741edc 100644 if (s->masterbus) { USBPort *ports[NB_PORTS]; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index b330e36..b25cce8 100644 +index b330e36fe6..b25cce8f0c 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3600,9 +3600,27 @@ static const VMStateDescription vmstate_xhci_slot = { @@ -689,7 +691,7 @@ index b330e36..b25cce8 100644 } }; diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h -index 946af51..cc91a7e 100644 +index 946af51fc2..cc91a7e4bd 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -157,6 +157,8 @@ typedef struct XHCIEvent { @@ -702,7 +704,7 @@ index 946af51..cc91a7e 100644 typedef struct XHCIInterrupter { diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h -index 28a5318..ff4a672 100644 +index 28a53181cb..ff4a672b90 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs { @@ -716,7 +718,7 @@ index 28a5318..ff4a672 100644 #define ACPI_PM_PROP_TCO_ENABLED "enable_tco" diff --git a/include/hw/boards.h b/include/hw/boards.h -index 426ce5f..1062df9 100644 +index 426ce5f625..1062df96c0 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -373,4 +373,28 @@ extern const size_t hw_compat_2_2_len; @@ -749,7 +751,7 @@ index 426ce5f..1062df9 100644 + #endif diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h -index 02a0ced..67e38a1 100644 +index 02a0ced0a0..67e38a1b13 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -267,7 +267,10 @@ void smbios_entry_add(QemuOpts *opts, Error **errp); @@ -765,7 +767,7 @@ index 02a0ced..67e38a1 100644 void smbios_get_tables(MachineState *ms, const struct smbios_phys_mem_area *mem_array, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h -index dce1273..665c430 100644 +index dce1273c7d..665c4309a2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -102,6 +102,9 @@ typedef struct PCMachineClass { @@ -779,7 +781,7 @@ index dce1273..665c430 100644 /* RAM / address space compat: */ bool gigabyte_align; diff --git a/include/hw/usb.h b/include/hw/usb.h -index e29a376..35ac38c 100644 +index e29a37635b..35ac38c459 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -575,4 +575,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id, @@ -792,7 +794,7 @@ index e29a376..35ac38c 100644 + #endif diff --git a/migration/migration.c b/migration/migration.c -index 92e44e0..67d3b75 100644 +index 92e44e021e..67d3b75485 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -128,6 +128,8 @@ enum mig_rp_message_type { @@ -805,7 +807,7 @@ index 92e44e0..67d3b75 100644 migrations at once. For now we don't need to add dynamic creation of migration */ diff --git a/migration/migration.h b/migration/migration.h -index f617960..b8bc10d 100644 +index f617960522..b8bc10d16d 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -339,6 +339,11 @@ void init_dirty_bitmap_incoming_migration(void); @@ -821,5 +823,5 @@ index f617960..b8bc10d 100644 #define qemu_ram_foreach_block \ #warning "Use foreach_not_ignored_block in migration code" -- -1.8.3.1 +2.27.0 diff --git a/0008-Add-aarch64-machine-types.patch b/0008-Add-aarch64-machine-types.patch index fff091f..9e569fb 100644 --- a/0008-Add-aarch64-machine-types.patch +++ b/0008-Add-aarch64-machine-types.patch @@ -43,13 +43,15 @@ Merged patches (4.0.0): Merged patches (4.1.0): - c3e39ef aarch64: Add virt-rhel8.1.0 machine type for ARM - 59a46d1 aarch64: Allow ARM VIRT iommu option in RHEL8.1 machine + +Signed-off-by: Danilo C. L. de Paula --- - hw/arm/virt.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++- - include/hw/arm/virt.h | 11 ++++ + hw/arm/virt.c | 172 +++++++++++++++++++++++++++++++++++++++++- + include/hw/arm/virt.h | 11 +++ 2 files changed, 182 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index e30b837..5a45677 100644 +index e30b837135..5a45677205 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -79,6 +79,7 @@ @@ -264,7 +266,7 @@ index e30b837..5a45677 100644 +} +DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h -index 54bcf17..5fdabd8 100644 +index 54bcf17afd..5fdabd87d6 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -165,6 +165,7 @@ typedef struct { @@ -293,5 +295,5 @@ index 54bcf17..5fdabd8 100644 bool virt_is_acpi_enabled(VirtMachineState *vms); -- -1.8.3.1 +2.27.0 diff --git a/0009-Add-ppc64-machine-types.patch b/0009-Add-ppc64-machine-types.patch index 9be23b5..c8e6c81 100644 --- a/0009-Add-ppc64-machine-types.patch +++ b/0009-Add-ppc64-machine-types.patch @@ -33,16 +33,18 @@ Merged patches (4.2.0): Merged patches (weekly-200226): - eb121ff spapr: Enable DD2.3 accelerated count cache flush in pseries-5.0 machine (partial) + +Signed-off-by: Danilo C. L. de Paula --- - hw/ppc/spapr.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++ - hw/ppc/spapr_cpu_core.c | 13 +++ + hw/ppc/spapr.c | 280 ++++++++++++++++++++++++++++++++++++++++ + hw/ppc/spapr_cpu_core.c | 13 ++ include/hw/ppc/spapr.h | 1 + - target/ppc/compat.c | 13 ++- + target/ppc/compat.c | 13 +- target/ppc/cpu.h | 1 + 5 files changed, 307 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c -index f6f034d..f30618e 100644 +index f6f034d039..f30618e4b1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4530,6 +4530,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) @@ -375,7 +377,7 @@ index f6f034d..f30618e 100644 static void spapr_machine_register_types(void) { diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c -index bfdf6b3..39fcaf8 100644 +index bfdf6b3e5c..39fcaf855b 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -24,6 +24,7 @@ @@ -413,7 +415,7 @@ index bfdf6b3..39fcaf8 100644 goto error_intc_create; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h -index c421410..5190d6a 100644 +index c421410e3f..5190d6a936 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -130,6 +130,7 @@ struct SpaprMachineClass { @@ -425,7 +427,7 @@ index c421410..5190d6a 100644 uint64_t *buid, hwaddr *pio, hwaddr *mmio32, hwaddr *mmio64, diff --git a/target/ppc/compat.c b/target/ppc/compat.c -index fda0dfe..ab8e3b2 100644 +index fda0dfe8f8..ab8e3b2125 100644 --- a/target/ppc/compat.c +++ b/target/ppc/compat.c @@ -114,8 +114,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr) @@ -450,7 +452,7 @@ index fda0dfe..ab8e3b2 100644 const CompatInfo *compat = compat_by_pvr(compat_pvr); const CompatInfo *min = compat_by_pvr(min_compat_pvr); diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h -index e7d382a..3cf209d 100644 +index e7d382ac10..3cf209dd90 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1352,6 +1352,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch) @@ -462,5 +464,5 @@ index e7d382a..3cf209d 100644 uint32_t min_compat_pvr, uint32_t max_compat_pvr); bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr, -- -1.8.3.1 +2.27.0 diff --git a/0010-Add-s390x-machine-types.patch b/0010-Add-s390x-machine-types.patch index bd769c9..d363b4b 100644 --- a/0010-Add-s390x-machine-types.patch +++ b/0010-Add-s390x-machine-types.patch @@ -20,12 +20,14 @@ Merged patches (4.2.0): - fb192e5 redhat: s390x: Rename s390-ccw-virtio-rhel8.0.0 to s390-ccw-virtio-rhel8.1.0 - a9b22e8 redhat: s390x: Add proper compatibility options for the -rhel7.6.0 machine - hw/s390x: Add the s390-ccw-virtio-rhel8.2.0 machine types (patch 92954) + +Signed-off-by: Danilo C. L. de Paula --- - hw/s390x/s390-virtio-ccw.c | 71 +++++++++++++++++++++++++++++++++++++++++++++- + hw/s390x/s390-virtio-ccw.c | 71 +++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index 023fd25..0e8dd62 100644 +index 023fd25f2b..0e8dd62b18 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -778,7 +778,7 @@ bool css_migration_enabled(void) @@ -121,5 +123,5 @@ index 023fd25..0e8dd62 100644 static void ccw_machine_register_types(void) { -- -1.8.3.1 +2.27.0 diff --git a/0011-Add-x86_64-machine-types.patch b/0011-Add-x86_64-machine-types.patch index 4b98372..45c1f1b 100644 --- a/0011-Add-x86_64-machine-types.patch +++ b/0011-Add-x86_64-machine-types.patch @@ -42,19 +42,21 @@ Merged patches (weekly-200122): Merged patches (weekly-200318): - e6c3fbf hw/smbios: set new default SMBIOS fields for Windows driver support (partialy) + +Signed-off-by: Danilo C. L. de Paula --- hw/i386/acpi-build.c | 3 + - hw/i386/pc.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++- - hw/i386/pc_piix.c | 210 +++++++++++++++++++++++++++++++++++++++- - hw/i386/pc_q35.c | 162 ++++++++++++++++++++++++++++++- + hw/i386/pc.c | 265 ++++++++++++++++++++++++++++++++++++++++++- + hw/i386/pc_piix.c | 210 +++++++++++++++++++++++++++++++++- + hw/i386/pc_q35.c | 162 +++++++++++++++++++++++++- include/hw/boards.h | 2 + - include/hw/i386/pc.h | 33 +++++++ + include/hw/i386/pc.h | 33 ++++++ target/i386/cpu.c | 3 +- target/i386/kvm.c | 4 + 8 files changed, 675 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c -index b7bcbbb..fe815c5 100644 +index b7bcbbbb2a..fe815c5403 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -212,6 +212,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) @@ -68,7 +70,7 @@ index b7bcbbb..fe815c5 100644 } diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index 61acc9e..fe37bde 100644 +index 61acc9e530..fe37bdec7a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -346,6 +346,263 @@ GlobalProperty pc_compat_1_4[] = { @@ -365,7 +367,7 @@ index 61acc9e..fe37bde 100644 mc->wakeup = pc_machine_wakeup; hc->pre_plug = pc_machine_device_pre_plug_cb; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 18815e8..eeadd89 100644 +index 18815e8302..eeadd896c2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -54,6 +54,7 @@ @@ -604,7 +606,7 @@ index 18815e8..eeadd89 100644 +DEFINE_PC_MACHINE(rhel700, "pc-i440fx-rhel7.0.0", pc_init_rhel700, + pc_machine_rhel700_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index a1131e6..1cd4e15 100644 +index a1131e6825..1cd4e15297 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -201,8 +201,8 @@ static void pc_q35_init(MachineState *machine) @@ -788,7 +790,7 @@ index a1131e6..1cd4e15 100644 +DEFINE_PC_MACHINE(q35_rhel730, "pc-q35-rhel7.3.0", pc_q35_init_rhel730, + pc_q35_machine_rhel730_options); diff --git a/include/hw/boards.h b/include/hw/boards.h -index 1062df9..c357731 100644 +index 1062df96c0..c3577319c0 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -208,6 +208,8 @@ struct MachineClass { @@ -801,7 +803,7 @@ index 1062df9..c357731 100644 int nb_nodes, ram_addr_t size); bool ignore_boot_device_suffixes; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h -index 665c430..95d07f8 100644 +index 665c4309a2..95d07f81a0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -120,6 +120,9 @@ typedef struct PCMachineClass { @@ -852,7 +854,7 @@ index 665c430..95d07f8 100644 * depending on QEMU versions up to QEMU 2.4. */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 55a30cd..5477433 100644 +index 55a30cd4d9..5477433af5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1830,7 +1830,7 @@ static X86CPUDefinition builtin_x86_defs[] = { @@ -873,7 +875,7 @@ index 55a30cd..5477433 100644 }; diff --git a/target/i386/kvm.c b/target/i386/kvm.c -index 6adbff3..51fbfd5 100644 +index 6adbff3d74..51fbfd528e 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -3139,6 +3139,7 @@ static int kvm_get_msrs(X86CPU *cpu) @@ -895,5 +897,5 @@ index 6adbff3..51fbfd5 100644 case MSR_KVM_PV_EOI_EN: env->pv_eoi_en_msr = msrs[i].data; -- -1.8.3.1 +2.27.0 diff --git a/0012-Enable-make-check.patch b/0012-Enable-make-check.patch index ae2533d..52af98e 100644 --- a/0012-Enable-make-check.patch +++ b/0012-Enable-make-check.patch @@ -33,6 +33,8 @@ Merged patches (4.0.0): Merged patches (4.1.0-rc0): - 41288ff redhat: Remove raw iotest 205 + +Signed-off-by: Danilo C. L. de Paula --- redhat/qemu-kvm.spec.template | 2 +- tests/qemu-iotests/051 | 12 ++++++------ @@ -48,7 +50,7 @@ Merged patches (4.1.0-rc0): 11 files changed, 38 insertions(+), 18 deletions(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 -index 034d3a3..aadc413 100755 +index 034d3a3250..aadc413ee6 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -183,11 +183,11 @@ run_qemu -drive if=virtio @@ -82,7 +84,7 @@ index 034d3a3..aadc413 100755 *) ;; diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index 9b07a7e..c678d91 100644 +index 9b07a7ed03..c678d915b2 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -92,7 +92,7 @@ @@ -104,7 +106,7 @@ index 9b07a7e..c678d91 100644 101 rw quick 102 rw quick diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include -index 98af2c2..d370459 100644 +index 98af2c2d93..d370459c3a 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -29,7 +29,7 @@ check-qtest-i386-y += ide-test @@ -155,7 +157,7 @@ index 98af2c2..d370459 100644 check-qtest-s390x-y += cpu-plug-test check-qtest-s390x-y += migration-test diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c -index 85a3614..1c18441 100644 +index 85a3614286..1c18441334 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -109,19 +109,23 @@ static testdef_t tests[] = { @@ -184,7 +186,7 @@ index 85a3614..1c18441 100644 { "sparc", "LX", "", "TMS390S10" }, { "sparc", "SS-4", "", "MB86904" }, diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c -index e8ffbbc..fda7269 100644 +index e8ffbbce4b..fda7269c82 100644 --- a/tests/qtest/cpu-plug-test.c +++ b/tests/qtest/cpu-plug-test.c @@ -181,8 +181,8 @@ static void add_pseries_test_case(const char *mname) @@ -199,7 +201,7 @@ index e8ffbbc..fda7269 100644 } data = g_new(PlugTestData, 1); diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c -index c387984..c89112d 100644 +index c387984ef6..c89112d6f8 100644 --- a/tests/qtest/e1000-test.c +++ b/tests/qtest/e1000-test.c @@ -22,9 +22,11 @@ struct QE1000 { @@ -215,7 +217,7 @@ index c387984..c89112d 100644 static void *e1000_get_driver(void *obj, const char *interface) diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c -index 48e8e02..6496196 100644 +index 48e8e02d6e..6496196b07 100644 --- a/tests/qtest/hd-geo-test.c +++ b/tests/qtest/hd-geo-test.c @@ -737,6 +737,7 @@ static void test_override_ide(void) @@ -247,7 +249,7 @@ index 48e8e02..6496196 100644 qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs); qtest_add_func("hd-geo/override/scsi_hot_unplug", diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c -index 60e6ec3..f9d6adc 100644 +index 60e6ec3153..f9d6adcfe9 100644 --- a/tests/qtest/prom-env-test.c +++ b/tests/qtest/prom-env-test.c @@ -89,10 +89,14 @@ int main(int argc, char *argv[]) @@ -266,7 +268,7 @@ index 60e6ec3..f9d6adc 100644 add_tests(sparc_machines); } else if (!strcmp(arch, "sparc64")) { diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c -index 7ca1883..983aa07 100644 +index 7ca1883a29..983aa0719a 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -300,6 +300,7 @@ int main(int argc, char **argv) @@ -286,7 +288,7 @@ index 7ca1883..983aa07 100644 /* Test feature parsing */ add_feature_test("x86/cpuid/features/plus", diff --git a/tests/qtest/usb-hcd-xhci-test.c b/tests/qtest/usb-hcd-xhci-test.c -index 10ef9d2..3855873 100644 +index 10ef9d2a91..3855873050 100644 --- a/tests/qtest/usb-hcd-xhci-test.c +++ b/tests/qtest/usb-hcd-xhci-test.c @@ -21,6 +21,7 @@ static void test_xhci_hotplug(void) @@ -316,5 +318,5 @@ index 10ef9d2..3855873 100644 qtest_start("-device nec-usb-xhci,id=xhci" -- -1.8.3.1 +2.27.0 diff --git a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch index 1445da6..cbf42e0 100644 --- a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch +++ b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch @@ -35,13 +35,14 @@ Merged patches (2.9.0): (cherry picked from commit 9fa3c9fc6dfcde76d80db1aa601b2d577f72ceec) (cherry picked from commit 3cb35556dc7d994f203d732fe952f95fcdb03c0a) +Signed-off-by: Danilo C. L. de Paula --- hw/vfio/pci.c | 29 ++++++++++++++++++++++++++++- hw/vfio/pci.h | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c -index d020ea9..e4292ea 100644 +index d020ea9f82..e4292ea2b4 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -47,6 +47,9 @@ @@ -97,7 +98,7 @@ index d020ea9..e4292ea 100644 false), DEFINE_PROP_BOOL("x-no-vfio-ioeventfd", VFIOPCIDevice, no_vfio_ioeventfd, diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h -index 0da7a20..5d2b0d2 100644 +index 0da7a20a7e..5d2b0d2f2d 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -135,6 +135,7 @@ typedef struct VFIOPCIDevice { @@ -109,5 +110,5 @@ index 0da7a20..5d2b0d2 100644 uint32_t device_id; uint32_t sub_vendor_id; -- -1.8.3.1 +2.27.0 diff --git a/0014-Add-support-statement-to-help-output.patch b/0014-Add-support-statement-to-help-output.patch index 3f8f0ff..2ef2119 100644 --- a/0014-Add-support-statement-to-help-output.patch +++ b/0014-Add-support-statement-to-help-output.patch @@ -18,12 +18,13 @@ as unsupported by Red Hat, and advising users to use libvirt instead. Signed-off-by: Eduardo Habkost (cherry picked from commit 2a07700936e39856cc9f149c6a6517f0715536a6) (cherry picked from commit 5dd2f4706e2fef945771949e59a8fcc1b5452de9) +Signed-off-by: Danilo C. L. de Paula --- softmmu/vl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 6509057..8453de5 100644 +index 6509057752..8453de5e68 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1674,9 +1674,17 @@ static void version(void) @@ -53,5 +54,5 @@ index 6509057..8453de5 100644 } -- -1.8.3.1 +2.27.0 diff --git a/0015-globally-limit-the-maximum-number-of-CPUs.patch b/0015-globally-limit-the-maximum-number-of-CPUs.patch index 38b9095..e5bb3c8 100644 --- a/0015-globally-limit-the-maximum-number-of-CPUs.patch +++ b/0015-globally-limit-the-maximum-number-of-CPUs.patch @@ -74,13 +74,15 @@ The recommended vcpu max limit (KVM_CAP_NR_VCPUS) should be used instead of the actual max vcpu limit (KVM_CAP_MAX_VCPUS) to give an error. This commit matches the limit to current KVM_CAP_NR_VCPUS value. + +Signed-off-by: Danilo C. L. de Paula --- accel/kvm/kvm-all.c | 12 ++++++++++++ softmmu/vl.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c -index ab36fbf..6f6bb47 100644 +index ab36fbfa0c..6f6bb47d9a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2088,6 +2088,18 @@ static int kvm_init(MachineState *ms) @@ -103,7 +105,7 @@ index ab36fbf..6f6bb47 100644 if (nc->num > soft_vcpus_limit) { warn_report("Number of %s cpus requested (%d) exceeds " diff --git a/softmmu/vl.c b/softmmu/vl.c -index 8453de5..ea6e9e4 100644 +index 8453de5e68..ea6e9e4f01 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -116,6 +116,8 @@ @@ -146,5 +148,5 @@ index 8453de5..ea6e9e4 100644 configure_rtc(qemu_find_opts_singleton("rtc")); -- -1.8.3.1 +2.27.0 diff --git a/0016-Add-support-for-simpletrace.patch b/0016-Add-support-for-simpletrace.patch index d9e4626..7309f2c 100644 --- a/0016-Add-support-for-simpletrace.patch +++ b/0016-Add-support-for-simpletrace.patch @@ -24,11 +24,13 @@ Merged patches (2.3.0): - 5292fc3 trace: add SystemTap init scripts for simpletrace bridge - eda9e5e simpletrace: install simpletrace.py - 85c4c8f trace: add systemtap-initscript README file to RPM + +Signed-off-by: Danilo C. L. de Paula --- .gitignore | 2 ++ Makefile | 4 +++ - README.systemtap | 43 +++++++++++++++++++++++++++++++++ - redhat/qemu-kvm.spec.template | 25 ++++++++++++++++++- + README.systemtap | 43 +++++++++++++++++++++++++ + redhat/qemu-kvm.spec.template | 25 +++++++++++++- scripts/systemtap/conf.d/qemu_kvm.conf | 4 +++ scripts/systemtap/script.d/qemu_kvm.stp | 1 + 6 files changed, 78 insertions(+), 1 deletion(-) @@ -37,7 +39,7 @@ Merged patches (2.3.0): create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp diff --git a/Makefile b/Makefile -index 88b7565..045eeb5 100644 +index 88b7565246..045eeb545e 100644 --- a/Makefile +++ b/Makefile @@ -995,6 +995,10 @@ endif @@ -53,7 +55,7 @@ index 88b7565..045eeb5 100644 ctags: diff --git a/README.systemtap b/README.systemtap new file mode 100644 -index 0000000..ad913fc +index 0000000000..ad913fc990 --- /dev/null +++ b/README.systemtap @@ -0,0 +1,43 @@ @@ -102,7 +104,7 @@ index 0000000..ad913fc + # /usr/share/qemu-kvm/simpletrace.py --no-header /usr/share/qemu-kvm/trace-events /tmp/trace.log diff --git a/scripts/systemtap/conf.d/qemu_kvm.conf b/scripts/systemtap/conf.d/qemu_kvm.conf new file mode 100644 -index 0000000..372d816 +index 0000000000..372d8160a4 --- /dev/null +++ b/scripts/systemtap/conf.d/qemu_kvm.conf @@ -0,0 +1,4 @@ @@ -112,11 +114,11 @@ index 0000000..372d816 +qemu_kvm_OPT="-s4" # per-CPU buffer size, in megabytes diff --git a/scripts/systemtap/script.d/qemu_kvm.stp b/scripts/systemtap/script.d/qemu_kvm.stp new file mode 100644 -index 0000000..c04abf9 +index 0000000000..c04abf9449 --- /dev/null +++ b/scripts/systemtap/script.d/qemu_kvm.stp @@ -0,0 +1 @@ +probe qemu.kvm.simpletrace.handle_qmp_command,qemu.kvm.simpletrace.monitor_protocol_*,qemu.kvm.simpletrace.migrate_set_state {} -- -1.8.3.1 +2.27.0 diff --git a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch index c63c892..48d46dc 100644 --- a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch +++ b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch @@ -24,6 +24,8 @@ Rebase notes (weekly-200129): Rebase notes (weekly-200708 - rewrite patch to new docs structure + +Signed-off-by: Danilo C. L. de Paula --- docs/defs.rst.inc | 4 ++-- docs/interop/live-block-operations.rst | 4 ++-- @@ -33,7 +35,7 @@ Rebase notes (weekly-200708 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc -index 48d05aa..d74dbde 100644 +index 48d05aaf33..d74dbdeca9 100644 --- a/docs/defs.rst.inc +++ b/docs/defs.rst.inc @@ -9,7 +9,7 @@ @@ -47,7 +49,7 @@ index 48d05aa..d74dbde 100644 .. |I2C| replace:: I\ :sup:`2`\ C .. |I2S| replace:: I\ :sup:`2`\ S diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst -index 48afdc7..6650b2c 100644 +index 48afdc7927..6650b2c975 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -129,7 +129,7 @@ To show some example invocations of command-line, we will use the @@ -69,7 +71,7 @@ index 48afdc7..6650b2c 100644 -blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ -device virtio-blk,drive=node-TargetDisk,id=virtio0 \ diff --git a/docs/tools/qemu-trace-stap.rst b/docs/tools/qemu-trace-stap.rst -index fb70445..0d9a783 100644 +index fb70445c75..0d9a783112 100644 --- a/docs/tools/qemu-trace-stap.rst +++ b/docs/tools/qemu-trace-stap.rst @@ -45,19 +45,19 @@ The following commands are valid: @@ -127,7 +129,7 @@ index fb70445..0d9a783 100644 See also -------- diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst -index 824e713..8449936 100644 +index 824e713491..8449936c63 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -116,7 +116,7 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket @@ -140,7 +142,7 @@ index 824e713..8449936 100644 -device vhost-user-fs-pci,chardev=char0,tag=myfs \ -object memory-backend-memfd,id=mem,size=4G,share=on \ diff --git a/qemu-options.hx b/qemu-options.hx -index b969944..fe85a0e 100644 +index b9699440a3..fe85a0e952 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2891,11 +2891,11 @@ SRST @@ -161,5 +163,5 @@ index b969944..fe85a0e 100644 ``-netdev vhost-vdpa,vhostdev=/path/to/dev`` Establish a vhost-vdpa netdev. -- -1.8.3.1 +2.27.0 diff --git a/0018-usb-xhci-Fix-PCI-capability-order.patch b/0018-usb-xhci-Fix-PCI-capability-order.patch index 81a8467..f4c5de6 100644 --- a/0018-usb-xhci-Fix-PCI-capability-order.patch +++ b/0018-usb-xhci-Fix-PCI-capability-order.patch @@ -56,12 +56,13 @@ Conflicts: (cherry picked from commit a42f86dc906cc7d2c16d02bf125ed76847b469cb) (cherry picked from commit 992ab2e4f6e15d3e51bc716763aa8d6f45c6d29d) +Signed-off-by: Danilo C. L. de Paula --- hw/usb/hcd-xhci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index b25cce8..9582d81 100644 +index b25cce8f0c..9582d81d14 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3413,6 +3413,12 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error **errp) @@ -91,5 +92,5 @@ index b25cce8..9582d81 100644 /* TODO check for errors, and should fail when msix=on */ msix_init(dev, xhci->numintrs, -- -1.8.3.1 +2.27.0 diff --git a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch index 63a6d18..94a535a 100644 --- a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch +++ b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch @@ -45,7 +45,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 9 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c -index b497752..d3a64a6 100644 +index b49775269e..d3a64a6582 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -814,6 +814,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev, @@ -65,5 +65,5 @@ index b497752..d3a64a6 100644 if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) { return; -- -1.8.3.1 +2.27.0 diff --git a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch index 2534964..b6808d3 100644 --- a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch +++ b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch @@ -32,7 +32,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 7 insertions(+) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c -index 0c2bc8e..15bef3d 100644 +index 0c2bc8e06e..15bef3d27f 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -335,12 +335,19 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize, @@ -56,5 +56,5 @@ index 0c2bc8e..15bef3d 100644 spapr_check_pagesize(spapr, qemu_minrampagesize(), errp); } -- -1.8.3.1 +2.27.0 diff --git a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch index cc7fdca..55de732 100644 --- a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch +++ b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch @@ -29,7 +29,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qapi/block-core.json b/qapi/block-core.json -index b20332e..db4544d 100644 +index b20332e592..db4544df75 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4135,10 +4135,17 @@ @@ -52,5 +52,5 @@ index b20332e..db4544d 100644 ## # @blockdev-del: -- -1.8.3.1 +2.27.0 diff --git a/0022-virtio-net-fix-removal-of-failover-device.patch b/0022-virtio-net-fix-removal-of-failover-device.patch index 8a2b5be..ca33979 100644 --- a/0022-virtio-net-fix-removal-of-failover-device.patch +++ b/0022-virtio-net-fix-removal-of-failover-device.patch @@ -36,7 +36,7 @@ Signed-off-by: Danilo C. L. de Paula 1 file changed, 1 insertion(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c -index 1596cb1..f82455b 100644 +index 1596cb1397..f82455ba5d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3417,6 +3417,7 @@ static void virtio_net_device_unrealize(DeviceState *dev) @@ -48,5 +48,5 @@ index 1596cb1..f82455b 100644 g_free(n->standby_id); qobject_unref(n->primary_device_dict); -- -1.8.3.1 +2.27.0 diff --git a/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch b/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch index 3301702..edd80d0 100644 --- a/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch +++ b/0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch @@ -1,6 +1,6 @@ -From 34817c44ee8e467df7e9f92b5fffa5679172bb58 Mon Sep 17 00:00:00 2001 +From 64afb1a8b06f0017b3ee5eb59790e1751424b1d5 Mon Sep 17 00:00:00 2001 From: David Gibson -Date: Wed, 8 Jul 2020 10:02:25 +0200 +Date: Fri, 22 May 2020 02:27:18 +0000 Subject: RHEL-only: Enable vTPM for POWER in downstream configs RH-Author: David Gibson @@ -8,6 +8,9 @@ Message-id: <20200522032718.387731-1-dgibson@redhat.com> Patchwork-id: 96743 O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH] RHEL-only: Enable vTPM for POWER in downstream configs Bugzilla: 1781911 +RH-Acked-by: Laurent Vivier +RH-Acked-by: Thomas Huth +RH-Acked-by: Greg Kurz From: David Gibson @@ -20,13 +23,13 @@ Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=28742072 Testing: With brewed qemu was able to see a vTPM device in a guest Signed-off-by: David Gibson -Signed-off-by: Miroslav Rezanina +Signed-off-by: Danilo C. L. de Paula --- default-configs/ppc64-rh-devices.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/default-configs/ppc64-rh-devices.mak b/default-configs/ppc64-rh-devices.mak -index ecbe53f..032422e 100644 +index ecbe53fe63..032422e103 100644 --- a/default-configs/ppc64-rh-devices.mak +++ b/default-configs/ppc64-rh-devices.mak @@ -32,3 +32,6 @@ CONFIG_XICS_SPAPR=y @@ -37,5 +40,5 @@ index ecbe53f..032422e 100644 +CONFIG_TPM_EMULATOR=y +CONFIG_TPM_PASSTHROUGH=y -- -1.8.3.1 +2.27.0 diff --git a/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch b/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch index 5924eed..87ec07a 100644 --- a/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch +++ b/0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch @@ -1,6 +1,6 @@ -From 0de024660bb9c42ca87fd179b6a4122c3a9e0eb3 Mon Sep 17 00:00:00 2001 +From def5545e3588c8b8c7cd12e3ff8967ce059d3f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Wed, 8 Jul 2020 10:02:25 +0200 +Date: Mon, 8 Jun 2020 15:54:26 -0400 Subject: redhat: fix 5.0 rebase missing ISA TPM TIS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -20,14 +20,14 @@ BRANCH: rhel-av-8.3.0-preview-2020-04-29 UPSTREAM: N/A BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29172313 -Signed-off-by: Marc-André Lureau -Signed-off-by: Miroslav Rezanina +Signed-off-by: Marc-André Lureau +Signed-off-by: Danilo C. L. de Paula --- default-configs/x86_64-rh-devices.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/x86_64-rh-devices.mak b/default-configs/x86_64-rh-devices.mak -index d59b6d9..1469e05 100644 +index d59b6d9bb5..1469e05382 100644 --- a/default-configs/x86_64-rh-devices.mak +++ b/default-configs/x86_64-rh-devices.mak @@ -95,6 +95,6 @@ CONFIG_WDT_IB6300ESB=y @@ -39,5 +39,5 @@ index d59b6d9..1469e05 100644 CONFIG_TPM_EMULATOR=y CONFIG_TPM_PASSTHROUGH=y -- -1.8.3.1 +2.27.0 diff --git a/0026-redhat-define-hw_compat_8_2.patch b/0026-redhat-define-hw_compat_8_2.patch index eb1a0a1..229c59c 100644 --- a/0026-redhat-define-hw_compat_8_2.patch +++ b/0026-redhat-define-hw_compat_8_2.patch @@ -1,6 +1,6 @@ -From 43a29be3b4f2186441067a2f5cd45d4e6035f206 Mon Sep 17 00:00:00 2001 +From f8f3c2d598ca5921b6a5d477e848f02977c715fd Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" -Date: Wed, 8 Jul 2020 10:02:25 +0200 +Date: Fri, 19 Jun 2020 15:42:26 -0400 Subject: redhat: define hw_compat_8_2 RH-Author: Dr. David Alan Gilbert @@ -17,21 +17,21 @@ From: Laurent Vivier Signed-off-by: Laurent Vivier Signed-off-by: Dr. David Alan Gilbert For minor fix - -Signed-off-by: Miroslav Rezanina +Signed-off-by: Danilo C. L. de Paula --- hw/core/machine.c | 28 ++++++++++++++++++++++++++++ include/hw/boards.h | 3 +++ 2 files changed, 31 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c -index ef6b320..b837399 100644 +index ef6b320ea7..b8373991e9 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c -@@ -29,6 +29,34 @@ +@@ -28,6 +28,34 @@ + #include "hw/mem/nvdimm.h" #include "migration/vmstate.h" - /* ++/* + * The same as hw_compat_4_2 + */ +GlobalProperty hw_compat_rhel_8_2[] = { @@ -59,12 +59,11 @@ index ef6b320..b837399 100644 + { "fw_cfg", "acpi-mr-restore", "false" }, +}; +const size_t hw_compat_rhel_8_2_len = G_N_ELEMENTS(hw_compat_rhel_8_2); -+/* + /* * The same as hw_compat_4_1 */ - GlobalProperty hw_compat_rhel_8_1[] = { diff --git a/include/hw/boards.h b/include/hw/boards.h -index c357731..f918a15 100644 +index c3577319c0..f918a15c66 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -375,6 +375,9 @@ extern const size_t hw_compat_2_2_len; @@ -78,5 +77,5 @@ index c357731..f918a15 100644 extern const size_t hw_compat_rhel_8_1_len; -- -1.8.3.1 +2.27.0 diff --git a/0027-x86-Add-8.3.0-x86_64-machine-type.patch b/0027-x86-Add-8.3.0-x86_64-machine-type.patch index 01d528e..cee8833 100644 --- a/0027-x86-Add-8.3.0-x86_64-machine-type.patch +++ b/0027-x86-Add-8.3.0-x86_64-machine-type.patch @@ -1,6 +1,6 @@ -From 9fc44f5b2b271ea3337f8e5eae3bc3d2f9d857f3 Mon Sep 17 00:00:00 2001 +From 8b509ce5c11a82d05ad0d43270e4b76e0010015b Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" -Date: Wed, 8 Jul 2020 10:02:25 +0200 +Date: Fri, 19 Jun 2020 15:42:27 -0400 Subject: x86: Add 8.3.0 x86_64 machine type RH-Author: Dr. David Alan Gilbert @@ -17,7 +17,7 @@ From: "Dr. David Alan Gilbert" Not much change, just the smbase-smram. Signed-off-by: Dr. David Alan Gilbert -Signed-off-by: Miroslav Rezanina +Signed-off-by: Danilo C. L. de Paula --- hw/i386/pc.c | 6 ++++++ hw/i386/pc_piix.c | 4 ++++ @@ -26,7 +26,7 @@ Signed-off-by: Miroslav Rezanina 4 files changed, 35 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c -index fe37bde..94c857e 100644 +index fe37bdec7a..94c857ea97 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -360,6 +360,12 @@ GlobalProperty pc_rhel_compat[] = { @@ -43,7 +43,7 @@ index fe37bde..94c857e 100644 GlobalProperty pc_rhel_8_1_compat[] = { }; const size_t pc_rhel_8_1_compat_len = G_N_ELEMENTS(pc_rhel_8_1_compat); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index eeadd89..f14ddcb 100644 +index eeadd896c2..f14ddcb472 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -1028,6 +1028,10 @@ static void pc_machine_rhel760_options(MachineClass *m) @@ -58,7 +58,7 @@ index eeadd89..f14ddcb 100644 compat_props_add(m->compat_props, pc_rhel_8_1_compat, pc_rhel_8_1_compat_len); compat_props_add(m->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 1cd4e15..b9e8dcb 100644 +index 1cd4e15297..b9e8dcb392 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -590,6 +590,23 @@ static void pc_q35_machine_rhel_options(MachineClass *m) @@ -100,7 +100,7 @@ index 1cd4e15..b9e8dcb 100644 DEFINE_PC_MACHINE(q35_rhel820, "pc-q35-rhel8.2.0", pc_q35_init_rhel820, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h -index 95d07f8..e67468b 100644 +index 95d07f81a0..e67468ba41 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -270,6 +270,9 @@ extern const size_t pc_compat_1_4_len; @@ -114,5 +114,5 @@ index 95d07f8..e67468b 100644 extern const size_t pc_rhel_8_1_compat_len; -- -1.8.3.1 +2.27.0 diff --git a/0028-hw-arm-Changes-to-rhel820-machine.patch b/0028-hw-arm-Changes-to-rhel820-machine.patch deleted file mode 100644 index 419610d..0000000 --- a/0028-hw-arm-Changes-to-rhel820-machine.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 2717baf34693fc9aa5fa7d1f2a5e8eb1677c1bc2 Mon Sep 17 00:00:00 2001 -From: Gavin Shan -Date: Wed, 8 Jul 2020 10:02:25 +0200 -Subject: hw/arm: Changes to rhel820 machine - -RH-Author: Gavin Shan -Message-id: <20200630013648.101937-1-gshan@redhat.com> -Patchwork-id: 97844 -O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v5 1/3] hw/arm: Changes to rhel820 machine -Bugzilla: 1818843 - -This applies two changes to rhel820 machine: - - * Set the gic version to VIRT_GIC_VERSION_NOSEL by default, which - doesn't cause functional changes. - * Disallow to configure the RAS property, which is hidden by default. - -Signed-off-by: Gavin Shan -RH-Acked-by: Auger Eric -RH-Acked-by: Andrew Jones -Signed-off-by: Miroslav Rezanina ---- - hw/arm/virt.c | 17 ++++++----------- - 1 file changed, 6 insertions(+), 11 deletions(-) - -diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 5a45677..53f02e0 100644 ---- a/hw/arm/virt.c -+++ b/hw/arm/virt.c -@@ -2090,6 +2090,7 @@ static void virt_set_acpi(Object *obj, Visitor *v, const char *name, - visit_type_OnOffAuto(v, name, &vms->acpi, errp); - } - -+#if 0 /* Disabled for Red Hat Enterprise Linux */ - static bool virt_get_ras(Object *obj, Error **errp) - { - VirtMachineState *vms = VIRT_MACHINE(obj); -@@ -2103,6 +2104,7 @@ static void virt_set_ras(Object *obj, bool value, Error **errp) - - vms->ras = value; - } -+#endif /* disabled for RHEL */ - - static char *virt_get_gic_version(Object *obj, Error **errp) - { -@@ -2760,12 +2762,8 @@ static void rhel820_virt_instance_init(Object *obj) - object_property_set_description(obj, "highmem", - "Set on/off to enable/disable using " - "physical address space above 32 bits"); -- /* -- * Default GIC type is still v2, but became configurable for RHEL. We -- * keep v2 instead of max as TCG CI test cases require an MSI controller -- * and there is no userspace ITS MSI emulation available. -- */ -- vms->gic_version = 2; -+ -+ vms->gic_version = VIRT_GIC_VERSION_NOSEL; - object_property_add_str(obj, "gic-version", virt_get_gic_version, - virt_set_gic_version); - object_property_set_description(obj, "gic-version", -@@ -2792,12 +2790,9 @@ static void rhel820_virt_instance_init(Object *obj) - object_property_set_description(obj, "iommu", - "Set the IOMMU type. " - "Valid values are none and smmuv3"); -+ - vms->ras = false; -- object_property_add_bool(obj, "ras", virt_get_ras, -- virt_set_ras); -- object_property_set_description(obj, "ras", -- "Set on/off to enable/disable reporting host memory errors " -- "to a KVM guest using ACPI and guest external abort exceptions"); -+ - vms->irqmap=a15irqmap; - virt_flash_create(vms); - } --- -1.8.3.1 - diff --git a/0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch b/0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch deleted file mode 100644 index c982e43..0000000 --- a/0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 91449aaf4ad482d9208c8861f549f7fe58af02ac Mon Sep 17 00:00:00 2001 -From: Gavin Shan -Date: Wed, 8 Jul 2020 10:02:25 +0200 -Subject: hw/arm: Introduce rhel_virt_instance_init() helper - -RH-Author: Gavin Shan -Message-id: <20200629022939.76453-3-gshan@redhat.com> -Patchwork-id: 97838 -O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v4 2/3] hw/arm: Introduce rhel_virt_instance_init() helper -Bugzilla: 1818843 -RH-Acked-by: Andrew Jones - -This introduces rhel_virt_instance_init() helper function so that -it can be shared by rhel820 and rhel830 machine. This shouldn't -cause functional changes. - -Signed-off-by: Gavin Shan -Signed-off-by: Miroslav Rezanina ---- - hw/arm/virt.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 53f02e0..f26ae9f 100644 ---- a/hw/arm/virt.c -+++ b/hw/arm/virt.c -@@ -2746,7 +2746,7 @@ static void rhel_machine_init(void) - } - type_init(rhel_machine_init); - --static void rhel820_virt_instance_init(Object *obj) -+static void rhel_virt_instance_init(Object *obj) - { - VirtMachineState *vms = VIRT_MACHINE(obj); - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); -@@ -2797,6 +2797,11 @@ static void rhel820_virt_instance_init(Object *obj) - virt_flash_create(vms); - } - -+static void rhel820_virt_instance_init(Object *obj) -+{ -+ rhel_virt_instance_init(obj); -+} -+ - static void rhel820_virt_options(MachineClass *mc) - { - compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len); --- -1.8.3.1 - diff --git a/0030-hw-arm-Add-rhel830-machine-type.patch b/0030-hw-arm-Add-rhel830-machine-type.patch deleted file mode 100644 index 748a6ba..0000000 --- a/0030-hw-arm-Add-rhel830-machine-type.patch +++ /dev/null @@ -1,58 +0,0 @@ -From afad5b1cdd3d29cd497cb9987fca3009fa352d40 Mon Sep 17 00:00:00 2001 -From: Gavin Shan -Date: Wed, 8 Jul 2020 10:02:25 +0200 -Subject: hw/arm: Add rhel830 machine type - -RH-Author: Gavin Shan -Message-id: <20200630014756.102753-1-gshan@redhat.com> -Patchwork-id: 97845 -O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v5 3/3] hw/arm: Add rhel830 machine type -Bugzilla: 1818843 -RH-Acked-by: Andrew Jones - -This adds rhel830 machine type, whose properties are same as to -rhel820. - -Signed-off-by: Gavin Shan -RH-Acked-by: Auger Eric -Signed-off-by: Miroslav Rezanina ---- - hw/arm/virt.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index f26ae9f..f1553f3 100644 ---- a/hw/arm/virt.c -+++ b/hw/arm/virt.c -@@ -2797,6 +2797,17 @@ static void rhel_virt_instance_init(Object *obj) - virt_flash_create(vms); - } - -+static void rhel830_virt_instance_init(Object *obj) -+{ -+ rhel_virt_instance_init(obj); -+} -+ -+static void rhel830_virt_options(MachineClass *mc) -+{ -+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len); -+} -+DEFINE_RHEL_MACHINE_AS_LATEST(8, 3, 0) -+ - static void rhel820_virt_instance_init(Object *obj) - { - rhel_virt_instance_init(obj); -@@ -2804,6 +2815,8 @@ static void rhel820_virt_instance_init(Object *obj) - - static void rhel820_virt_options(MachineClass *mc) - { -- compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len); -+ rhel830_virt_options(mc); -+ compat_props_add(mc->compat_props, hw_compat_rhel_8_2, -+ hw_compat_rhel_8_2_len); - } --DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0) -+DEFINE_RHEL_MACHINE(8, 2, 0) --- -1.8.3.1 - diff --git a/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch b/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch deleted file mode 100644 index b6d46d5..0000000 --- a/0031-redhat-define-pseries-rhel8.3.0-machine-type.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3ccb92293ca895bc52907b36c8d2e8b6936ed975 Mon Sep 17 00:00:00 2001 -From: Laurent Vivier -Date: Wed, 8 Jul 2020 10:04:09 +0200 -Subject: redhat: define pseries-rhel8.3.0 machine type - -RH-Author: Laurent Vivier -Message-id: <20200706104117.219174-3-lvivier@redhat.com> -Patchwork-id: 97904 -O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH v2 2/2] redhat: define pseries-rhel8.3.0 machine type -Bugzilla: 1853265 - -Note: rebase to qemu-5.1 introduces - - 32a354dc6c07 ("numa: forbid '-numa node, mem' for 5.1 and newer machine types") - -and so '-numa node, mem' will not be available with pseries-rhel8.3.0 - -Signed-off-by: Laurent Vivier -Signed-off-by: Miroslav Rezanina ---- - hw/ppc/spapr.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c -index f30618e..dc1e9cb 100644 ---- a/hw/ppc/spapr.c -+++ b/hw/ppc/spapr.c -@@ -4990,15 +4990,41 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false); - #endif - - /* -+ * pseries-rhel8.3.0 -+ * like pseries-5.1 -+ */ -+ -+static void spapr_machine_rhel830_class_options(MachineClass *mc) -+{ -+ /* Defaults for the latest behaviour inherited from the base class */ -+} -+ -+DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", true); -+ -+/* - * pseries-rhel8.2.0 -+ * like pseries-4.2 + pseries-5.0 -+ * except SPAPR_CAP_CCF_ASSIST that has been backported to pseries-rhel8.1.0 - */ - - static void spapr_machine_rhel820_class_options(MachineClass *mc) - { -- /* Defaults for the latest behaviour inherited from the base class */ -+ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); -+ -+ spapr_machine_rhel830_class_options(mc); -+ compat_props_add(mc->compat_props, hw_compat_rhel_8_2, -+ hw_compat_rhel_8_2_len); -+ -+ /* from pseries-4.2 */ -+ smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF; -+ smc->rma_limit = 16 * GiB; -+ mc->nvdimm_supported = false; -+ -+ /* from pseries-5.0 */ -+ mc->numa_mem_supported = true; - } - --DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", true); -+DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", false); - - /* - * pseries-rhel8.1.0 --- -1.8.3.1 - diff --git a/kvm.modules b/kvm.modules new file mode 100644 index 0000000..b9d9646 --- /dev/null +++ b/kvm.modules @@ -0,0 +1,18 @@ +#!/bin/sh + +case $(uname -m) in + ppc64) + grep OPAL /proc/cpuinfo >/dev/null 2>&1 && opal=1 + + modprobe -b kvm >/dev/null 2>&1 + modprobe -b kvm-pr >/dev/null 2>&1 && kvm=1 + if [ "$opal" ]; then + modprobe -b kvm-hv >/dev/null 2>&1 + fi + ;; + s390x) + modprobe -b kvm >/dev/null 2>&1 && kvm=1 + ;; +esac + +exit 0 diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 1d955dd..0530b54 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -68,7 +68,7 @@ Obsoletes: %1-rhev Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -128,10 +128,6 @@ Patch0024: 0024-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch Patch0025: 0025-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch Patch0026: 0026-redhat-define-hw_compat_8_2.patch Patch0027: 0027-x86-Add-8.3.0-x86_64-machine-type.patch -Patch0028: 0028-hw-arm-Changes-to-rhel820-machine.patch -Patch0029: 0029-hw-arm-Introduce-rhel_virt_instance_init-helper.patch -Patch0030: 0030-hw-arm-Add-rhel830-machine-type.patch -Patch0031: 0031-redhat-define-pseries-rhel8.3.0-machine-type.patch BuildRequires: wget BuildRequires: rpm-build @@ -1083,13 +1079,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog -* Tue Jul 14 2020 Danilo Cesar Lemes de Paula - 5.0.0-1.el8 -- This is an interational rebase, based on the weekly rebase. -- Altough not official yet, It contains fixes for the following BZs: +* Wed Jul 15 2020 Danilo Cesar Lemes de Paula - 5.0.0-2.el8 - Resolves: bz#1781911 - Resolves: bz#1841529 - Resolves: bz#1842902 -- Resolves: bz#1818843 + (This is an unofficial build that fixes the BZs mentioned above) + * Tue Jul 07 2020 Danilo Cesar Lemes de Paula - 4.2.0-29.el8 - kvm-virtio-net-fix-removal-of-failover-device.patch [bz#1820120]