diff --git a/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch b/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch
deleted file mode 100644
index db569d2..0000000
--- a/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 66f18320f751f9649e0f230e814dd556e38bc1fe Mon Sep 17 00:00:00 2001
-From: Max Reitz <mreitz@redhat.com>
-Date: Thu, 1 Apr 2021 15:28:39 +0200
-Subject: [PATCH] iotests/qsd-jobs: Filter events in the first test
-
-The job may or may not be ready before the 'quit' is issued. Whether it
-is is irrelevant; for the purpose of the test, it only needs to still be
-there. Filter the job status change and READY events from the output so
-it becomes reliable.
-
-Reported-by: Peter Maydell <peter.maydell@linaro.org>
-Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-Id: <20210401132839.139939-1-mreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/tests/qsd-jobs | 5 ++++-
- tests/qemu-iotests/tests/qsd-jobs.out | 10 ----------
- 2 files changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/tests/qemu-iotests/tests/qsd-jobs b/tests/qemu-iotests/tests/qsd-jobs
-index 972b6b3898..510bf0a9dc 100755
---- a/tests/qemu-iotests/tests/qsd-jobs
-+++ b/tests/qemu-iotests/tests/qsd-jobs
-@@ -52,9 +52,12 @@ echo "=== Job still present at shutdown ==="
- echo
-
- # Just make sure that this doesn't crash
-+# (Filter job status and READY events, because their order may differ
-+# between runs, particularly around when 'quit' is issued)
- $QSD --chardev stdio,id=stdio --monitor chardev=stdio \
- --blockdev node-name=file0,driver=file,filename="$TEST_IMG" \
-- --blockdev node-name=fmt0,driver=qcow2,file=file0 <<EOF | _filter_qmp
-+ --blockdev node-name=fmt0,driver=qcow2,file=file0 <<EOF \
-+ | _filter_qmp | grep -v JOB_STATUS_CHANGE | grep -v BLOCK_JOB_READY
- {"execute":"qmp_capabilities"}
- {"execute": "block-commit", "arguments": {"device": "fmt0", "job-id": "job0"}}
- {"execute": "quit"}
-diff --git a/tests/qemu-iotests/tests/qsd-jobs.out b/tests/qemu-iotests/tests/qsd-jobs.out
-index 05e1165e80..5f41491e05 100644
---- a/tests/qemu-iotests/tests/qsd-jobs.out
-+++ b/tests/qemu-iotests/tests/qsd-jobs.out
-@@ -6,19 +6,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
-
- QMP_VERSION
- {"return": {}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
- {"return": {}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
- {"return": {}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
- {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
--{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
-
- === Streaming can't get permission on base node ===
-
---
-2.29.2
-
diff --git a/0001-net-tap-fix-crash-on-hotplug.patch b/0001-net-tap-fix-crash-on-hotplug.patch
deleted file mode 100644
index 38dc0df..0000000
--- a/0001-net-tap-fix-crash-on-hotplug.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3f6be9c84782a0943ea21a8a6f8a5d055b65f2d5 Mon Sep 17 00:00:00 2001
-Message-Id: <3f6be9c84782a0943ea21a8a6f8a5d055b65f2d5.1619018363.git.crobinso@redhat.com>
-From: Cole Robinson <crobinso@redhat.com>
-Date: Wed, 21 Apr 2021 11:12:07 -0400
-Subject: [PATCH-for-6.0] net: tap: fix crash on hotplug
-
-Attempting to hotplug a tap nic with libvirt will crash qemu:
-
-$ sudo virsh attach-interface f32 network default
-error: Failed to attach interface
-error: Unable to read from monitor: Connection reset by peer
-
-0x000055875b7f3a99 in tap_send (opaque=0x55875e39eae0) at ../net/tap.c:206
-206 if (!s->nc.peer->do_not_pad) {
-gdb$ bt
-
-s->nc.peer may not be set at this point. This seems to be an
-expected case, as qemu_send_packet_* explicitly checks for NULL
-s->nc.peer later.
-
-Fix it by checking for s->nc.peer here too. Padding is applied if
-s->nc.peer is not set.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1949786
-Fixes: 969e50b61a2
-
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
-* Or should we skip padding if nc.peer is unset? I didn't dig into it
-* tap-win3.c and slirp.c may need a similar fix, but the slirp case
- didn't crash in a simple test.
-
- net/tap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/tap.c b/net/tap.c
-index dd42ac6134..937559dbb8 100644
---- a/net/tap.c
-+++ b/net/tap.c
-@@ -203,7 +203,7 @@ static void tap_send(void *opaque)
- size -= s->host_vnet_hdr_len;
- }
-
-- if (!s->nc.peer->do_not_pad) {
-+ if (!s->nc.peer || !s->nc.peer->do_not_pad) {
- if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
- buf = min_pkt;
- size = min_pktsz;
---
-2.31.1
-
diff --git a/qemu.spec b/qemu.spec
index 520a9e9..46cf0ea 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -236,7 +236,7 @@
%{obsoletes_block_rbd}
# Release candidate version tracking
-%global rcver rc4
+# global rcver rc4
%if 0%{?rcver:1}
%global rcrel .%{rcver}
%global rcstr -%{rcver}
@@ -246,7 +246,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 6.0.0
-Release: 0.3%{?rcrel}%{?dist}
+Release: 1%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/
@@ -265,7 +265,6 @@ Source20: kvm-x86.modprobe.conf
# /etc/security/limits.d/95-kvm-ppc64-memlock.conf
Source21: 95-kvm-ppc64-memlock.conf
-Patch0001: 0001-net-tap-fix-crash-on-hotplug.patch
BuildRequires: make
BuildRequires: meson
@@ -1882,6 +1881,9 @@ getent passwd qemu >/dev/null || \
%changelog
+* Wed May 12 2021 Cole Robinson <crobinso@redhat.com> - 2:6.0.0-1
+- Rebase to qemu 6.0.0 GA
+
* Wed Apr 21 2021 Cole Robinson <crobinso@redhat.com> - 2:6.0.0-0.3.rc4
- Rebase to qemu 6.0.0-rc4
diff --git a/sources b/sources
index d5c4f41..c713614 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-6.0.0-rc4.tar.xz) = 4435d0b2a23a6108dc884dd6824540b4a855e4de90a02ff2581ec54ee66f3503057e2f8f75839183b5e04e294acb240d766841b6f6e60f1cea6912bc84cdd837
+SHA512 (qemu-6.0.0.tar.xz) = ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4