diff --git a/0001-hw-pci-bridge-pci_expander_bridge-fix-type-in-pxb_cx.patch b/0001-hw-pci-bridge-pci_expander_bridge-fix-type-in-pxb_cx.patch
deleted file mode 100644
index 7b31654..0000000
--- a/0001-hw-pci-bridge-pci_expander_bridge-fix-type-in-pxb_cx.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 692764e5310a7d1f5f819cbb2c4fb70405b4b119 Mon Sep 17 00:00:00 2001
-From: Jonathan Cameron via <qemu-devel@nongnu.org>
-Date: Thu, 20 Apr 2023 15:27:49 +0100
-Subject: [PATCH 1/2] hw/pci-bridge: pci_expander_bridge fix type in
- pxb_cxl_dev_reset()
-
-Reproduce issue with
-
-configure --enable-qom-cast-debug ...
-
-qemu-system-x86_64 -display none -machine q35,cxl=on -device pxb-cxl,bus=pcie.0
-
- hw/pci-bridge/pci_expander_bridge.c:54:PXB_DEV: Object 0x5570e0b1ada0 is not an instance of type pxb
- Aborted
-
-The type conversion results in the right state structure, but PXB_DEV is
-not a parent of PXB_CXL_DEV hence the error. Rather than directly
-cleaning up the inheritance, this is the minimal fix which will be
-followed by the cleanup.
-
-Fixes: 154070eaf6 ("hw/pxb-cxl: Support passthrough HDM Decoders unless overridden")
-Reported-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
----
- hw/pci-bridge/pci_expander_bridge.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
-index ead33f0c05..a78327b5f2 100644
---- a/hw/pci-bridge/pci_expander_bridge.c
-+++ b/hw/pci-bridge/pci_expander_bridge.c
-@@ -311,7 +311,7 @@ static void pxb_cxl_dev_reset(DeviceState *dev)
- * The CXL specification allows for host bridges with no HDM decoders
- * if they only have a single root port.
- */
-- if (!PXB_DEV(dev)->hdm_for_passthrough) {
-+ if (!PXB_CXL_DEV(dev)->hdm_for_passthrough) {
- dsp_count = pcie_count_ds_ports(hb->bus);
- }
- /* Initial reset will have 0 dsp so wait until > 0 */
---
-2.40.0
-
diff --git a/qemu.spec b/qemu.spec
index 13bc47d..b2ce8fd 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -335,7 +335,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38
Summary: QEMU is a FAST! processor emulator
Name: qemu
-Version: 8.0.0
+Version: 8.0.2
Release: %{baserelease}%{?rcrel}%{?dist}
Epoch: 2
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only and LGPL-2.1-or-later AND MIT and public-domain and CC-BY-3.0
@@ -356,8 +356,6 @@ Source36: README.tests
# Fix SGX assert
Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
-# Fix wrong type and rework inheritance.
-Patch: 0001-hw-pci-bridge-pci_expander_bridge-fix-type-in-pxb_cx.patch
Patch: 0002-hw-pci-bridge-Make-PCIe-and-CXL-PXB-Devices-inherit-.patch
BuildRequires: meson >= %{meson_version}
@@ -2785,6 +2783,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
+* Mon Jul 03 2023 Camilla Conte <cconte@redhat.com> - 2:8.0.2-1
+- New upstream release 8.0.2
+
* Thu Jun 01 2023 Richard W.M. Jones <rjones@redhat.com> - 2:8.0.0-4
- Rebuild for libnfs soname bump
diff --git a/sources b/sources
index b5ace58..061d5f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-8.0.0.tar.xz) = 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+SHA512 (qemu-8.0.2.tar.xz) = 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a