From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Laszlo Ersek" <lersek@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 21/22] ramfb-standalone: add migration support
Date: Wed, 18 Oct 2023 11:45:30 +0200 [thread overview]
Message-ID: <20231018094531.733211-22-clg@redhat.com> (raw)
In-Reply-To: <20231018094531.733211-1-clg@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Add a "ramfb-dev" section whenever "x-migrate" is turned on. Turn it off
by default on machines <= 8.1 for compatibility reasons.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/core/machine.c | 1 +
hw/display/ramfb-standalone.c | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index cfd1edfe20b53f2a2e5a7963f63a285fea6fef56..6305f2d7a4bbe25e0c132737bc8ebda83f7fd3a2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -34,6 +34,7 @@
GlobalProperty hw_compat_8_1[] = {
{ TYPE_PCI_BRIDGE, "x-pci-express-writeable-slt-bug", "true" },
+ { "ramfb", "x-migrate", "off" },
};
const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index 8c0094397f5b384df94cafa87cc854d4353e19f4..a96e7ebcd9fa57989475e25b75599990acbe884f 100644
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -1,4 +1,5 @@
#include "qemu/osdep.h"
+#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qemu/module.h"
#include "hw/loader.h"
@@ -15,6 +16,7 @@ struct RAMFBStandaloneState {
SysBusDevice parent_obj;
QemuConsole *con;
RAMFBState *state;
+ bool migrate;
};
static void display_update_wrapper(void *dev)
@@ -40,14 +42,39 @@ static void ramfb_realizefn(DeviceState *dev, Error **errp)
ramfb->state = ramfb_setup(errp);
}
+static bool migrate_needed(void *opaque)
+{
+ RAMFBStandaloneState *ramfb = RAMFB(opaque);
+
+ return ramfb->migrate;
+}
+
+static const VMStateDescription ramfb_dev_vmstate = {
+ .name = "ramfb-dev",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = migrate_needed,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT_POINTER(state, RAMFBStandaloneState, ramfb_vmstate, RAMFBState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static Property ramfb_properties[] = {
+ DEFINE_PROP_BOOL("x-migrate", RAMFBStandaloneState, migrate, true),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void ramfb_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+ dc->vmsd = &ramfb_dev_vmstate;
dc->realize = ramfb_realizefn;
dc->desc = "ram framebuffer standalone device";
dc->user_creatable = true;
+ device_class_set_props(dc, ramfb_properties);
}
static const TypeInfo ramfb_info = {
--
2.41.0
next prev parent reply other threads:[~2023-10-18 9:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 9:45 [PULL 00/22] vfio queue Cédric Le Goater
2023-10-18 9:45 ` [PULL 01/22] scripts/update-linux-headers: Add iommufd.h Cédric Le Goater
2023-10-18 9:45 ` [PULL 02/22] linux-headers: " Cédric Le Goater
2023-10-18 9:45 ` [PULL 03/22] vfio/common: Move IOMMU agnostic helpers to a separate file Cédric Le Goater
2023-10-18 9:45 ` [PULL 04/22] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any Cédric Le Goater
2023-10-18 9:45 ` [PULL 05/22] vfio/common: Introduce vfio_container_add|del_section_window() Cédric Le Goater
2023-10-18 9:45 ` [PULL 06/22] vfio/common: Extract out vfio_kvm_device_[add/del]_fd Cédric Le Goater
2023-10-18 9:45 ` [PULL 07/22] vfio/pci: Introduce vfio_[attach/detach]_device Cédric Le Goater
2023-10-18 9:45 ` [PULL 08/22] vfio/platform: Use vfio_[attach/detach]_device Cédric Le Goater
2023-10-18 9:45 ` [PULL 09/22] vfio/ap: " Cédric Le Goater
2023-10-18 9:45 ` [PULL 10/22] vfio/ccw: " Cédric Le Goater
2023-10-18 9:45 ` [PULL 11/22] vfio/common: Move VFIO reset handler registration to a group agnostic function Cédric Le Goater
2023-10-18 9:45 ` [PULL 12/22] vfio/common: Introduce a per container device list Cédric Le Goater
2023-10-18 9:45 ` [PULL 13/22] vfio/common: Store the parent container in VFIODevice Cédric Le Goater
2023-10-18 9:45 ` [PULL 14/22] vfio/common: Introduce a global VFIODevice list Cédric Le Goater
2023-10-18 9:45 ` [PULL 15/22] vfio/common: Move legacy VFIO backend code into separate container.c Cédric Le Goater
2023-10-18 9:45 ` [PULL 16/22] vfio/pci: Fix a potential memory leak in vfio_listener_region_add Cédric Le Goater
2023-10-18 9:45 ` [PULL 17/22] vfio/ap: Remove pointless apdev variable Cédric Le Goater
2023-10-18 9:45 ` [PULL 18/22] vfio/ccw: Remove redundant definition of TYPE_VFIO_CCW Cédric Le Goater
2023-10-18 9:45 ` [PULL 19/22] vfio/pci: Remove vfio_detach_device from vfio_realize error path Cédric Le Goater
2023-10-18 9:45 ` [PULL 20/22] ramfb: add migration support Cédric Le Goater
2023-10-18 9:45 ` Cédric Le Goater [this message]
2023-10-18 9:45 ` [PULL 22/22] hw/vfio: add ramfb " Cédric Le Goater
2023-10-18 22:32 ` [PULL 00/22] vfio queue Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018094531.733211-22-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=kraxel@redhat.com \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).