Compare commits
No commits in common. "c8-stream-rhel" and "stream-virt-rhel-rhel-8.10.0" have entirely different histories.
c8-stream-
...
stream-vir
|
@ -1,5 +1,5 @@
|
||||||
|
/qemu-5.2.0-rc2.tar.xz
|
||||||
|
/qemu-5.2.0.tar.xz
|
||||||
|
/qemu-6.0.0.tar.xz
|
||||||
|
/qemu-6.2.0.tar.xz
|
||||||
SOURCES/qemu-6.2.0.tar.xz
|
SOURCES/qemu-6.2.0.tar.xz
|
||||||
SOURCES/tests_data_acpi_pc_SSDT.dimmpxm
|
|
||||||
SOURCES/tests_data_acpi_q35_FACP.slic
|
|
||||||
SOURCES/tests_data_acpi_q35_SSDT.dimmpxm
|
|
||||||
SOURCES/tests_data_acpi_virt_SSDT.memhp
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
68cd61a466170115b88817e2d52db2cd7a92f43a SOURCES/qemu-6.2.0.tar.xz
|
|
||||||
c4b34092bc5af1ba7febfca1477320fb024e8acd SOURCES/tests_data_acpi_pc_SSDT.dimmpxm
|
|
||||||
19349e3517143bd1af56a5444e927ba37a111f72 SOURCES/tests_data_acpi_q35_FACP.slic
|
|
||||||
4632d10ae8cedad4d5d760ed211f83f0dc81005d SOURCES/tests_data_acpi_q35_SSDT.dimmpxm
|
|
||||||
ef12eed43cc357fb134db6fa3c7ffc83e222a97d SOURCES/tests_data_acpi_virt_SSDT.memhp
|
|
|
@ -1,101 +0,0 @@
|
||||||
From b96215922bdc4c408f4ba5ac89db17f3855b8620 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jon Maloy <jmaloy@redhat.com>
|
|
||||||
Date: Tue, 15 Aug 2023 00:08:55 +0000
|
|
||||||
Subject: [PATCH] io: remove io watch if TLS channel is closed during handshake
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
||||||
RH-MergeRequest: 320: io: remove io watch if TLS channel is closed during handshake
|
|
||||||
RH-Jira: RHEL-7339
|
|
||||||
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
RH-Commit: [1/1] c120fc5e97f76ab4729cef5e3e0e02055928849a (redhat/rhel/src/qemu-kvm/jons-qemu-kvm-2)
|
|
||||||
|
|
||||||
CVE: CVE-2023-3354
|
|
||||||
Upstream: Merged
|
|
||||||
|
|
||||||
commit 10be627d2b5ec2d6b3dce045144aa739eef678b4
|
|
||||||
Author: Daniel P. Berrangé <berrange@redhat.com>
|
|
||||||
Date: Tue Jun 20 09:45:34 2023 +0100
|
|
||||||
|
|
||||||
io: remove io watch if TLS channel is closed during handshake
|
|
||||||
|
|
||||||
The TLS handshake make take some time to complete, during which time an
|
|
||||||
I/O watch might be registered with the main loop. If the owner of the
|
|
||||||
I/O channel invokes qio_channel_close() while the handshake is waiting
|
|
||||||
to continue the I/O watch must be removed. Failing to remove it will
|
|
||||||
later trigger the completion callback which the owner is not expecting
|
|
||||||
to receive. In the case of the VNC server, this results in a SEGV as
|
|
||||||
vnc_disconnect_start() tries to shutdown a client connection that is
|
|
||||||
already gone / NULL.
|
|
||||||
|
|
||||||
CVE-2023-3354
|
|
||||||
Reported-by: jiangyegen <jiangyegen@huawei.com>
|
|
||||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
||||||
|
|
||||||
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
||||||
---
|
|
||||||
include/io/channel-tls.h | 1 +
|
|
||||||
io/channel-tls.c | 18 ++++++++++++------
|
|
||||||
2 files changed, 13 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/io/channel-tls.h b/include/io/channel-tls.h
|
|
||||||
index 5672479e9e..26c67f17e2 100644
|
|
||||||
--- a/include/io/channel-tls.h
|
|
||||||
+++ b/include/io/channel-tls.h
|
|
||||||
@@ -48,6 +48,7 @@ struct QIOChannelTLS {
|
|
||||||
QIOChannel *master;
|
|
||||||
QCryptoTLSSession *session;
|
|
||||||
QIOChannelShutdown shutdown;
|
|
||||||
+ guint hs_ioc_tag;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
diff --git a/io/channel-tls.c b/io/channel-tls.c
|
|
||||||
index c730cb8ec5..bd79e78837 100644
|
|
||||||
--- a/io/channel-tls.c
|
|
||||||
+++ b/io/channel-tls.c
|
|
||||||
@@ -195,12 +195,13 @@ static void qio_channel_tls_handshake_task(QIOChannelTLS *ioc,
|
|
||||||
}
|
|
||||||
|
|
||||||
trace_qio_channel_tls_handshake_pending(ioc, status);
|
|
||||||
- qio_channel_add_watch_full(ioc->master,
|
|
||||||
- condition,
|
|
||||||
- qio_channel_tls_handshake_io,
|
|
||||||
- data,
|
|
||||||
- NULL,
|
|
||||||
- context);
|
|
||||||
+ ioc->hs_ioc_tag =
|
|
||||||
+ qio_channel_add_watch_full(ioc->master,
|
|
||||||
+ condition,
|
|
||||||
+ qio_channel_tls_handshake_io,
|
|
||||||
+ data,
|
|
||||||
+ NULL,
|
|
||||||
+ context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -215,6 +216,7 @@ static gboolean qio_channel_tls_handshake_io(QIOChannel *ioc,
|
|
||||||
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(
|
|
||||||
qio_task_get_source(task));
|
|
||||||
|
|
||||||
+ tioc->hs_ioc_tag = 0;
|
|
||||||
g_free(data);
|
|
||||||
qio_channel_tls_handshake_task(tioc, task, context);
|
|
||||||
|
|
||||||
@@ -375,6 +377,10 @@ static int qio_channel_tls_close(QIOChannel *ioc,
|
|
||||||
{
|
|
||||||
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
|
|
||||||
|
|
||||||
+ if (tioc->hs_ioc_tag) {
|
|
||||||
+ g_clear_handle_id(&tioc->hs_ioc_tag, g_source_remove);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return qio_channel_close(tioc->master, errp);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
|
@ -0,0 +1,181 @@
|
||||||
|
From 440ee491240f2f02f9a6082d8aad98d88c1039dd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Huth <thuth@redhat.com>
|
||||||
|
Date: Mon, 15 Jan 2024 14:00:04 +0100
|
||||||
|
Subject: [PATCH 1/5] MAINTAINERS: split out s390x sections
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||||
|
RH-MergeRequest: 348: s390x: Provide some more useful information if decryption of a PV image fails
|
||||||
|
RH-Jira: RHEL-18214
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||||||
|
RH-Commit: [1/5] a71a3c11922481f97c36570e361088d17474e481
|
||||||
|
|
||||||
|
JIRA: https://issues.redhat.com/browse/RHEL-18214
|
||||||
|
|
||||||
|
commit 56e34834029c7c6862cb0095d95ad83c50485f88
|
||||||
|
Author: Cornelia Huck <cohuck@redhat.com>
|
||||||
|
Date: Wed Dec 22 11:55:48 2021 +0100
|
||||||
|
|
||||||
|
MAINTAINERS: split out s390x sections
|
||||||
|
|
||||||
|
Split out some more specialized devices etc., so that we can build
|
||||||
|
smarter lists of people to be put on cc: in the future.
|
||||||
|
|
||||||
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||||||
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
Acked-by: David Hildenbrand <david@redhat.com>
|
||||||
|
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||||||
|
Acked-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
Acked-by: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
Acked-by: Eric Farman <farman@linux.ibm.com>
|
||||||
|
Message-Id: <20211222105548.356852-1-cohuck@redhat.com>
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
---
|
||||||
|
MAINTAINERS | 85 ++++++++++++++++++++++++++++++++++++++++++++++-------
|
||||||
|
1 file changed, 74 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||||
|
index 7543eb4d59..b893206fc3 100644
|
||||||
|
--- a/MAINTAINERS
|
||||||
|
+++ b/MAINTAINERS
|
||||||
|
@@ -297,7 +297,6 @@ M: David Hildenbrand <david@redhat.com>
|
||||||
|
S: Maintained
|
||||||
|
F: target/s390x/
|
||||||
|
F: target/s390x/tcg
|
||||||
|
-F: target/s390x/cpu_models_*.[ch]
|
||||||
|
F: hw/s390x/
|
||||||
|
F: disas/s390.c
|
||||||
|
F: tests/tcg/s390x/
|
||||||
|
@@ -396,16 +395,10 @@ M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
M: Christian Borntraeger <borntraeger@de.ibm.com>
|
||||||
|
S: Supported
|
||||||
|
F: target/s390x/kvm/
|
||||||
|
-F: target/s390x/ioinst.[ch]
|
||||||
|
F: target/s390x/machine.c
|
||||||
|
F: target/s390x/sigp.c
|
||||||
|
-F: target/s390x/cpu_features*.[ch]
|
||||||
|
-F: target/s390x/cpu_models.[ch]
|
||||||
|
F: hw/s390x/pv.c
|
||||||
|
F: include/hw/s390x/pv.h
|
||||||
|
-F: hw/intc/s390_flic.c
|
||||||
|
-F: hw/intc/s390_flic_kvm.c
|
||||||
|
-F: include/hw/s390x/s390_flic.h
|
||||||
|
F: gdb-xml/s390*.xml
|
||||||
|
T: git https://github.com/borntraeger/qemu.git s390-next
|
||||||
|
L: qemu-s390x@nongnu.org
|
||||||
|
@@ -1529,12 +1522,8 @@ S390 Virtio-ccw
|
||||||
|
M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
M: Christian Borntraeger <borntraeger@de.ibm.com>
|
||||||
|
S: Supported
|
||||||
|
-F: hw/char/sclp*.[hc]
|
||||||
|
-F: hw/char/terminal3270.c
|
||||||
|
F: hw/s390x/
|
||||||
|
F: include/hw/s390x/
|
||||||
|
-F: hw/watchdog/wdt_diag288.c
|
||||||
|
-F: include/hw/watchdog/wdt_diag288.h
|
||||||
|
F: configs/devices/s390x-softmmu/default.mak
|
||||||
|
F: tests/avocado/machine_s390_ccw_virtio.py
|
||||||
|
T: git https://github.com/borntraeger/qemu.git s390-next
|
||||||
|
@@ -1559,6 +1548,37 @@ F: hw/s390x/s390-pci*
|
||||||
|
F: include/hw/s390x/s390-pci*
|
||||||
|
L: qemu-s390x@nongnu.org
|
||||||
|
|
||||||
|
+S390 channel subsystem
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: hw/s390x/ccw-device.[ch]
|
||||||
|
+F: hw/s390x/css.c
|
||||||
|
+F: hw/s390x/css-bridge.c
|
||||||
|
+F: include/hw/s390x/css.h
|
||||||
|
+F: include/hw/s390x/css-bridge.h
|
||||||
|
+F: include/hw/s390x/ioinst.h
|
||||||
|
+F: target/s390x/ioinst.c
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 CPU models
|
||||||
|
+M: David Hildenbrand <david@redhat.com>
|
||||||
|
+S: Maintained
|
||||||
|
+F: target/s390x/cpu_features*.[ch]
|
||||||
|
+F: target/s390x/cpu_models.[ch]
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 SCLP-backed devices
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: include/hw/s390x/event-facility.h
|
||||||
|
+F: include/hw/s390x/sclp.h
|
||||||
|
+F: hw/char/sclp*.[hc]
|
||||||
|
+F: hw/s390x/event-facility.c
|
||||||
|
+F: hw/s390x/sclp*.c
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
X86 Machines
|
||||||
|
------------
|
||||||
|
PC
|
||||||
|
@@ -1956,6 +1976,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
S: Supported
|
||||||
|
F: hw/s390x/virtio-ccw*.[hc]
|
||||||
|
F: hw/s390x/vhost-vsock-ccw.c
|
||||||
|
+F: hw/s390x/vhost-user-fs-ccw.c
|
||||||
|
T: git https://gitlab.com/cohuck/qemu.git s390-next
|
||||||
|
T: git https://github.com/borntraeger/qemu.git s390-next
|
||||||
|
L: qemu-s390x@nongnu.org
|
||||||
|
@@ -2294,6 +2315,48 @@ F: hw/timer/mips_gictimer.c
|
||||||
|
F: include/hw/intc/mips_gic.h
|
||||||
|
F: include/hw/timer/mips_gictimer.h
|
||||||
|
|
||||||
|
+S390 3270 device
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Odd fixes
|
||||||
|
+F: include/hw/s390x/3270-ccw.h
|
||||||
|
+F: hw/char/terminal3270.c
|
||||||
|
+F: hw/s390x/3270-ccw.c
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 diag 288 watchdog
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: hw/watchdog/wdt_diag288.c
|
||||||
|
+F: include/hw/watchdog/wdt_diag288.h
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 storage key device
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: hw/s390x/storage-keys.h
|
||||||
|
+F: hw/390x/s390-skeys*.c
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 storage attribute device
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: hw/s390x/storage-attributes.h
|
||||||
|
+F: hw/s390/s390-stattrib*.c
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
+S390 floating interrupt controller
|
||||||
|
+M: Halil Pasic <pasic@linux.ibm.com>
|
||||||
|
+M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||||
|
+M: David Hildenbrand <david@redhat.com>
|
||||||
|
+S: Supported
|
||||||
|
+F: hw/intc/s390_flic*.c
|
||||||
|
+F: include/hw/s390x/s390_flic.h
|
||||||
|
+L: qemu-s390x@nongnu.org
|
||||||
|
+
|
||||||
|
Subsystems
|
||||||
|
----------
|
||||||
|
Overall Audio backends
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,18 +1,19 @@
|
||||||
From adbbc64db535d84fc24b576888f834841f54e8d3 Mon Sep 17 00:00:00 2001
|
From f1480fe9a4054113ddacd218961e29f31c33d329 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Xu <peterx@redhat.com>
|
From: Peter Xu <peterx@redhat.com>
|
||||||
Date: Wed, 6 Sep 2023 16:29:23 -0400
|
Date: Wed, 6 Sep 2023 16:29:23 -0400
|
||||||
Subject: [PATCH 2/2] RHEL: Enable "x-not-migrate-acpi-index" for all pre-RHEL8
|
Subject: [PATCH 2/3] RHEL: Enable "x-not-migrate-acpi-index" for all pre-RHEL8
|
||||||
guests
|
guests
|
||||||
MIME-Version: 1.0
|
MIME-Version: 1.0
|
||||||
Content-Type: text/plain; charset=UTF-8
|
Content-Type: text/plain; charset=UTF-8
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
RH-Author: Peter Xu <peterx@redhat.com>
|
RH-Author: Peter Xu <peterx@redhat.com>
|
||||||
RH-MergeRequest: 317: acpi: fix acpi_index migration
|
RH-MergeRequest: 343: acpi: fix acpi_index migration
|
||||||
RH-Jira: RHEL-2186
|
RH-Jira: RHEL-20189
|
||||||
RH-Acked-by: Ani Sinha <None>
|
|
||||||
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
||||||
RH-Commit: [2/2] 961eee71e6f563aadf4a93082cd384d765d3e73b
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||||||
|
RH-Acked-by: Prasad Pandit <None>
|
||||||
|
RH-Commit: [2/2] 0a26a71236e68dd7feb5d2063254090e3852d6ba
|
||||||
|
|
||||||
The acpi index migration is simply broken before for all pre-RHEL8
|
The acpi index migration is simply broken before for all pre-RHEL8
|
||||||
branches. Don't migrate it for all of them.
|
branches. Don't migrate it for all of them.
|
||||||
|
@ -38,5 +39,5 @@ index 2724f6848a..6650a3d7b7 100644
|
||||||
const size_t hw_compat_rhel_8_6_len = G_N_ELEMENTS(hw_compat_rhel_8_6);
|
const size_t hw_compat_rhel_8_6_len = G_N_ELEMENTS(hw_compat_rhel_8_6);
|
||||||
|
|
||||||
--
|
--
|
||||||
2.37.3
|
2.41.0
|
||||||
|
|
|
@ -1,17 +1,18 @@
|
||||||
From 997516a14cb8811558f4db1710e728007a3b53fb Mon Sep 17 00:00:00 2001
|
From 3deffc03c2e9b0053eec5aeb5b5d633dfe29f499 Mon Sep 17 00:00:00 2001
|
||||||
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||||||
Date: Wed, 6 Apr 2022 14:58:12 -0400
|
Date: Wed, 6 Apr 2022 14:58:12 -0400
|
||||||
Subject: [PATCH 1/2] acpi: fix acpi_index migration
|
Subject: [PATCH 1/3] acpi: fix acpi_index migration
|
||||||
MIME-Version: 1.0
|
MIME-Version: 1.0
|
||||||
Content-Type: text/plain; charset=UTF-8
|
Content-Type: text/plain; charset=UTF-8
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
RH-Author: Peter Xu <peterx@redhat.com>
|
RH-Author: Peter Xu <peterx@redhat.com>
|
||||||
RH-MergeRequest: 317: acpi: fix acpi_index migration
|
RH-MergeRequest: 343: acpi: fix acpi_index migration
|
||||||
RH-Jira: RHEL-2186
|
RH-Jira: RHEL-20189
|
||||||
RH-Acked-by: Ani Sinha <None>
|
|
||||||
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
||||||
RH-Commit: [1/2] e49dace989531e940dca1c6e9df5f75ebee411a2
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||||||
|
RH-Acked-by: Prasad Pandit <None>
|
||||||
|
RH-Commit: [1/2] c5b9cdf5791cd856207b7df7e2ef5df360ec8de4
|
||||||
|
|
||||||
vmstate_acpi_pcihp_use_acpi_index() was expecting AcpiPciHpState
|
vmstate_acpi_pcihp_use_acpi_index() was expecting AcpiPciHpState
|
||||||
as state but it actually received PIIX4PMState, because
|
as state but it actually received PIIX4PMState, because
|
||||||
|
@ -160,5 +161,5 @@ index af1a169fc3..7e268c2c9c 100644
|
||||||
VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \
|
VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \
|
||||||
test_pcihp), \
|
test_pcihp), \
|
||||||
--
|
--
|
||||||
2.37.3
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
From 837e09b1a8a38b53488f59aad090fbe6bb94e257 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Huth <thuth@redhat.com>
|
||||||
|
Date: Fri, 17 Nov 2023 11:32:37 +0100
|
||||||
|
Subject: [PATCH 2/3] dump: Add arch cleanup function
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||||||
|
RH-MergeRequest: 323: Fix problem that secure execution guest might remain in "paused" state after failed dump
|
||||||
|
RH-Jira: RHEL-16696
|
||||||
|
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||||||
|
RH-Commit: [2/3] b70f406dec88ffd4877f3d5d580fc8f821bdb252
|
||||||
|
|
||||||
|
JIRA: https://issues.redhat.com/browse/RHEL-16696
|
||||||
|
|
||||||
|
commit e72629e5149aba6f44122ea6d2a803ef136a0c6b
|
||||||
|
Author: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Date: Thu Nov 9 12:04:42 2023 +0000
|
||||||
|
|
||||||
|
dump: Add arch cleanup function
|
||||||
|
|
||||||
|
Some architectures (s390x) need to cleanup after a failed dump to be
|
||||||
|
able to continue to run the vm. Add a cleanup function pointer and
|
||||||
|
call it if it's set.
|
||||||
|
|
||||||
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||||||
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
Message-ID: <20231109120443.185979-3-frankja@linux.ibm.com>
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||||
|
---
|
||||||
|
dump/dump.c | 4 ++++
|
||||||
|
include/sysemu/dump-arch.h | 1 +
|
||||||
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/dump/dump.c b/dump/dump.c
|
||||||
|
index 5dee060b73..93edb89547 100644
|
||||||
|
--- a/dump/dump.c
|
||||||
|
+++ b/dump/dump.c
|
||||||
|
@@ -100,6 +100,10 @@ uint64_t cpu_to_dump64(DumpState *s, uint64_t val)
|
||||||
|
|
||||||
|
static int dump_cleanup(DumpState *s)
|
||||||
|
{
|
||||||
|
+ if (s->dump_info.arch_cleanup_fn) {
|
||||||
|
+ s->dump_info.arch_cleanup_fn(s);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
guest_phys_blocks_free(&s->guest_phys_blocks);
|
||||||
|
memory_mapping_list_free(&s->list);
|
||||||
|
close(s->fd);
|
||||||
|
diff --git a/include/sysemu/dump-arch.h b/include/sysemu/dump-arch.h
|
||||||
|
index 59bbc9be38..743916e46c 100644
|
||||||
|
--- a/include/sysemu/dump-arch.h
|
||||||
|
+++ b/include/sysemu/dump-arch.h
|
||||||
|
@@ -24,6 +24,7 @@ typedef struct ArchDumpInfo {
|
||||||
|
void (*arch_sections_add_fn)(DumpState *s);
|
||||||
|
uint64_t (*arch_sections_write_hdr_fn)(DumpState *s, uint8_t *buff);
|
||||||
|
int (*arch_sections_write_fn)(DumpState *s, uint8_t *buff);
|
||||||
|
+ void (*arch_cleanup_fn)(DumpState *s);
|
||||||
|
} ArchDumpInfo;
|
||||||
|
|
||||||
|
struct GuestPhysBlockList; /* memory_mapping.h */
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue