mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-15 06:01:58 -06:00
ui/vdagent: remove migration blocker
Fixes: https://issues.redhat.com/browse/RHEL-81894 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
5d56bff11e
commit
42000e0013
1 changed files with 0 additions and 11 deletions
11
ui/vdagent.c
11
ui/vdagent.c
|
@ -6,7 +6,6 @@
|
||||||
#include "qemu/option.h"
|
#include "qemu/option.h"
|
||||||
#include "qemu/units.h"
|
#include "qemu/units.h"
|
||||||
#include "hw/qdev-core.h"
|
#include "hw/qdev-core.h"
|
||||||
#include "migration/blocker.h"
|
|
||||||
#include "ui/clipboard.h"
|
#include "ui/clipboard.h"
|
||||||
#include "ui/console.h"
|
#include "ui/console.h"
|
||||||
#include "ui/input.h"
|
#include "ui/input.h"
|
||||||
|
@ -33,9 +32,6 @@
|
||||||
struct VDAgentChardev {
|
struct VDAgentChardev {
|
||||||
Chardev parent;
|
Chardev parent;
|
||||||
|
|
||||||
/* TODO: migration isn't yet supported */
|
|
||||||
Error *migration_blocker;
|
|
||||||
|
|
||||||
/* config */
|
/* config */
|
||||||
bool mouse;
|
bool mouse;
|
||||||
bool clipboard;
|
bool clipboard;
|
||||||
|
@ -673,10 +669,6 @@ static void vdagent_chr_open(Chardev *chr,
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (migrate_add_blocker(&vd->migration_blocker, errp) != 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
vd->mouse = VDAGENT_MOUSE_DEFAULT;
|
vd->mouse = VDAGENT_MOUSE_DEFAULT;
|
||||||
if (cfg->has_mouse) {
|
if (cfg->has_mouse) {
|
||||||
vd->mouse = cfg->mouse;
|
vd->mouse = cfg->mouse;
|
||||||
|
@ -1076,8 +1068,6 @@ static void vdagent_chr_init(Object *obj)
|
||||||
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj);
|
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj);
|
||||||
|
|
||||||
vd->outbuf = g_byte_array_new();
|
vd->outbuf = g_byte_array_new();
|
||||||
error_setg(&vd->migration_blocker,
|
|
||||||
"The vdagent chardev doesn't yet support migration");
|
|
||||||
vmstate_register_any(NULL, &vmstate_vdagent, vd);
|
vmstate_register_any(NULL, &vmstate_vdagent, vd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1085,7 +1075,6 @@ static void vdagent_chr_fini(Object *obj)
|
||||||
{
|
{
|
||||||
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj);
|
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(obj);
|
||||||
|
|
||||||
migrate_del_blocker(&vd->migration_blocker);
|
|
||||||
vdagent_disconnect(vd);
|
vdagent_disconnect(vd);
|
||||||
if (vd->mouse_hs) {
|
if (vd->mouse_hs) {
|
||||||
qemu_input_handler_unregister(vd->mouse_hs);
|
qemu_input_handler_unregister(vd->mouse_hs);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue