eace179c9a
- kvm-virtio-kconfig-memory-devices-are-PCI-only.patch [RHEL-72977] - kvm-hw-s390-ccw-device-Convert-to-three-phase-reset.patch [RHEL-72977] - kvm-hw-s390-virtio-ccw-Convert-to-three-phase-reset.patch [RHEL-72977] - kvm-target-s390-Convert-CPU-to-Resettable-interface.patch [RHEL-72977] - kvm-reset-Use-ResetType-for-qemu_devices_reset-and-Machi.patch [RHEL-72977] - kvm-reset-Add-RESET_TYPE_WAKEUP.patch [RHEL-72977] - kvm-virtio-mem-Use-new-Resettable-framework-instead-of-L.patch [RHEL-72977] - kvm-virtio-mem-Add-support-for-suspend-wake-up-with-plug.patch [RHEL-72977] - kvm-virtio-mem-unplug-memory-only-during-system-resets-n.patch [RHEL-72977] - kvm-s390x-s390-virtio-ccw-don-t-crash-on-weird-RAM-sizes.patch [RHEL-72977] - kvm-s390x-s390-virtio-hcall-remove-hypercall-registratio.patch [RHEL-72977] - kvm-s390x-s390-virtio-hcall-prepare-for-more-diag500-hyp.patch [RHEL-72977] - kvm-s390x-rename-s390-virtio-hcall-to-s390-hypercall.patch [RHEL-72977] - kvm-s390x-s390-virtio-ccw-move-setting-the-maximum-guest.patch [RHEL-72977] - kvm-s390x-introduce-s390_get_memory_limit.patch [RHEL-72977] - kvm-s390x-s390-hypercall-introduce-DIAG500-STORAGE_LIMIT.patch [RHEL-72977] - kvm-s390x-s390-stattrib-kvm-prepare-for-memory-devices-a.patch [RHEL-72977] - kvm-s390x-s390-skeys-prepare-for-memory-devices.patch [RHEL-72977] - kvm-s390x-s390-virtio-ccw-prepare-for-memory-devices.patch [RHEL-72977] - kvm-s390x-pv-prepare-for-memory-devices.patch [RHEL-72977] - kvm-s390x-remember-the-maximum-page-size.patch [RHEL-72977] - kvm-s390x-virtio-ccw-add-support-for-virtio-based-memory.patch [RHEL-72977] - kvm-s390x-virtio-mem-support.patch [RHEL-72977] - kvm-hw-virtio-Also-include-md-stubs-in-case-CONFIG_VIRTI.patch [RHEL-72977] - kvm-virtio-mem-don-t-warn-about-THP-sizes-on-a-kernel-wi.patch [RHEL-72977] - kvm-redhat-Enable-virtio-mem-on-s390x.patch [RHEL-72977] - Resolves: RHEL-72977 ([IBM 9.7 FEAT] KVM: Enable virtio-mem support - qemu part)
93 lines
3.5 KiB
Diff
93 lines
3.5 KiB
Diff
From 7cbf9be09907407a64d739a2d0862af2ad08eaf5 Mon Sep 17 00:00:00 2001
|
|
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Fri, 13 Sep 2024 15:31:43 +0100
|
|
Subject: [PATCH 03/26] hw/s390/virtio-ccw: Convert to three-phase reset
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
RH-MergeRequest: 351: Enable virtio-mem support on s390x
|
|
RH-Jira: RHEL-72977
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Juraj Marcin <None>
|
|
RH-Commit: [3/26] e06ee194fa289a387433b905eb0999a048681a92 (thuth/qemu-kvm-cs)
|
|
|
|
Convert the virtio-ccw code to three-phase reset. This allows us to
|
|
remove a call to device_class_set_parent_reset(), replacing it with
|
|
the three-phase equivalent resettable_class_set_parent_phases().
|
|
Removing all the device_class_set_parent_reset() uses will allow us
|
|
to remove some of the glue code that interworks between three-phase
|
|
and legacy reset.
|
|
|
|
This is a simple conversion, with no behavioural changes.
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
|
|
Acked-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-id: 20240830145812.1967042-3-peter.maydell@linaro.org
|
|
(cherry picked from commit 6affa00d6ebebf24485667fe146470b0d6feb90d)
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
---
|
|
hw/s390x/virtio-ccw.c | 13 ++++++++-----
|
|
hw/s390x/virtio-ccw.h | 2 +-
|
|
2 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
|
|
index b4676909dd..96747318d2 100644
|
|
--- a/hw/s390x/virtio-ccw.c
|
|
+++ b/hw/s390x/virtio-ccw.c
|
|
@@ -913,14 +913,15 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t vector)
|
|
}
|
|
}
|
|
|
|
-static void virtio_ccw_reset(DeviceState *d)
|
|
+static void virtio_ccw_reset_hold(Object *obj, ResetType type)
|
|
{
|
|
- VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
|
+ VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(obj);
|
|
VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_GET_CLASS(dev);
|
|
|
|
virtio_ccw_reset_virtio(dev);
|
|
- if (vdc->parent_reset) {
|
|
- vdc->parent_reset(d);
|
|
+
|
|
+ if (vdc->parent_phases.hold) {
|
|
+ vdc->parent_phases.hold(obj, type);
|
|
}
|
|
}
|
|
|
|
@@ -1233,11 +1234,13 @@ static void virtio_ccw_device_class_init(ObjectClass *klass, void *data)
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
CCWDeviceClass *k = CCW_DEVICE_CLASS(dc);
|
|
VirtIOCCWDeviceClass *vdc = VIRTIO_CCW_DEVICE_CLASS(klass);
|
|
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
|
|
|
|
k->unplug = virtio_ccw_busdev_unplug;
|
|
dc->realize = virtio_ccw_busdev_realize;
|
|
dc->unrealize = virtio_ccw_busdev_unrealize;
|
|
- device_class_set_parent_reset(dc, virtio_ccw_reset, &vdc->parent_reset);
|
|
+ resettable_class_set_parent_phases(rc, NULL, virtio_ccw_reset_hold, NULL,
|
|
+ &vdc->parent_phases);
|
|
}
|
|
|
|
static const TypeInfo virtio_ccw_device_info = {
|
|
diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
|
|
index fac186c8f6..c7a830a194 100644
|
|
--- a/hw/s390x/virtio-ccw.h
|
|
+++ b/hw/s390x/virtio-ccw.h
|
|
@@ -57,7 +57,7 @@ struct VirtIOCCWDeviceClass {
|
|
CCWDeviceClass parent_class;
|
|
void (*realize)(VirtioCcwDevice *dev, Error **errp);
|
|
void (*unrealize)(VirtioCcwDevice *dev);
|
|
- void (*parent_reset)(DeviceState *dev);
|
|
+ ResettablePhases parent_phases;
|
|
};
|
|
|
|
/* Performance improves when virtqueue kick processing is decoupled from the
|
|
--
|
|
2.48.1
|
|
|