rpms/qemu-kvm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 5.2.0-2 release

Browse Source
This commit is contained in:
Miroslav Rezanina 2021-01-05 06:59:21 +01:00
parent 661065af9d
commit eea10ec917
27 changed files with 898 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/qemu-5.1.0.tar.xz
/qemu-5.2.0-rc1.tar.xz
/qemu-5.2.0-rc3.tar.xz
/qemu-5.2.0.tar.xz

249
0001-redhat-Adding-slirp-to-the-exploded-tree.patch
View File

@ -1,6 +1,6 @@
From 03c528f8dd064ee0ac40bd37f686cd5616071fdf Mon Sep 17 00:00:00 2001
From f04f3d3ab0bb9ffd06a16ee5157f08bcb4f5f459 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Wed, 29 Jul 2020 07:48:57 +0200
Date: Wed, 2 Dec 2020 07:38:31 +0100
Subject: redhat: Adding slirp to the exploded tree
RH-Author: Danilo de Paula <ddepaula@redhat.com>
@ -48,82 +48,83 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Rebase notes (5.1.0-rc2):
- Update slirp directory to commit ce94eba2042d52a0ba3d9e252ebce86715e94275 (used upstream)
Rebase notes (5.2.0-rc4):
- Update slirp directory to commit 8f43a99191afb47ca3f3c6972f6306209f367ece (used upstream)
---
.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 | 92 +++
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 | 92 ++
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 | 433 +++++++++++
slirp/src/ip6_icmp.h | 219 ++++++
slirp/src/ip6_input.c | 85 +++
slirp/src/ip.h | 242 +++++
slirp/src/ip6.h | 214 +++++
slirp/src/ip6_icmp.c | 433 +++++++++
slirp/src/ip6_icmp.h | 219 +++++
slirp/src/ip6_input.c | 85 ++
slirp/src/ip6_output.c | 39 +
slirp/src/ip_icmp.c | 492 +++++++++++++
slirp/src/ip_icmp.h | 166 +++++
slirp/src/ip_input.c | 461 ++++++++++++
slirp/src/ip_output.c | 169 +++++
slirp/src/ip_icmp.c | 492 ++++++++++
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 | 193 +++++
slirp/src/ndp_table.c | 87 +++
slirp/src/sbuf.c | 168 +++++
slirp/src/ncsi-pkt.h | 445 +++++++++
slirp/src/ncsi.c | 197 ++++
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 | 284 ++++++++
slirp/src/socket.c | 954 ++++++++++++++++++++++++
slirp/src/socket.h | 164 +++++
slirp/src/state.c | 379 ++++++++++
slirp/src/slirp.c | 1189 ++++++++++++++++++++++++
slirp/src/slirp.h | 284 ++++++
slirp/src/socket.c | 954 +++++++++++++++++++
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 | 464 ++++++++++++
slirp/src/tftp.c | 464 ++++++++++
slirp/src/tftp.h | 54 ++
slirp/src/udp.c | 365 ++++++++++
slirp/src/udp.h | 90 +++
slirp/src/udp6.c | 173 +++++
slirp/src/util.c | 428 +++++++++++
slirp/src/util.h | 189 +++++
slirp/src/udp.c | 365 ++++++++
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 ++++++++++
70 files changed, 16440 insertions(+), 3 deletions(-)
slirp/src/vmstate.c | 444 +++++++++
slirp/src/vmstate.h | 391 ++++++++
69 files changed, 16445 insertions(+), 3 deletions(-)
create mode 100644 slirp/.clang-format
create mode 100644 slirp/.gitignore
create mode 100644 slirp/.gitlab-ci.yml
create mode 100644 slirp/.gitpublish
create mode 100644 slirp/CHANGELOG.md
create mode 100644 slirp/COPYRIGHT
create mode 100644 slirp/Makefile
@ -192,7 +193,7 @@ Rebase notes (5.1.0-rc2):
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 +257,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 +351,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 +419,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 +487,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 +553,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 +717,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 +739,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 +879,7 @@ index 0000000..3a27149
+)
diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c
new file mode 100644
index 0000000..959e5b9
index 0000000000..959e5b9ec0
--- /dev/null
+++ b/slirp/src/arp_table.c
@@ -0,0 +1,92 @@
@ -976,7 +977,7 @@ index 0000000..959e5b9
+}
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 @@
@ -1351,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 @@
@ -1486,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 @@
@ -1671,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 @@
@ -1728,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 @@
@ -1958,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 @@
@ -2032,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..55497e8
index 0000000000..55497e860e
--- /dev/null
+++ b/slirp/src/dnssearch.c
@@ -0,0 +1,306 @@
@ -2344,7 +2345,7 @@ index 0000000..55497e8
+}
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 @@
@ -2563,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 @@
@ -2594,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 @@
@ -2842,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 @@
@ -3062,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..d9c872b
index 0000000000..d9c872bc97
--- /dev/null
+++ b/slirp/src/ip6_icmp.c
@@ -0,0 +1,433 @@
@ -3501,7 +3502,7 @@ index 0000000..d9c872b
+}
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 +3727,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..a83e4f8
index 0000000000..a83e4f8e3d
--- /dev/null
+++ b/slirp/src/ip6_input.c
@@ -0,0 +1,85 @@
@ -3817,7 +3818,7 @@ index 0000000..a83e4f8
+}
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 @@
@ -3862,7 +3863,7 @@ index 0000000..b861106
+}
diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c
new file mode 100644
index 0000000..13a0e55
index 0000000000..13a0e55085
--- /dev/null
+++ b/slirp/src/ip_icmp.c
@@ -0,0 +1,492 @@
@ -4360,7 +4361,7 @@ index 0000000..13a0e55
+}
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 @@
@ -4532,7 +4533,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..7f017a2
index 0000000000..7f017a238a
--- /dev/null
+++ b/slirp/src/ip_input.c
@@ -0,0 +1,461 @@
@ -4999,7 +5000,7 @@ index 0000000..7f017a2
+}
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 @@
@ -5174,7 +5175,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 @@
@ -5204,7 +5205,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 @@
@ -5381,7 +5382,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 @@
@ -5417,7 +5418,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 @@
@ -5439,7 +5440,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 @@
@ -5669,7 +5670,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 @@
@ -5802,7 +5803,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 @@
@ -6199,7 +6200,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 @@
@ -6277,7 +6278,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 @@
@ -6728,10 +6729,10 @@ 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..3c1dfef
index 0000000000..75dcc08356
--- /dev/null
+++ b/slirp/src/ncsi.c
@@ -0,0 +1,193 @@
@@ -0,0 +1,197 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/*
+ * NC-SI (Network Controller Sideband Interface) "echo" model
@ -6882,6 +6883,10 @@ index 0000000..3c1dfef
+ uint32_t checksum;
+ uint32_t *pchecksum;
+
+ if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) {
+ return; /* packet too short */
+ }
+
+ memset(ncsi_reply, 0, sizeof(ncsi_reply));
+
+ memset(reh->h_dest, 0xff, ETH_ALEN);
@ -6927,7 +6932,7 @@ index 0000000..3c1dfef
+}
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 @@
@ -7020,7 +7025,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 @@
@ -7194,7 +7199,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 @@
@ -7227,10 +7232,10 @@ index 0000000..01886fb
+#endif
diff --git a/slirp/src/slirp.c b/slirp/src/slirp.c
new file mode 100644
index 0000000..dba7c98
index 0000000000..9be58e2add
--- /dev/null
+++ b/slirp/src/slirp.c
@@ -0,0 +1,1185 @@
@@ -0,0 +1,1189 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * libslirp glue
@ -7989,6 +7994,10 @@ index 0000000..dba7c98
+ return;
+ }
+
+ if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) {
+ return; /* packet too short */
+ }
+
+ ar_op = ntohs(ah->ar_op);
+ switch (ar_op) {
+ case ARPOP_REQUEST:
@ -8418,7 +8427,7 @@ index 0000000..dba7c98
+}
diff --git a/slirp/src/slirp.h b/slirp/src/slirp.h
new file mode 100644
index 0000000..763a65b
index 0000000000..763a65b9ef
--- /dev/null
+++ b/slirp/src/slirp.h
@@ -0,0 +1,284 @@
@ -8708,7 +8717,7 @@ index 0000000..763a65b
+#endif
diff --git a/slirp/src/socket.c b/slirp/src/socket.c
new file mode 100644
index 0000000..1e385df
index 0000000000..1e385df0d8
--- /dev/null
+++ b/slirp/src/socket.c
@@ -0,0 +1,954 @@
@ -9668,7 +9677,7 @@ index 0000000..1e385df
+}
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 @@
@ -9838,7 +9847,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 @@
@ -10223,7 +10232,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 @@
@ -10349,7 +10358,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 @@
@ -10390,7 +10399,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 @@
@ -10565,7 +10574,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 @@
@ -12110,7 +12119,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 @@
@ -12632,7 +12641,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 @@
@ -13618,7 +13627,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 @@
@ -13910,7 +13919,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 @@
@ -14046,7 +14055,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 @@
@ -14213,7 +14222,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 @@
@ -14323,7 +14332,7 @@ index 0000000..d3df021
+#endif
diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c
new file mode 100644
index 0000000..c6950ee
index 0000000000..c6950ee10f
--- /dev/null
+++ b/slirp/src/tftp.c
@@ -0,0 +1,464 @@
@ -14793,7 +14802,7 @@ index 0000000..c6950ee
+}
diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h
new file mode 100644
index 0000000..6d75478
index 0000000000..6d75478e83
--- /dev/null
+++ b/slirp/src/tftp.h
@@ -0,0 +1,54 @@
@ -14853,7 +14862,7 @@ index 0000000..6d75478
+#endif
diff --git a/slirp/src/udp.c b/slirp/src/udp.c
new file mode 100644
index 0000000..0ad44d7
index 0000000000..0ad44d7c03
--- /dev/null
+++ b/slirp/src/udp.c
@@ -0,0 +1,365 @@
@ -15224,7 +15233,7 @@ index 0000000..0ad44d7
+}
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 @@
@ -15320,7 +15329,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 @@
@ -15499,7 +15508,7 @@ index 0000000..6f9486b
+}
diff --git a/slirp/src/util.c b/slirp/src/util.c
new file mode 100644
index 0000000..d3ed5fa
index 0000000000..d3ed5faf8b
--- /dev/null
+++ b/slirp/src/util.c
@@ -0,0 +1,428 @@
@ -15933,7 +15942,7 @@ index 0000000..d3ed5fa
+}
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 @@
@ -16128,7 +16137,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 @@
@ -16142,7 +16151,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 @@
@ -16592,7 +16601,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 @@
@ -16988,5 +16997,5 @@ index 0000000..94c6a4b
+
+#endif
--
1.8.3.1
2.18.4

28
0005-Initial-redhat-build.patch
View File

@ -1,4 +1,4 @@
From b3ec5c5cc8ed777c5c2cd1bd27f6684a99317953 Mon Sep 17 00:00:00 2001
From e4cd78dda8017f181fa94bbad1f0f015a99271db Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 12 Oct 2018 07:31:11 +0200
Subject: Initial redhat build
@ -11,7 +11,7 @@ several issues are fixed in QEMU tree:
- Man page renamed from qemu to qemu-kvm
- man page is installed using make install so we have to fix it in qemu tree
This rebase includes changes up to qemu-kvm-5.1.0-15.el8
This rebase includes changes up to qemu-kvm-5.1.0-16.el8
Rebase notes (3.1.0):
- added new configure options
@ -143,7 +143,7 @@ Merged patches (5.2.0 rc3):
redhat/Makefile | 90 +
redhat/Makefile.common | 53 +
redhat/README.tests | 39 +
redhat/qemu-kvm.spec.template | 3409 +++++++++++++++++++++++++++++++
redhat/qemu-kvm.spec.template | 3402 +++++++++++++++++++++++
redhat/scripts/extract_build_cmd.py | 5 +-
redhat/scripts/process-patches.sh | 17 +-
scripts/qemu-guest-agent/fsfreeze-hook | 2 +-
@ -151,7 +151,7 @@ Merged patches (5.2.0 rc3):
scripts/systemtap/script.d/qemu_kvm.stp | 1 +
tests/check-block.sh | 2 +
ui/vnc.c | 2 +-
15 files changed, 3660 insertions(+), 16 deletions(-)
15 files changed, 3653 insertions(+), 16 deletions(-)
create mode 100644 README.systemtap
create mode 100644 redhat/Makefile
create mode 100644 redhat/Makefile.common
@ -162,7 +162,7 @@ Merged patches (5.2.0 rc3):
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 @@
@ -210,7 +210,7 @@ index 0000000..ad913fc
+3. Translate the trace record to readable format.
+ # /usr/share/qemu-kvm/simpletrace.py --no-header /usr/share/qemu-kvm/trace-events /tmp/trace.log
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 9296e1b..f70c5a8 100644
index 9296e1bb6e..f70c5a8946 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -28,7 +28,7 @@
@ -232,10 +232,10 @@ index 9296e1b..f70c5a8 100644
uint32_t argsz;
int fd;
diff --git a/meson.build b/meson.build
index 5062407..c1db9b8 100644
index e3386196ba..8c38b2ea36 100644
--- a/meson.build
+++ b/meson.build
@@ -1149,7 +1149,9 @@ if capstone_opt == 'internal'
@@ -1148,7 +1148,9 @@ if capstone_opt == 'internal'
# Include all configuration defines via a header file, which will wind up
# as a dependency on the object file, and thus changes here will result
# in a rebuild.
@ -247,7 +247,7 @@ index 5062407..c1db9b8 100644
libcapstone = static_library('capstone',
diff --git a/scripts/qemu-guest-agent/fsfreeze-hook b/scripts/qemu-guest-agent/fsfreeze-hook
index 13aafd4..e9b84ec 100755
index 13aafd4845..e9b84ec028 100755
--- a/scripts/qemu-guest-agent/fsfreeze-hook
+++ b/scripts/qemu-guest-agent/fsfreeze-hook
@@ -8,7 +8,7 @@
@ -261,7 +261,7 @@ index 13aafd4..e9b84ec 100755
is_ignored_file() {
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 @@
@ -271,13 +271,13 @@ 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 {}
diff --git a/tests/check-block.sh b/tests/check-block.sh
index f6b1bda..645b550 100755
index f6b1bda7b9..645b550af8 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -58,6 +58,8 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
@ -290,7 +290,7 @@ index f6b1bda..645b550 100755
# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
diff --git a/ui/vnc.c b/ui/vnc.c
index 4923505..eb5520e 100644
index 49235056f7..eb5520ed73 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3982,7 +3982,7 @@ void vnc_display_open(const char *id, Error **errp)
@ -303,5 +303,5 @@ index 4923505..eb5520e 100644
if (saslErr != SASL_OK) {
error_setg(errp, "Failed to initialize SASL auth: %s",
--
1.8.3.1
2.18.4

108
0006-Enable-disable-devices-for-RHEL.patch
View File

@ -1,4 +1,4 @@
From 2ed436b54735a68c7f4422a8d6e5b4f3a7580fd3 Mon Sep 17 00:00:00 2001
From 0ad3e82af785512a5a77373d2ad95c63dfedeaba Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Wed, 2 Sep 2020 09:11:07 +0200
Subject: Enable/disable devices for RHEL
@ -86,33 +86,33 @@ Merged patches (5.2.0 rc0):
- 8310f89 RHEL-only: Enable vTPM for ARM in downstream configs
- 4a8ccfd Disable TPM passthrough backend on ARM
---
default-configs/devices/aarch64-rh-devices.mak | 27 +++++++
default-configs/devices/aarch64-softmmu.mak | 10 ++-
default-configs/devices/ppc64-rh-devices.mak | 38 ++++++++++
default-configs/devices/ppc64-softmmu.mak | 10 ++-
default-configs/devices/rh-virtio.mak | 10 +++
default-configs/devices/s390x-rh-devices.mak | 15 ++++
default-configs/devices/s390x-softmmu.mak | 4 +-
default-configs/devices/x86_64-rh-devices.mak | 101 +++++++++++++++++++++++++
default-configs/devices/x86_64-softmmu.mak | 4 +-
hw/acpi/ich9.c | 4 +-
hw/arm/meson.build | 2 +-
hw/block/fdc.c | 10 +++
hw/cpu/meson.build | 5 +-
hw/display/cirrus_vga.c | 3 +
hw/ide/piix.c | 5 +-
hw/input/pckbd.c | 2 +
hw/net/e1000.c | 2 +
hw/ppc/spapr_cpu_core.c | 2 +
hw/usb/meson.build | 2 +-
qemu-options.hx | 4 -
redhat/qemu-kvm.spec.template | 11 ++-
target/arm/cpu.c | 4 +-
target/arm/cpu_tcg.c | 3 +
target/ppc/cpu-models.c | 10 +++
target/s390x/cpu_models.c | 3 +
target/s390x/kvm.c | 8 ++
26 files changed, 274 insertions(+), 25 deletions(-)
.../devices/aarch64-rh-devices.mak | 27 +++++
default-configs/devices/aarch64-softmmu.mak | 10 +-
default-configs/devices/ppc64-rh-devices.mak | 38 +++++++
default-configs/devices/ppc64-softmmu.mak | 10 +-
default-configs/devices/rh-virtio.mak | 10 ++
default-configs/devices/s390x-rh-devices.mak | 15 +++
default-configs/devices/s390x-softmmu.mak | 4 +-
default-configs/devices/x86_64-rh-devices.mak | 101 ++++++++++++++++++
default-configs/devices/x86_64-softmmu.mak | 4 +-
hw/acpi/ich9.c | 4 +-
hw/arm/meson.build | 2 +-
hw/block/fdc.c | 10 ++
hw/cpu/meson.build | 5 +-
hw/display/cirrus_vga.c | 3 +
hw/ide/piix.c | 5 +-
hw/input/pckbd.c | 2 +
hw/net/e1000.c | 2 +
hw/ppc/spapr_cpu_core.c | 2 +
hw/usb/meson.build | 2 +-
qemu-options.hx | 4 -
redhat/qemu-kvm.spec.template | 10 +-
target/arm/cpu.c | 4 +-
target/arm/cpu_tcg.c | 3 +
target/ppc/cpu-models.c | 10 ++
target/s390x/cpu_models.c | 3 +
target/s390x/kvm.c | 8 ++
26 files changed, 273 insertions(+), 25 deletions(-)
create mode 100644 default-configs/devices/aarch64-rh-devices.mak
create mode 100644 default-configs/devices/ppc64-rh-devices.mak
create mode 100644 default-configs/devices/rh-virtio.mak
@ -121,7 +121,7 @@ Merged patches (5.2.0 rc0):
diff --git a/default-configs/devices/aarch64-rh-devices.mak b/default-configs/devices/aarch64-rh-devices.mak
new file mode 100644
index 0000000..9831940
index 0000000000..98319407de
--- /dev/null
+++ b/default-configs/devices/aarch64-rh-devices.mak
@@ -0,0 +1,27 @@
@ -153,7 +153,7 @@ index 0000000..9831940
+CONFIG_TPM_TIS_SYSBUS=y
+CONFIG_PTIMER=y
diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
index 958b1e0..8f6867d 100644
index 958b1e08e4..8f6867d48a 100644
--- a/default-configs/devices/aarch64-softmmu.mak
+++ b/default-configs/devices/aarch64-softmmu.mak
@@ -1,8 +1,10 @@
@ -173,7 +173,7 @@ index 958b1e0..8f6867d 100644
+include aarch64-rh-devices.mak
diff --git a/default-configs/devices/ppc64-rh-devices.mak b/default-configs/devices/ppc64-rh-devices.mak
new file mode 100644
index 0000000..467a16b
index 0000000000..467a16bdc2
--- /dev/null
+++ b/default-configs/devices/ppc64-rh-devices.mak
@@ -0,0 +1,38 @@
@ -216,7 +216,7 @@ index 0000000..467a16b
+CONFIG_TPM_EMULATOR=y
+CONFIG_TPM_PASSTHROUGH=y
diff --git a/default-configs/devices/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak
index ae0841f..040e557 100644
index ae0841fa3a..040e5575e7 100644
--- a/default-configs/devices/ppc64-softmmu.mak
+++ b/default-configs/devices/ppc64-softmmu.mak
@@ -1,11 +1,13 @@
@ -239,7 +239,7 @@ index ae0841f..040e557 100644
+include ppc64-rh-devices.mak
diff --git a/default-configs/devices/rh-virtio.mak b/default-configs/devices/rh-virtio.mak
new file mode 100644
index 0000000..94ede1b
index 0000000000..94ede1b5f6
--- /dev/null
+++ b/default-configs/devices/rh-virtio.mak
@@ -0,0 +1,10 @@
@ -255,7 +255,7 @@ index 0000000..94ede1b
+CONFIG_VIRTIO_SERIAL=y
diff --git a/default-configs/devices/s390x-rh-devices.mak b/default-configs/devices/s390x-rh-devices.mak
new file mode 100644
index 0000000..c3c73fe
index 0000000000..c3c73fe752
--- /dev/null
+++ b/default-configs/devices/s390x-rh-devices.mak
@@ -0,0 +1,15 @@
@ -275,7 +275,7 @@ index 0000000..c3c73fe
+CONFIG_VIRTIO_CCW=y
+CONFIG_WDT_DIAG288=y
diff --git a/default-configs/devices/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak
index f2287a1..3e2e388 100644
index f2287a133f..3e2e388e91 100644
--- a/default-configs/devices/s390x-softmmu.mak
+++ b/default-configs/devices/s390x-softmmu.mak
@@ -10,4 +10,6 @@
@ -288,7 +288,7 @@ index f2287a1..3e2e388 100644
+include s390x-rh-devices.mak
diff --git a/default-configs/devices/x86_64-rh-devices.mak b/default-configs/devices/x86_64-rh-devices.mak
new file mode 100644
index 0000000..e80877d
index 0000000000..e80877d4e2
--- /dev/null
+++ b/default-configs/devices/x86_64-rh-devices.mak
@@ -0,0 +1,101 @@
@ -394,7 +394,7 @@ index 0000000..e80877d
+CONFIG_TPM_EMULATOR=y
+CONFIG_TPM_PASSTHROUGH=y
diff --git a/default-configs/devices/x86_64-softmmu.mak b/default-configs/devices/x86_64-softmmu.mak
index 64b2ee2..b5de7e5 100644
index 64b2ee2960..b5de7e5279 100644
--- a/default-configs/devices/x86_64-softmmu.mak
+++ b/default-configs/devices/x86_64-softmmu.mak
@@ -1,3 +1,5 @@
@ -405,7 +405,7 @@ index 64b2ee2..b5de7e5 100644
+
+include x86_64-rh-devices.mak
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 5ff4e01..ac45ca4 100644
index 5ff4e01c36..ac45ca4acb 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -374,8 +374,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
@ -420,7 +420,7 @@ index 5ff4e01..ac45ca4 100644
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index be39117..6fcc5ed 100644
index be39117b9b..6fcc5ede50 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -30,7 +30,7 @@ arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))
@ -433,7 +433,7 @@ index be39117..6fcc5ed 100644
arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c', 'pxa2xx_pic.c'))
arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 4c2c35e..e9eb7b8 100644
index 4c2c35e223..e9eb7b8279 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -48,6 +48,8 @@
@ -461,7 +461,7 @@ index 4c2c35e..e9eb7b8 100644
error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");
return;
diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
index 9e52fee..bb71c9f 100644
index 9e52fee9e7..bb71c9f3e7 100644
--- a/hw/cpu/meson.build
+++ b/hw/cpu/meson.build
@@ -1,6 +1,7 @@
@ -475,7 +475,7 @@ index 9e52fee..bb71c9f 100644
-specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
+#specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index fdca6ca..fa1a7ee 100644
index fdca6ca659..fa1a7eee51 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -2945,6 +2945,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
@ -489,7 +489,7 @@ index fdca6ca..fa1a7ee 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 b9860e3..beb1ea6 100644
index b9860e35a5..beb1ea6c46 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -220,7 +220,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
@ -512,7 +512,7 @@ index b9860e3..beb1ea6 100644
static const TypeInfo piix4_ide_info = {
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index dde85ba..62cf60c 100644
index dde85ba6c6..62cf60c9c9 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -597,6 +597,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
@ -525,7 +525,7 @@ index dde85ba..62cf60c 100644
static const TypeInfo i8042_info = {
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index d7d05ae..aaea06d 100644
index d7d05ae30a..aaea06d29c 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1796,6 +1796,7 @@ static const E1000Info e1000_devices[] = {
@ -545,7 +545,7 @@ index d7d05ae..aaea06d 100644
static void e1000_register_types(void)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 2f7dc3c..55d36e0 100644
index 2f7dc3c23d..55d36e0069 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -376,10 +376,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
@ -562,7 +562,7 @@ index 2f7dc3c..55d36e0 100644
DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),
DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index 934e4fa..e3abba5 100644
index 934e4fa675..e3abba548a 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -48,7 +48,7 @@ softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reade
@ -575,7 +575,7 @@ index 934e4fa..e3abba5 100644
endif
diff --git a/qemu-options.hx b/qemu-options.hx
index 104632e..363a15b 100644
index 104632ea34..363a15b4e8 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2251,10 +2251,6 @@ ERST
@ -590,7 +590,7 @@ index 104632e..363a15b 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/target/arm/cpu.c b/target/arm/cpu.c
index 07492e9..a048714 100644
index 07492e9f9a..a0487148e8 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2358,7 +2358,9 @@ static void arm_cpu_register_types(void)
@ -605,7 +605,7 @@ index 07492e9..a048714 100644
}
}
diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
index 0013e25..6540046 100644
index 0013e25412..6540046128 100644
--- a/target/arm/cpu_tcg.c
+++ b/target/arm/cpu_tcg.c
@@ -679,6 +679,9 @@ static void arm_tcg_cpu_register_types(void)
@ -619,7 +619,7 @@ index 0013e25..6540046 100644
arm_cpu_register(&arm_tcg_cpus[i]);
}
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 87e4228..6eaa65e 100644
index 87e4228614..6eaa65efff 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -66,6 +66,7 @@
@ -689,7 +689,7 @@ index 87e4228..6eaa65e 100644
{ NULL, NULL }
};
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index b5abff8..abe09d7 100644
index b5abff8bef..abe09d73c2 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -408,6 +408,9 @@ static void check_unavailable_features(const S390CPUModel *max_model,
@ -703,7 +703,7 @@ index b5abff8..abe09d7 100644
/* detect missing features if any to properly report them */
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index b8385e6..1839cc6 100644
index b8385e6b95..1839cc6648 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2552,6 +2552,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
@ -722,5 +722,5 @@ index b8385e6..1839cc6 100644
prop.ibc = s390_ibc_from_cpu_model(model);
/* configure cpu features indicated via STFL(e) */
--
1.8.3.1
2.18.4

62
0007-Machine-type-related-general-changes.patch
View File

@ -1,4 +1,4 @@
From c08267680d5cdede8c1b80591f294f8c0e8a2ddc Mon Sep 17 00:00:00 2001
From b97fdd8e425f1c9a156ebdfbdce986d9351c0d19 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 11 Jan 2019 09:54:45 +0100
Subject: Machine type related general changes
@ -46,21 +46,21 @@ Merged patches (5.2.0 rc0):
hw/acpi/ich9.c | 15 +++
hw/acpi/piix4.c | 5 +-
hw/arm/virt.c | 2 +-
hw/char/serial.c | 16 ++++
hw/core/machine.c | 213 +++++++++++++++++++++++++++++++++++++++++++
hw/char/serial.c | 16 +++
hw/core/machine.c | 213 +++++++++++++++++++++++++++++++++++
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/rtc/mc146818rtc.c | 6 +
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 | 27 ++++++
include/hw/boards.h | 27 +++++
include/hw/firmware/smbios.h | 5 +-
include/hw/i386/pc.h | 3 +
include/hw/usb.h | 4 +
@ -69,7 +69,7 @@ Merged patches (5.2.0 rc0):
23 files changed, 400 insertions(+), 11 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index ac45ca4..0b35b35 100644
index ac45ca4acb..0b35b35b28 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)
@ -102,7 +102,7 @@ index ac45ca4..0b35b35 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 669be5b..2063131 100644
index 669be5bbf6..2063131bcc 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -277,6 +277,7 @@ static const VMStateDescription vmstate_acpi = {
@ -125,7 +125,7 @@ index 669be5b..2063131 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 27dbeb5..c908b5f 100644
index 27dbeb549e..c908b5fcf4 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1441,7 +1441,7 @@ static void virt_build_smbios(VirtMachineState *vms)
@ -138,7 +138,7 @@ index 27dbeb5..c908b5f 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 97f7187..aeb207e 100644
index 97f71879ff..aeb207ef73 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -35,6 +35,7 @@
@ -193,7 +193,7 @@ index 97f7187..aeb207e 100644
}
diff --git a/hw/core/machine.c b/hw/core/machine.c
index d040804..19d50dd 100644
index d0408049b5..19d50dde45 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -28,6 +28,219 @@
@ -417,7 +417,7 @@ index d040804..19d50dd 100644
{ "vhost-scsi", "num_queues", "1"},
{ "vhost-user-blk", "num-queues", "1"},
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 90851e7..a91c5d7 100644
index 90851e730b..a91c5d7467 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -85,7 +85,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
@ -430,7 +430,7 @@ index 90851e7..a91c5d7 100644
};
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 13d1628..9fcc5aa 100644
index 13d1628f13..9fcc5aaf69 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -179,6 +179,8 @@ static void pc_init1(MachineState *machine,
@ -443,7 +443,7 @@ index 13d1628..9fcc5aa 100644
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index a3f4959..f6c2ef4 100644
index a3f4959c43..f6c2ef4e43 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -198,6 +198,8 @@ static void pc_q35_init(MachineState *machine)
@ -456,7 +456,7 @@ index a3f4959..f6c2ef4 100644
}
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index a8a77ec..6d39c1f 100644
index a8a77eca95..6d39c1f1c4 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -80,6 +80,11 @@ struct E1000EState {
@ -530,7 +530,7 @@ index a8a77ec..6d39c1f 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 ba5ace1..a2e6e83 100644
index ba5ace1ab7..a2e6e83522 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -3179,7 +3179,7 @@ static int rtl8139_pre_save(void *opaque)
@ -553,7 +553,7 @@ index ba5ace1..a2e6e83 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 @@
@ -577,7 +577,7 @@ index 7a38540..377d861 100644
}
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 6a3d397..232fd61 100644
index 6a3d39793b..232fd61bf8 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -56,6 +56,9 @@ static bool smbios_legacy = true;
@ -659,7 +659,7 @@ index 6a3d397..232fd61 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 = {
@ -672,7 +672,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 27ca237..eb24e39 100644
index 27ca237d71..eb24e39b81 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -1221,12 +1221,14 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
@ -692,7 +692,7 @@ index 27ca237..eb24e39 100644
if (s->masterbus) {
USBPort *ports[NB_PORTS];
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 9ce7ca7..0af661c 100644
index 9ce7ca706e..0af661ce1d 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3491,9 +3491,27 @@ static const VMStateDescription vmstate_xhci_slot = {
@ -733,7 +733,7 @@ index 9ce7ca7..0af661c 100644
}
};
diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h
index 02ebd76..dfda04b 100644
index 02ebd76450..dfda04b125 100644
--- a/hw/usb/hcd-xhci.h
+++ b/hw/usb/hcd-xhci.h
@@ -149,6 +149,8 @@ typedef struct XHCIEvent {
@ -746,7 +746,7 @@ index 02ebd76..dfda04b 100644
typedef struct XHCIInterrupter {
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 54571c7..b3369da 100644
index 54571c77e0..b3369dab9e 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs {
@ -760,7 +760,7 @@ index 54571c7..b3369da 100644
#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
diff --git a/include/hw/boards.h b/include/hw/boards.h
index a49e3a6..dd18c9e 100644
index a49e3a6b44..dd18c9e94d 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -367,4 +367,31 @@ extern const size_t hw_compat_2_2_len;
@ -796,7 +796,7 @@ index a49e3a6..dd18c9e 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);
@ -812,7 +812,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 911e460..ae6bf1d 100644
index 911e460097..ae6bf1d209 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -104,6 +104,9 @@ struct PCMachineClass {
@ -826,7 +826,7 @@ index 911e460..ae6bf1d 100644
/* RAM / address space compat: */
bool gigabyte_align;
diff --git a/include/hw/usb.h b/include/hw/usb.h
index a70a72e..78b9043 100644
index a70a72e917..78b90436c9 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -570,4 +570,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id,
@ -839,7 +839,7 @@ index a70a72e..78b9043 100644
+
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 87a9b59..1bb8d01 100644
index 87a9b59f83..1bb8d012e6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -134,6 +134,8 @@ enum mig_rp_message_type {
@ -852,7 +852,7 @@ index 87a9b59..1bb8d01 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 d096b77..6134a53 100644
index d096b77f74..6134a534b3 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -364,6 +364,11 @@ bool check_dirty_bitmap_mig_alias_map(const BitmapMigrationNodeAliasList *bbm,
@ -868,5 +868,5 @@ index d096b77..6134a53 100644
#define qemu_ram_foreach_block \
#warning "Use foreach_not_ignored_block in migration code"
--
1.8.3.1
2.18.4

12
0008-Add-aarch64-machine-types.patch
View File

@ -1,4 +1,4 @@
From 57f949e002928186b80562fe517e1d83464c24fd Mon Sep 17 00:00:00 2001
From fcf44f2334a6d82709b9c64d45fa2ab1aec595b9 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 12:53:31 +0200
Subject: Add aarch64 machine types
@ -50,12 +50,12 @@ Merged patches (5.2.0 rc0):
- 6d7ba66 machine types/numa: set numa_mem_supported on old machine types (partialy)
- 25c5644 machine_types/numa: compatibility for auto_enable_numa_with_memdev (partialy)
---
hw/arm/virt.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++-
include/hw/arm/virt.h | 8 +++
hw/arm/virt.c | 191 +++++++++++++++++++++++++++++++++++++++++-
include/hw/arm/virt.h | 8 ++
2 files changed, 196 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index c908b5f..21e0485 100644
index c908b5fcf4..21e0485ac5 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -79,6 +79,7 @@
@ -316,7 +316,7 @@ index c908b5f..21e0485 100644
+}
+DEFINE_RHEL_MACHINE(8, 2, 0)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index aad6d69..745b76b 100644
index aad6d69841..745b76b186 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -167,9 +167,17 @@ struct VirtMachineState {
@ -338,5 +338,5 @@ index aad6d69..745b76b 100644
bool virt_is_acpi_enabled(VirtMachineState *vms);
--
1.8.3.1
2.18.4

20
0009-Add-ppc64-machine-types.patch
View File

@ -1,4 +1,4 @@
From 965f17e40984c06f87be2dad8100f4742412cc05 Mon Sep 17 00:00:00 2001
From 06a8855e3b36996d4478219c008986877a253674 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:27:13 +0200
Subject: Add ppc64 machine types
@ -40,7 +40,7 @@ Merged patches (5.2.0 rc0):
- 1ab8783 redhat: update pseries-rhel8.2.0 machine type
- b162af531a target/ppc: Add experimental option for enabling secure guests
---
hw/ppc/spapr.c | 337 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/ppc/spapr.c | 337 ++++++++++++++++++++++++++++++++++++++++
hw/ppc/spapr_cpu_core.c | 13 ++
include/hw/ppc/spapr.h | 4 +
target/ppc/compat.c | 13 +-
@ -50,7 +50,7 @@ Merged patches (5.2.0 rc0):
7 files changed, 407 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 12a012d..4a838cc 100644
index 12a012d9dd..4a838cc955 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1585,6 +1585,9 @@ static void spapr_machine_reset(MachineState *machine)
@ -461,7 +461,7 @@ index 12a012d..4a838cc 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 55d36e0..008074b 100644
index 55d36e0069..008074bae0 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -24,6 +24,7 @@
@ -499,7 +499,7 @@ index 55d36e0..008074b 100644
qdev_unrealize(DEVICE(cpu));
return false;
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 2e89e36..ba2d814 100644
index 2e89e36cfb..ba2d81404b 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -140,6 +140,7 @@ struct SpaprMachineClass {
@ -521,7 +521,7 @@ index 2e89e36..ba2d814 100644
char *kvm_type;
char *host_model;
diff --git a/target/ppc/compat.c b/target/ppc/compat.c
index 7949a24..f207a9b 100644
index 7949a24f5a..f207a9ba01 100644
--- a/target/ppc/compat.c
+++ b/target/ppc/compat.c
@@ -114,8 +114,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr)
@ -546,7 +546,7 @@ index 7949a24..f207a9b 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 2609e40..21c63b5 100644
index 2609e4082e..21c63b5360 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1347,6 +1347,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
@ -558,7 +558,7 @@ index 2609e40..21c63b5 100644
uint32_t min_compat_pvr, uint32_t max_compat_pvr);
bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index daf690a..9bf3449 100644
index daf690a678..9bf3449adb 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;
@ -614,7 +614,7 @@ index daf690a..9bf3449 100644
+ }
+}
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index 73ce2bc..1239b84 100644
index 73ce2bc951..1239b841fd 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -40,6 +40,7 @@ target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,
@ -652,5 +652,5 @@ index 73ce2bc..1239b84 100644
{
return -1;
--
1.8.3.1
2.18.4

8
0010-Add-s390x-machine-types.patch
View File

@ -1,4 +1,4 @@
From 79dafd0d91aecadc163685311c220dc2d7a49add Mon Sep 17 00:00:00 2001
From 36540969ad3b08f1964c71406f1fc14c0e5b47de Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:47:32 +0200
Subject: Add s390x machine types
@ -21,11 +21,11 @@ Merged patches (4.2.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)
---
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 4e140bb..b8dde7e 100644
index 4e140bbead..b8dde7e4e1 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -765,7 +765,7 @@ bool css_migration_enabled(void)
@ -121,5 +121,5 @@ index 4e140bb..b8dde7e 100644
static void ccw_machine_register_types(void)
{
--
1.8.3.1
2.18.4

28
0011-Add-x86_64-machine-types.patch
View File

@ -1,4 +1,4 @@
From 3fb64e4127e2b74f0d93a51dd3709fe30adc1d23 Mon Sep 17 00:00:00 2001
From 004d31cf0e8bb83374a85ecab59eb22683a1e361 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 19 Oct 2018 13:10:31 +0200
Subject: Add x86_64 machine types
@ -49,17 +49,17 @@ Merged patches (5.2.0 rc0):
- e2d3209 x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features (partialy)
---
hw/i386/acpi-build.c | 3 +
hw/i386/pc.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_piix.c | 215 +++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_q35.c | 185 +++++++++++++++++++++++++++++++++-
hw/i386/pc.c | 273 ++++++++++++++++++++++++++++++++++++++++++-
hw/i386/pc_piix.c | 215 +++++++++++++++++++++++++++++++++-
hw/i386/pc_q35.c | 185 ++++++++++++++++++++++++++++-
include/hw/boards.h | 2 +
include/hw/i386/pc.h | 36 +++++++
include/hw/i386/pc.h | 36 ++++++
target/i386/cpu.c | 3 +-
target/i386/kvm.c | 4 +
8 files changed, 714 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1f5c211..b1082bd 100644
index 1f5c211245..b1082bd412 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -217,6 +217,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
@ -73,7 +73,7 @@ index 1f5c211..b1082bd 100644
pm->smi_on_cpuhp =
!!(smi_features & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT));
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 17b514d..f3fc695 100644
index 17b514d1da..f3fc695fe2 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -352,6 +352,271 @@ GlobalProperty pc_compat_1_4[] = {
@ -378,7 +378,7 @@ index 17b514d..f3fc695 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 9fcc5aa..815da79 100644
index 9fcc5aaf69..815da79108 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -54,6 +54,7 @@
@ -622,7 +622,7 @@ index 9fcc5aa..815da79 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 f6c2ef4..3340008 100644
index f6c2ef4e43..3340008c00 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -195,8 +195,8 @@ static void pc_q35_init(MachineState *machine)
@ -829,7 +829,7 @@ index f6c2ef4..3340008 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 dd18c9e..4e4a54b 100644
index dd18c9e94d..4e4a54b313 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -202,6 +202,8 @@ struct MachineClass {
@ -842,7 +842,7 @@ index dd18c9e..4e4a54b 100644
bool smbus_no_migration_support;
bool nvdimm_supported;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ae6bf1d..e2ba9a4 100644
index ae6bf1d209..e2ba9a4b58 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -125,6 +125,9 @@ struct PCMachineClass {
@ -896,7 +896,7 @@ index ae6bf1d..e2ba9a4 100644
* depending on QEMU versions up to QEMU 2.4.
*/
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 5a8c960..dc592e9 100644
index 5a8c96072e..dc592e990e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1803,7 +1803,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
@ -917,7 +917,7 @@ index 5a8c960..dc592e9 100644
};
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index a2934dd..19bc39b 100644
index a2934dda02..19bc39b9e3 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -3126,6 +3126,7 @@ static int kvm_get_msrs(X86CPU *cpu)
@ -939,5 +939,5 @@ index a2934dd..19bc39b 100644
case MSR_KVM_ASYNC_PF_INT:
env->async_pf_int_msr = msrs[i].data;
--
1.8.3.1
2.18.4

46
0012-Enable-make-check.patch
View File

@ -1,4 +1,4 @@
From 2621db7ae95fdf112a7e1798ae428a865ae55b59 Mon Sep 17 00:00:00 2001
From 28d744b42d381b15254706f90fed3310ce4a5116 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Wed, 2 Sep 2020 09:39:41 +0200
Subject: Enable make check
@ -31,16 +31,19 @@ Rebase changes (5.2.0 rc0):
- Disable cdrom tests (unsupported devices) on x86_64
- disable fuzz test
Rebaes changes (RHEL 9):
- disable block-iothreads test
Merged patches (4.0.0):
- f7ffd13 Remove 7 qcow2 and luks iotests that are taking > 25 sec to run during the fast train build proce
Merged patches (4.1.0-rc0):
- 41288ff redhat: Remove raw iotest 205
Conflicts:
redhat/qemu-kvm.spec.template
Dissable problematic tests
---
redhat/qemu-kvm.spec.template | 4 ++--
tests/meson.build | 2 +-
tests/qemu-iotests/051 | 12 ++++++------
tests/qtest/boot-serial-test.c | 6 +++++-
tests/qtest/cdrom-test.c | 2 ++
@ -51,10 +54,23 @@ Conflicts:
tests/qtest/prom-env-test.c | 4 ++++
tests/qtest/test-x86-cpuid-compat.c | 2 ++
tests/qtest/usb-hcd-xhci-test.c | 4 ++++
11 files changed, 35 insertions(+), 19 deletions(-)
12 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index afeb6be689..e562a0499e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -136,7 +136,7 @@ if have_block
'test-blockjob': [testblock],
'test-blockjob-txn': [testblock],
'test-block-backend': [testblock],
- 'test-block-iothread': [testblock],
+# 'test-block-iothread': [testblock],
'test-write-threshold': [testblock],
'test-crypto-hash': [crypto],
'test-crypto-hmac': [crypto],
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index bee2607..61d25c4 100755
index bee26075b2..61d25c4ed7 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -183,11 +183,11 @@ run_qemu -drive if=virtio
@ -88,7 +104,7 @@ index bee2607..61d25c4 100755
*)
;;
diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index b6b1c23..cefa1b3 100644
index b6b1c23cd0..cefa1b38b7 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -120,19 +120,23 @@ static testdef_t tests[] = {
@ -117,7 +133,7 @@ index b6b1c23..cefa1b3 100644
{ "sparc", "LX", "", "TMS390S10" },
{ "sparc", "SS-4", "", "MB86904" },
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index 5af944a..cd5b8e0 100644
index 5af944a5fb..cd5b8e0f16 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -140,6 +140,7 @@ static void add_x86_tests(void)
@ -137,7 +153,7 @@ index 5af944a..cd5b8e0 100644
static void add_s390x_tests(void)
diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
index a1c6894..a8f0767 100644
index a1c689414b..a8f076711c 100644
--- a/tests/qtest/cpu-plug-test.c
+++ b/tests/qtest/cpu-plug-test.c
@@ -110,8 +110,8 @@ static void add_pseries_test_case(const char *mname)
@ -152,7 +168,7 @@ index a1c6894..a8f0767 100644
}
data = g_new(PlugTestData, 1);
diff --git a/tests/qtest/e1000-test.c b/tests/qtest/e1000-test.c
index ea286d1..a1847ac 100644
index ea286d1793..a1847ac8ed 100644
--- a/tests/qtest/e1000-test.c
+++ b/tests/qtest/e1000-test.c
@@ -22,9 +22,11 @@ struct QE1000 {
@ -168,7 +184,7 @@ index ea286d1..a1847ac 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 f7b7cfb..99cccf8 100644
index f7b7cfbc2d..99cccf8638 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)
@ -200,7 +216,7 @@ index f7b7cfb..99cccf8 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/meson.build b/tests/qtest/meson.build
index c19f1c8..15ed460 100644
index c19f1c8503..15ed460ff0 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -51,16 +51,13 @@ qtests_i386 = \
@ -249,7 +265,7 @@ index c19f1c8..15ed460 100644
'cpu-plug-test',
'migration-test']
diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
index f41d801..f8dc478 100644
index f41d80154a..f8dc478ce8 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[])
@ -268,7 +284,7 @@ index f41d801..f8dc478 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)
@ -288,7 +304,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)
@ -318,5 +334,5 @@ index 10ef9d2..3855873 100644
qtest_start("-device nec-usb-xhci,id=xhci"
--
1.8.3.1
2.18.4

8
0013-vfio-cap-number-of-devices-that-can-be-assigned.patch
View File

@ -1,4 +1,4 @@
From bb05135a744ae87847bcaf2344f826664dc9e19c Mon Sep 17 00:00:00 2001
From 514eb840d98c8047e88fb503a4bba71455a2e8b0 Mon Sep 17 00:00:00 2001
From: Bandan Das <bsd@redhat.com>
Date: Tue, 3 Dec 2013 20:05:13 +0100
Subject: vfio: cap number of devices that can be assigned
@ -38,7 +38,7 @@ Merged patches (2.9.0):
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 51dc373..06ce2a3 100644
index 51dc373695..06ce2a39aa 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -45,6 +45,9 @@
@ -94,7 +94,7 @@ index 51dc373..06ce2a3 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 1574ef9..fef907c 100644
index 1574ef983f..fef907c112 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -139,6 +139,7 @@ struct VFIOPCIDevice {
@ -106,5 +106,5 @@ index 1574ef9..fef907c 100644
uint32_t device_id;
uint32_t sub_vendor_id;
--
1.8.3.1
2.18.4

6
0014-Add-support-statement-to-help-output.patch
View File

@ -1,4 +1,4 @@
From a2490cc686e14979a82f176a76ca0f5ec22082ad Mon Sep 17 00:00:00 2001
From f63ec823f8df7024f33c145b88a2b50c589cc633 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 4 Dec 2013 18:53:17 +0100
Subject: Add support statement to -help output
@ -21,7 +21,7 @@ Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
1 file changed, 9 insertions(+)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index e6e0ad5..065d52e 100644
index e6e0ad5a92..065d52e8dc 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1688,9 +1688,17 @@ static void version(void)
@ -51,5 +51,5 @@ index e6e0ad5..065d52e 100644
}
--
1.8.3.1
2.18.4

6
0015-globally-limit-the-maximum-number-of-CPUs.patch
View File

@ -1,4 +1,4 @@
From b0baccfdfb10c34d9f9d35363e098dab7f376fe9 Mon Sep 17 00:00:00 2001
From 6eddce7d3e8cd95c4b848fe3f7c5ac27854dc0da Mon Sep 17 00:00:00 2001
From: Andrew Jones <drjones@redhat.com>
Date: Tue, 21 Jan 2014 10:46:52 +0100
Subject: globally limit the maximum number of CPUs
@ -38,7 +38,7 @@ Merged patches (5.2.0 rc0):
1 file changed, 12 insertions(+)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index baaa542..a1fbda0 100644
index baaa54249d..a1fbda0945 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2108,6 +2108,18 @@ static int kvm_init(MachineState *ms)
@ -61,5 +61,5 @@ index baaa542..a1fbda0 100644
if (nc->num > soft_vcpus_limit) {
warn_report("Number of %s cpus requested (%d) exceeds "
--
1.8.3.1
2.18.4

14
0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
View File

@ -1,4 +1,4 @@
From f72477389598ad4fee78640ec3a96166f00baf97 Mon Sep 17 00:00:00 2001
From c615fb7d219b7b88f6517d6772d92e233007aff3 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Wed, 8 Jul 2020 08:35:50 +0200
Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
@ -31,7 +31,7 @@ Rebase notes (5.2.0 rc0):
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 @@
@ -45,7 +45,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 e13f5a2..6650b2c 100644
index e13f5a21f8..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
@ -67,7 +67,7 @@ index e13f5a2..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:
@ -125,7 +125,7 @@ index fb70445..0d9a783 100644
See also
--------
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
index 866b7db..5b3be8a 100644
index 866b7db3ee..5b3be8a6d6 100644
--- a/docs/tools/virtiofsd.rst
+++ b/docs/tools/virtiofsd.rst
@@ -297,7 +297,7 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket
@ -138,7 +138,7 @@ index 866b7db..5b3be8a 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 363a15b..5e5e265 100644
index 363a15b4e8..5e5e265331 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2935,11 +2935,11 @@ SRST
@ -159,5 +159,5 @@ index 363a15b..5e5e265 100644
``-netdev vhost-vdpa,vhostdev=/path/to/dev``
Establish a vhost-vdpa netdev.
--
1.8.3.1
2.18.4

6
0017-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
View File

@ -1,4 +1,4 @@
From 21a45442631721270ff6aba4635e2b72ac2cb248 Mon Sep 17 00:00:00 2001
From 5095570936ccd71ac82bf441c36e85bd16b8e459 Mon Sep 17 00:00:00 2001
From: Fam Zheng <famz@redhat.com>
Date: Wed, 14 Jun 2017 15:37:01 +0200
Subject: virtio-scsi: Reject scsi-cd if data plane enabled [RHEL only]
@ -42,7 +42,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 9 insertions(+)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 3db9a8a..82c0251 100644
index 3db9a8aae9..82c025146d 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -823,6 +823,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,
@ -62,5 +62,5 @@ index 3db9a8a..82c0251 100644
if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) {
return;
--
1.8.3.1
2.18.4

6
0018-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
View File

@ -1,4 +1,4 @@
From f0561c2a8caa9080f2849b5679816e2268ee420d Mon Sep 17 00:00:00 2001
From 0619f89b5e0eb713e4d426c869e7a6a826a13728 Mon Sep 17 00:00:00 2001
From: David Gibson <dgibson@redhat.com>
Date: Wed, 6 Feb 2019 03:58:56 +0000
Subject: BZ1653590: Require at least 64kiB pages for downstream guests & hosts
@ -32,7 +32,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 7 insertions(+)
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 9341e97..f11428e 100644
index 9341e9782a..f11428eae9 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -333,12 +333,19 @@ bool spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,
@ -56,5 +56,5 @@ index 9341e97..f11428e 100644
spapr_check_pagesize(spapr, qemu_minrampagesize(), errp);
}
--
1.8.3.1
2.18.4

6
0019-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch
View File

@ -1,4 +1,4 @@
From 37e71d91a69d0437d6f181b757a702910c25c21f Mon Sep 17 00:00:00 2001
From e7321dc3f2159d2f4b7f93bd0f7ebb89752e8604 Mon Sep 17 00:00:00 2001
From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 13 Mar 2020 12:34:32 +0000
Subject: block: Versioned x-blockdev-reopen API with feature flag
@ -29,7 +29,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 04ad80b..2a7dca2 100644
index 04ad80bc1e..2a7dca299f 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4143,10 +4143,17 @@
@ -52,5 +52,5 @@ index 04ad80b..2a7dca2 100644
##
# @blockdev-del:
--
1.8.3.1
2.18.4

62
0020-Build-RHEL-9.patch
View File

@ -1,62 +0,0 @@
From 1a0497bf6405db1e9ee07db40d90309566bb9f25 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Thu, 26 Nov 2020 08:26:34 +0100
Subject: Build RHEL 9
---
migration/qemu-file.c | 2 +-
qobject/block-qdict.c | 2 +-
redhat/Makefile.common | 3 ++-
redhat/qemu-kvm.spec.template | 12 ------------
tests/meson.build | 4 ++--
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index be21518..d6e03db 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -595,7 +595,7 @@ size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
{
if (size < IO_BUF_SIZE) {
size_t res;
- uint8_t *src;
+ uint8_t *src = NULL;
res = qemu_peek_buffer(f, &src, size, 0);
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index 1487cc5..b265244 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -224,7 +224,7 @@ void qdict_array_split(QDict *src, QList **dst)
for (i = 0; i < UINT_MAX; i++) {
QObject *subqobj;
bool is_subqdict;
- QDict *subqdict;
+ QDict *subqdict = NULL;
char indexstr[32], prefix[32];
size_t snprintf_ret;
diff --git a/tests/meson.build b/tests/meson.build
index afeb6be..52aeaf4 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -136,7 +136,7 @@ if have_block
'test-blockjob': [testblock],
'test-blockjob-txn': [testblock],
'test-block-backend': [testblock],
- 'test-block-iothread': [testblock],
+# 'test-block-iothread': [testblock],
'test-write-threshold': [testblock],
'test-crypto-hash': [crypto],
'test-crypto-hmac': [crypto],
@@ -286,5 +286,5 @@ if not get_option('tcg').disabled()
endif
subdir('qapi-schema')
-subdir('qtest')
+#subdir('qtest')
subdir('migration')
--
1.8.3.1

70
0021-redhat-Define-hw_compat_8_3.patch Normal file
View File

@ -0,0 +1,70 @@
From bd9e5c1703ef16727db863ba79f46ae9cb81cbfd Mon Sep 17 00:00:00 2001
From: Greg Kurz <gkurz@redhat.com>
Date: Fri, 20 Nov 2020 14:00:31 -0500
Subject: redhat: Define hw_compat_8_3
RH-Author: Greg Kurz <gkurz@redhat.com>
Message-id: <20201120140033.578472-2-gkurz@redhat.com>
Patchwork-id: 99790
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 1/3] redhat: Define hw_compat_8_3
Bugzilla: 1893935
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
RH-Acked-by: David Gibson <dgibson@redhat.com>
Signed-off-by: Greg Kurz <gkurz@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/core/machine.c | 21 +++++++++++++++++++++
include/hw/boards.h | 3 +++
2 files changed, 24 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 19d50dde45..aba05ad676 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -28,6 +28,27 @@
#include "hw/mem/nvdimm.h"
#include "migration/vmstate.h"
+/*
+ * The same as hw_compat_5_1
+ */
+GlobalProperty hw_compat_rhel_8_3[] = {
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "vhost-scsi", "num_queues", "1"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "vhost-user-blk", "num-queues", "1"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "vhost-user-scsi", "num_queues", "1"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "virtio-blk-device", "num-queues", "1"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "virtio-scsi-device", "num_queues", "1"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "nvme", "use-intel-id", "on"},
+ /* hw_compat_rhel_8_3 from hw_compat_5_1 */
+ { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */
+};
+const size_t hw_compat_rhel_8_3_len = G_N_ELEMENTS(hw_compat_rhel_8_3);
+
/*
* The same as hw_compat_4_2 + hw_compat_5_0
*/
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 4e4a54b313..526e5aea04 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -369,6 +369,9 @@ extern const size_t hw_compat_2_2_len;
extern GlobalProperty hw_compat_2_1[];
extern const size_t hw_compat_2_1_len;
+extern GlobalProperty hw_compat_rhel_8_3[];
+extern const size_t hw_compat_rhel_8_3_len;
+
extern GlobalProperty hw_compat_rhel_8_2[];
extern const size_t hw_compat_rhel_8_2_len;
--
2.18.4

66
0022-redhat-Add-spapr_machine_rhel_default_class_options.patch Normal file
View File

@ -0,0 +1,66 @@
From e5c00782e6f609b4f25dc214825c6491def46e15 Mon Sep 17 00:00:00 2001
From: Greg Kurz <gkurz@redhat.com>
Date: Fri, 20 Nov 2020 14:00:32 -0500
Subject: redhat: Add spapr_machine_rhel_default_class_options()
RH-Author: Greg Kurz <gkurz@redhat.com>
Message-id: <20201120140033.578472-3-gkurz@redhat.com>
Patchwork-id: 99791
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 2/3] redhat: Add spapr_machine_rhel_default_class_options()
Bugzilla: 1893935
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
RH-Acked-by: David Gibson <dgibson@redhat.com>
RHEL may need to override some default property inherited from upstream.
This is currently handled in the class_options() function of the latest
machine type, and thus the defaults need to be carried around each time
we add a new RHEL machine.
Override the defaults in a dedicated function to be called by the
latest RHEL machine type.
Signed-off-by: Greg Kurz <gkurz@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/ppc/spapr.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 4a838cc955..1d7482b2fb 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4961,6 +4961,17 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
#endif
+static void spapr_machine_rhel_default_class_options(MachineClass *mc)
+{
+ /*
+ * Defaults for the latest behaviour inherited from the base class
+ * can be overriden here for all pseries-rhel* machines.
+ */
+
+ /* Maximum supported VCPU count */
+ mc->max_cpus = 384;
+}
+
/*
* pseries-rhel8.3.0
* like pseries-5.1
@@ -4968,10 +4979,8 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
static void spapr_machine_rhel830_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
-
- /* Maximum supported VCPU count for all pseries-rhel* machines */
- mc->max_cpus = 384;
+ /* The default machine type must apply the RHEL specific defaults */
+ spapr_machine_rhel_default_class_options(mc);
}
DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", true);
--
2.18.4

70
0023-redhat-Define-pseries-rhel8.4.0-machine-type.patch Normal file
View File

@ -0,0 +1,70 @@
From e5f8c128550c8e6020095152a9fa171cccc6aa18 Mon Sep 17 00:00:00 2001
From: Greg Kurz <gkurz@redhat.com>
Date: Fri, 20 Nov 2020 14:00:33 -0500
Subject: redhat: Define pseries-rhel8.4.0 machine type
RH-Author: Greg Kurz <gkurz@redhat.com>
Message-id: <20201120140033.578472-4-gkurz@redhat.com>
Patchwork-id: 99792
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 3/3] redhat: Define pseries-rhel8.4.0 machine type
Bugzilla: 1893935
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
RH-Acked-by: David Gibson <dgibson@redhat.com>
From: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <gkurz@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/ppc/spapr.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1d7482b2fb..4f61b64a21 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4972,6 +4972,19 @@ static void spapr_machine_rhel_default_class_options(MachineClass *mc)
mc->max_cpus = 384;
}
+/*
+ * pseries-rhel8.4.0
+ * like pseries-5.2
+ */
+
+static void spapr_machine_rhel840_class_options(MachineClass *mc)
+{
+ /* The default machine type must apply the RHEL specific defaults */
+ spapr_machine_rhel_default_class_options(mc);
+}
+
+DEFINE_SPAPR_MACHINE(rhel840, "rhel8.4.0", true);
+
/*
* pseries-rhel8.3.0
* like pseries-5.1
@@ -4979,11 +4992,17 @@ static void spapr_machine_rhel_default_class_options(MachineClass *mc)
static void spapr_machine_rhel830_class_options(MachineClass *mc)
{
- /* The default machine type must apply the RHEL specific defaults */
- spapr_machine_rhel_default_class_options(mc);
+ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
+
+ spapr_machine_rhel840_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_3,
+ hw_compat_rhel_8_3_len);
+
+ /* from pseries-5.1 */
+ smc->pre_5_2_numa_associativity = true;
}
-DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", true);
+DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", false);
/*
* pseries-rhel8.2.0
--
2.18.4

72
0024-redhat-s390x-add-rhel-8.4.0-compat-machine.patch Normal file
View File

@ -0,0 +1,72 @@
From a4ce96735ad8f1e07ded93e39e32e22bd9ac00ba Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@redhat.com>
Date: Tue, 1 Dec 2020 17:53:41 -0500
Subject: redhat: s390x: add rhel-8.4.0 compat machine
RH-Author: Cornelia Huck <cohuck@redhat.com>
Message-id: <20201201175341.37537-3-cohuck@redhat.com>
Patchwork-id: 100195
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 2/2] redhat: s390x: add rhel-8.4.0 compat machine
Bugzilla: 1836282
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Acked-by: Thomas Huth <thuth@redhat.com>
RH-Acked-by: David Hildenbrand <david@redhat.com>
Note that we did not publish a rhel-8.3.0 machine on s390x, so we
need to add the respective hw_compat entry in the rhel-8.2.0 machine.
Also, the hw_compat entry for 8.1 was missing; however, the contents
there are not relevant for s390x.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index b8dde7e4e1..c7b5bcb06b 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -1056,15 +1056,29 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
DEFINE_CCW_MACHINE(2_4, "2.4", false);
#endif
+static void ccw_machine_rhel840_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_rhel840_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(rhel840, "rhel8.4.0", true);
+
static void ccw_machine_rhel820_instance_options(MachineState *machine)
{
+ ccw_machine_rhel840_instance_options(machine);
}
static void ccw_machine_rhel820_class_options(MachineClass *mc)
{
+ ccw_machine_rhel840_class_options(mc);
mc->fixup_ram_size = s390_fixup_ram_size;
+ /* we did not publish a rhel8.3.0 machine */
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_3, hw_compat_rhel_8_3_len);
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_2, hw_compat_rhel_8_2_len);
}
-DEFINE_CCW_MACHINE(rhel820, "rhel8.2.0", true);
+DEFINE_CCW_MACHINE(rhel820, "rhel8.2.0", false);
static void ccw_machine_rhel760_instance_options(MachineState *machine)
{
@@ -1086,6 +1100,7 @@ static void ccw_machine_rhel760_class_options(MachineClass *mc)
{
ccw_machine_rhel820_class_options(mc);
/* We never published the s390x version of RHEL-AV 8.0 and 8.1, so add this here */
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_1, hw_compat_rhel_8_1_len);
compat_props_add(mc->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len);
compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);
}
--
2.18.4

56
0027-block-vpc-Make-vpc_open-read-the-full-dynamic-header.patch Normal file
View File

@ -0,0 +1,56 @@
From 8d3c826bca23d64cbb2f71bd3b506b43fc2b1c70 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Thu, 17 Dec 2020 17:58:43 +0100
Subject: block/vpc: Make vpc_open() read the full dynamic header
The dynamic header's size is 1024 bytes.
vpc_open() reads only the 512 bytes of the dynamic header into buf[].
Works, because it doesn't actually access the second half. However, a
colleague told me that GCC 11 warns:
../block/vpc.c:358:51: error: array subscript 'struct VHDDynDiskHeader[0]' is partly outside array bounds of 'uint8_t[512]' [-Werror=array-bounds]
Clean up to read the full header.
Rename buf[] to dyndisk_header_buf[] while there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
block/vpc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index 1ab55f9287..2fcf3f6283 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -220,7 +220,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
QemuOpts *opts = NULL;
Error *local_err = NULL;
bool use_chs;
- uint8_t buf[HEADER_SIZE];
+ uint8_t dyndisk_header_buf[1024];
uint32_t checksum;
uint64_t computed_size;
uint64_t pagetable_size;
@@ -340,14 +340,14 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
}
if (disk_type == VHD_DYNAMIC) {
- ret = bdrv_pread(bs->file, be64_to_cpu(footer->data_offset), buf,
- HEADER_SIZE);
+ ret = bdrv_pread(bs->file, be64_to_cpu(footer->data_offset),
+ dyndisk_header_buf, 1024);
if (ret < 0) {
error_setg(errp, "Error reading dynamic VHD header");
goto fail;
}
- dyndisk_header = (VHDDynDiskHeader *) buf;
+ dyndisk_header = (VHDDynDiskHeader *)dyndisk_header_buf;
if (strncmp(dyndisk_header->magic, "cxsparse", 8)) {
error_setg(errp, "Invalid header magic");
--
2.18.4

163
0028-GCC-11-warnings-hacks.patch Normal file
View File

@ -0,0 +1,163 @@
From 0db17b3fa57012894e9e410f139703baf21f590a Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Mon, 4 Jan 2021 07:47:03 +0100
Subject: GCC 11 warnings hacks
---
hw/scsi/scsi-disk.c | 13 +++++++------
net/eth.c | 4 +++-
target/s390x/kvm.c | 2 +-
target/s390x/misc_helper.c | 2 +-
tcg/aarch64/tcg-target.c.inc | 3 +--
tests/test-block-iothread.c | 12 ++++++------
6 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 90841ad791..8ce77777d3 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2578,14 +2578,15 @@ static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf)
int len = scsi_cdb_length(buf);
char *line_buffer, *p;
- line_buffer = g_malloc(len * 5 + 1);
+ if (len > 0) {
+ line_buffer = g_malloc(len * 5 + 1);
+ for (i = 0, p = line_buffer; i < len; i++) {
+ p += sprintf(p, " 0x%02x", buf[i]);
+ }
+ trace_scsi_disk_new_request(lun, tag, line_buffer);
- for (i = 0, p = line_buffer; i < len; i++) {
- p += sprintf(p, " 0x%02x", buf[i]);
+ g_free(line_buffer);
}
- trace_scsi_disk_new_request(lun, tag, line_buffer);
-
- g_free(line_buffer);
}
static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
diff --git a/net/eth.c b/net/eth.c
index 1e0821c5f8..041ac4865a 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
struct ip6_ext_hdr *ext_hdr,
struct in6_address *dst_addr)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
if ((rthdr->rtype == 2) &&
@@ -424,7 +426,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
return bytes_read == sizeof(*dst_addr);
}
-
+#pragma GCC diagnostic pop
return false;
}
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 1839cc6648..ab1ca6b1bf 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -1918,7 +1918,7 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)
*/
if (qemu_name) {
strncpy((char *)sysib.ext_names[0], qemu_name,
- sizeof(sysib.ext_names[0]));
+ sizeof(sysib.ext_names[0])-1);
} else {
strcpy((char *)sysib.ext_names[0], "KVMguest");
}
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 58dbc023eb..adaf4145e6 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -370,7 +370,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1)
MIN(sizeof(sysib.sysib_322.vm[0].name),
strlen(qemu_name)));
strncpy((char *)sysib.sysib_322.ext_names[0], qemu_name,
- sizeof(sysib.sysib_322.ext_names[0]));
+ sizeof(sysib.sysib_322.ext_names[0])-1);
} else {
ebcdic_put(sysib.sysib_322.vm[0].name, "TCGguest", 8);
strcpy((char *)sysib.sysib_322.ext_names[0], "TCGguest");
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 26f71cb599..fe6bdbf721 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1852,8 +1852,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
static tcg_insn_unit *tb_ret_addr;
static void tcg_out_op(TCGContext *s, TCGOpcode opc,
- const TCGArg args[TCG_MAX_OP_ARGS],
- const int const_args[TCG_MAX_OP_ARGS])
+ const TCGArg *args, const int *const_args)
{
/* 99% of the time, we can signal the use of extension registers
by looking to see if the opcode handles 64-bit data. */
diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c
index 3f866a35c6..bc64b50e66 100644
--- a/tests/test-block-iothread.c
+++ b/tests/test-block-iothread.c
@@ -75,7 +75,7 @@ static BlockDriver bdrv_test = {
static void test_sync_op_pread(BdrvChild *c)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Success */
@@ -89,7 +89,7 @@ static void test_sync_op_pread(BdrvChild *c)
static void test_sync_op_pwrite(BdrvChild *c)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Success */
@@ -103,7 +103,7 @@ static void test_sync_op_pwrite(BdrvChild *c)
static void test_sync_op_blk_pread(BlockBackend *blk)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Success */
@@ -117,7 +117,7 @@ static void test_sync_op_blk_pread(BlockBackend *blk)
static void test_sync_op_blk_pwrite(BlockBackend *blk)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Success */
@@ -131,7 +131,7 @@ static void test_sync_op_blk_pwrite(BlockBackend *blk)
static void test_sync_op_load_vmstate(BdrvChild *c)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Error: Driver does not support snapshots */
@@ -141,7 +141,7 @@ static void test_sync_op_load_vmstate(BdrvChild *c)
static void test_sync_op_save_vmstate(BdrvChild *c)
{
- uint8_t buf[512];
+ uint8_t buf[512] = {0};
int ret;
/* Error: Driver does not support snapshots */
--
2.18.4

27
0029-Disable-problematic-tests-for-initial-build.patch Normal file
View File

@ -0,0 +1,27 @@
From 6d129eac73fdc94b2712af5d402c0f2debd65600 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Tue, 5 Jan 2021 07:40:08 +0100
Subject: Disable problematic tests for initial build
---
tests/qtest/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 15ed460ff0..70ef8c236c 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -150,8 +150,8 @@ qtests_aarch64 = \
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
['arm-cpu-features',
'numa-test',
- 'boot-serial-test',
- 'migration-test']
+ 'boot-serial-test']
+# 'migration-test']
qtests_s390x = \
(slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
--
2.18.4

88
qemu-kvm.spec
View File

@ -8,7 +8,7 @@
%global have_gluster 1
%global have_kvm_setup 0
%global have_memlock_limits 0
%global rcversion -rc3
%ifnarch %{ix86} x86_64
@ -64,7 +64,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 5.2.0
Release: rc3.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
@ -73,7 +73,7 @@ URL: http://www.qemu.org/
ExclusiveArch: x86_64 %{power64} aarch64 s390x
Source0: http://wiki.qemu.org/download/qemu-5.2.0-rc3.tar.xz
Source0: http://wiki.qemu.org/download/qemu-5.2.0.tar.xz
# KSM control scripts
Source4: ksm.service
@ -117,7 +117,13 @@ Patch0016: 0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
Patch0017: 0017-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
Patch0018: 0018-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
Patch0019: 0019-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch
Patch0020: 0020-Build-RHEL-9.patch
Patch0021: 0021-redhat-Define-hw_compat_8_3.patch
Patch0022: 0022-redhat-Add-spapr_machine_rhel_default_class_options.patch
Patch0023: 0023-redhat-Define-pseries-rhel8.4.0-machine-type.patch
Patch0024: 0024-redhat-s390x-add-rhel-8.4.0-compat-machine.patch
Patch0027: 0027-block-vpc-Make-vpc_open-read-the-full-dynamic-header.patch
Patch0028: 0028-GCC-11-warnings-hacks.patch
Patch0029: 0029-Disable-problematic-tests-for-initial-build.patch
BuildRequires: wget
BuildRequires: rpm-build
@ -247,13 +253,14 @@ hardware for a full system such as a PC and its associated peripherals.
Summary: qemu-kvm core components
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: qemu-img = %{epoch}:%{version}-%{release}
Conflicts: qemu-kiwi
%ifarch %{ix86} x86_64
Requires: edk2-ovmf
%endif
%ifarch aarch64
Requires: edk2-aarch64
%endif
# Temporary disable edk2 dependency as there's no edk2 available yet
#%ifarch %{ix86} x86_64
#Requires: edk2-ovmf
#%endif
#%ifarch aarch64
#Requires: edk2-aarch64
#%endif
%ifarch %{power64}
Requires: SLOF >= %{SLOF_gittagdate}-1.git%{SLOF_gittagcommit}
@ -418,7 +425,7 @@ mkdir slirp
# XXX: ugly hack to copy source tree into a new folder.
# it allows to build qemu-kiwi without touching the original source tree.
# This is required as the build isolation is not 100% as we also have to
# change the source tree when building qemu-kiwi. And, when we do that,
# change the source tree when building qemu-kiwi. And, when we do that,
# calling "make check" on qemu-kvm see that change and behaves baddly.
# Newer version of qemu allow us to create a better sollution, and this
# hack can be dropped.
@ -582,15 +589,12 @@ pushd %{qemu_kvm_build}
--enable-attr \
%ifarch %{ix86} x86_64
--enable-avx2 \
%else
%endif
--enable-cap-ng \
--enable-capstone \
--enable-coroutine-pool \
--enable-curl \
--enable-debug-info \
--disable-debug-tcg \
--disable-dmg \
--enable-docs \
%if 0%{have_fdt}
--enable-fdt \
@ -652,9 +656,9 @@ pushd %{qemu_kvm_build}
--enable-vnc-sasl \
--enable-werror \
--enable-xkbcommon \
--disable-zstd \
--without-default-devices
echo "qemu-kvm config-host.mak contents:"
echo "==="
cat config-host.mak
@ -702,6 +706,7 @@ find ../default-configs -name "*-rh-devices.mak" \
--extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
--extra-cflags="%{optflags}" \
--with-pkgversion="%{name}-%{version}-%{release}" \
--with-suffix="%{name}" \
--firmwarepath=%{_prefix}/share/qemu-firmware \
--python=%{__python3} \
--target-list="%{buildarch}" \
@ -733,6 +738,7 @@ find ../default-configs -name "*-rh-devices.mak" \
%ifnarch s390x
--enable-numa \
%endif
--enable-pie \
--enable-seccomp \
--enable-system \
--enable-tcg \
@ -747,6 +753,7 @@ find ../default-configs -name "*-rh-devices.mak" \
--enable-xkbcommon \
--without-default-devices
echo "qemu-kiki config-host.mak contents:"
echo "==="
cat config-host.mak
@ -1101,25 +1108,6 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
fi
%endif
%post -n qemu-kiwi
# load kvm modules now, so we can make sure no reboot is needed.
# If there's already a kvm module installed, we don't mess with it
%udev_rules_update
sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
udevadm trigger --subsystem-match=misc --sysname-match=kvm --action=add || :
%if %{have_kvm_setup}
systemctl daemon-reload # Make sure it sees the new presets and unitfile
%systemd_post kvm-setup.service
if systemctl is-enabled kvm-setup.service > /dev/null; then
systemctl start kvm-setup.service
fi
%endif
%if %{have_kvm_setup}
%preun -n qemu-kiwi
%systemd_preun kvm-setup.service
%endif
%preun -n qemu-kvm-common
%systemd_preun ksm.service
%systemd_preun ksmtuned.service
@ -1318,6 +1306,36 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
%changelog
* Tue Jan 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 5.2.0-2.el9
- Rebuild for RHEL 9
* Tue Dec 15 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 5.2.0-2.el8
- kvm-redhat-Define-hw_compat_8_3.patch [bz#1893935]
- kvm-redhat-Add-spapr_machine_rhel_default_class_options.patch [bz#1893935]
- kvm-redhat-Define-pseries-rhel8.4.0-machine-type.patch [bz#1893935]
- kvm-redhat-s390x-add-rhel-8.4.0-compat-machine.patch [bz#1836282]
- Resolves: bz#1836282
(New machine type for qemu-kvm on s390x in RHEL-AV)
- Resolves: bz#1893935
(New machine type on RHEL-AV 8.4 for ppc64le)
* Wed Dec 09 2020 Miroslav Rezanina <mrezanin@redhat.com> - 5.2.0-1.el8
- Rebase to QEMU 5.2.0 [bz#1905933]
- Resolves: bz#1905933
(Rebase qemu-kvm to version 5.2.0)
* Tue Dec 01 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 5.1.0-16.el8
- kvm-redhat-introduces-disable_everything-macro-into-the-.patch [bz#1884611]
- kvm-redhat-scripts-extract_build_cmd.py-Avoid-listing-em.patch [bz#1884611]
- kvm-redhat-Removing-unecessary-configurations.patch [bz#1884611]
- kvm-redhat-Fixing-rh-local-build.patch [bz#1884611]
- kvm-redhat-allow-Makefile-rh-prep-builddep-to-fail.patch [bz#1884611]
- kvm-redhat-adding-rh-rpm-target.patch [bz#1884611]
- kvm-redhat-move-shareable-files-from-qemu-kvm-core-to-qe.patch [bz#1884611]
- kvm-redhat-Add-qemu-kiwi-subpackage.patch [bz#1884611]
- Resolves: bz#1884611
(Build kata-specific version of qemu)
* Mon Nov 16 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 5.1.0-15.el8
- kvm-redhat-add-un-pre-install-systemd-hooks-for-qemu-ga.patch [bz#1882719]
- kvm-rcu-Implement-drain_call_rcu.patch [bz#1812399 bz#1866707]

2
sources
View File

@ -1 +1 @@
SHA512 (qemu-5.2.0-rc3.tar.xz) = e3913388fd5f5b7e3564bdc10869e1b9a9bf1a569c11748aec391ae6d13ea99fad43f74c4d70202f69dce93dd8961072a0655f63a8d9bbe78dc2a7220bc32048
SHA512 (qemu-5.2.0.tar.xz) = bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3