[libvirt PATCH] Send event on persistent config modification
by Efim Shevrin
>From 32dbfbf9857ea72b69ea175ea7f8b21210f4e5d2 Mon Sep 17 00:00:00 2001
From: Efim Shevrin <efim.shevrin(a)virtuozzo.com>
Date: Tue, 10 May 2022 17:03:11 +0300
Subject: [PATCH] Send event on persistent config modification
Libvirt is not sending events in case of a device update, thus any services
listening to events are unaware of the changes.This patch suggests to send event in
case of a persistent config modification, it should keep subscribed services in sync with VM configuration.
Signed-off-by: Efim Shevrin <efim.shevrin(a)virtuozzo.com>
---
src/qemu/qemu_driver.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e3582f62a7..6008a4c8f3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7942,6 +7942,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
virQEMUDriver *driver = dom->conn->privateData;
virDomainObj *vm = NULL;
qemuDomainObjPrivate *priv;
+ virObjectEvent *event = NULL;
g_autoview.settings().get('font_face')ptr(virDomainDef) vmdef = NULL;
g_autoptr(virDomainDeviceDef) dev = NULL;
virDomainDeviceDef *dev_copy = NULL;
@@ -8019,8 +8020,16 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
- if (!ret)
+ if (!ret) {
virDomainObjAssignDef(vm, &vmdef, false, NULL);
+
+ /* Event sending if persistent config has changed */
+ event = virDomainEventLifecycleNewFromObj(vm,
+ VIR_DOMAIN_EVENT_DEFINED,
+ VIR_DOMAIN_EVENT_DEFINED_UPDATED);
+
+ virObjectEventStateQueue(driver->domainEventState, event);
+ }
}
endjob:
--
2.31.1
2 years, 10 months
libvirt patch in master, [PATCH] Send event on persistent config modification
by Efim Shevrin
>From 32dbfbf9857ea72b69ea175ea7f8b21210f4e5d2 Mon Sep 17 00:00:00 2001
From: Efim Shevrin <efim.shevrin(a)virtuozzo.com>
Date: Tue, 10 May 2022 17:03:11 +0300
Subject: [PATCH] Send event on persistent config modification
Libvirt is not sending events in case of a device update, thus any services
listening to events are unaware of the changes.This patch suggests to send event in
case of a persistent config modification, it should keep subscribed services in sync with VM configuration.
Signed-off-by: Efim Shevrin <efim.shevrin(a)virtuozzo.com>
---
src/qemu/qemu_driver.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e3582f62a7..6008a4c8f3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7942,6 +7942,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
virQEMUDriver *driver = dom->conn->privateData;
virDomainObj *vm = NULL;
qemuDomainObjPrivate *priv;
+ virObjectEvent *event = NULL;
g_autoview.settings().get('font_face')ptr(virDomainDef) vmdef = NULL;
g_autoptr(virDomainDeviceDef) dev = NULL;
virDomainDeviceDef *dev_copy = NULL;
@@ -8019,8 +8020,16 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
- if (!ret)
+ if (!ret) {
virDomainObjAssignDef(vm, &vmdef, false, NULL);
+
+ /* Event sending if persistent config has changed */
+ event = virDomainEventLifecycleNewFromObj(vm,
+ VIR_DOMAIN_EVENT_DEFINED,
+ VIR_DOMAIN_EVENT_DEFINED_UPDATED);
+
+ virObjectEventStateQueue(driver->domainEventState, event);
+ }
}
endjob:
--
2.31.1
2 years, 10 months
[libvirt PATCH 0/4] qemu: Drop QEMU_CAPS_MIGRATION_EVENT
by Jiri Denemark
All QEMU versions we care about already support migration events.
Jiri Denemark (4):
qemu: Drop QEMU_CAPS_MIGRATION_EVENT
qemu: Refactor qemuDomainGetJobInfoMigrationStats
qemu: Make migration events mandatory
qemu: Enable migration events only for fresh QEMU process
src/qemu/qemu_capabilities.c | 3 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_driver.c | 36 +++++++++---------
src/qemu/qemu_migration.c | 37 ++++---------------
src/qemu/qemu_migration_params.c | 15 +++-----
src/qemu/qemu_migration_params.h | 3 +-
src/qemu/qemu_process.c | 14 ++++---
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
.../caps_3.1.0.x86_64.xml | 1 -
.../caps_4.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
.../caps_4.0.0.riscv32.xml | 1 -
.../caps_4.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
.../caps_4.0.0.x86_64.xml | 1 -
.../caps_4.1.0.x86_64.xml | 1 -
.../caps_4.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
.../caps_4.2.0.x86_64.xml | 1 -
.../caps_5.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
.../caps_5.0.0.riscv64.xml | 1 -
.../caps_5.0.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
.../caps_5.1.0.x86_64.xml | 1 -
.../caps_5.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
.../caps_5.2.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
.../caps_5.2.0.x86_64.xml | 1 -
.../caps_6.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
.../caps_6.0.0.x86_64.xml | 1 -
.../caps_6.1.0.x86_64.xml | 1 -
.../caps_6.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
.../caps_6.2.0.x86_64.xml | 1 -
.../caps_7.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
.../caps_7.0.0.x86_64.xml | 1 -
.../caps_7.1.0.x86_64.xml | 1 -
42 files changed, 46 insertions(+), 99 deletions(-)
--
2.35.1
2 years, 10 months
[libvirt PATCH v2 0/5] ci: Add an integration test job utilizing upstream QEMU
by Erik Skultety
Since QEMU doesn't maintain a spec file in upstream, we cannot build RPM
artifacts as part of the CI as we do for libvirt. Instead, we build QEMU from
source manually.
Since v1:
- hard-code the QEMU build steps rather than pulling the build template from
upstream QEMU's CI due to a possibility of QEMU moving the template file or
renaming the build template itself
-> only patch 3/5 was modified, the rest remained the same
Successful pipeline:
https://gitlab.com/eskultety/libvirt/-/pipelines/537225094
Erik Skultety (5):
ci: Separate the integration job template to a separate file
ci: Break off the integration_tests template into more templates
ci: Introduce a template for upstream QEMU build
ci: Add a new integration job template for the upstream QEMU scenario
ci: Add a Fedora integration test job utilizing upstream QEMU
ci/integration-template.yml | 100 ++++++++++++++++++++++++++++++++++++
ci/integration.yml | 70 +++++++------------------
2 files changed, 118 insertions(+), 52 deletions(-)
create mode 100644 ci/integration-template.yml
--
2.34.3
2 years, 10 months
[PATCH] lib: Rename VIR_SAVE_PARAM_* to VIR_DOMAIN_SAVE_PARAM_*
by Michal Privoznik
A few commits ago new APIs were introduced (virDomainSaveParams()
and virDomainRestoreParams()) and with them new typed parameters:
VIR_SAVE_PARAM_FILE and VIR_SAVE_PARAM_DXML. But their name does
not suggest they apply to either of the APIs nor that they are
intended for domain related APIs. Switch to
VIR_DOMAIN_SAVE_PARAM prefix to make it obvious.
It's true we already have VIR_DOMAIN_SAVE_* symbols which are
part of virDomainSaveRestoreFlags enum, therefore stick also with
'_PARAM_ ' part of the name to differentiate the two.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
include/libvirt/libvirt-domain.h | 8 ++++----
src/qemu/qemu_driver.c | 22 ++++++++++++++--------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index cf9d9efd51..24846046aa 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1579,16 +1579,16 @@ int virDomainRestoreParams (virConnectPtr conn,
unsigned int flags);
/**
- * VIR_SAVE_PARAM_FILE:
+ * VIR_DOMAIN_SAVE_PARAM_FILE:
*
* the parameter used to specify the savestate file to save to or restore from.
*
* Since: 8.4.0
*/
-# define VIR_SAVE_PARAM_FILE "file"
+# define VIR_DOMAIN_SAVE_PARAM_FILE "file"
/**
- * VIR_SAVE_PARAM_DXML:
+ * VIR_DOMAIN_SAVE_PARAM_DXML:
*
* an optional parameter used to adjust guest xml on restore.
* If the hypervisor supports it, it can be used to alter
@@ -1598,7 +1598,7 @@ int virDomainRestoreParams (virConnectPtr conn,
*
* Since: 8.4.0
*/
-# define VIR_SAVE_PARAM_DXML "dxml"
+# define VIR_DOMAIN_SAVE_PARAM_DXML "dxml"
/* See below for virDomainSaveImageXMLFlags */
char * virDomainSaveImageGetXMLDesc (virConnectPtr conn,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e3582f62a7..41c6836390 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2823,14 +2823,18 @@ qemuDomainSaveParams(virDomainPtr dom,
VIR_DOMAIN_SAVE_PAUSED, -1);
if (virTypedParamsValidate(params, nparams,
- VIR_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING,
- VIR_SAVE_PARAM_DXML, VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_SAVE_PARAM_FILE,
+ VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_SAVE_PARAM_DXML,
+ VIR_TYPED_PARAM_STRING,
NULL) < 0)
return -1;
- if (virTypedParamsGetString(params, nparams, VIR_SAVE_PARAM_FILE, &to) < 0)
+ if (virTypedParamsGetString(params, nparams,
+ VIR_DOMAIN_SAVE_PARAM_FILE, &to) < 0)
return -1;
- if (virTypedParamsGetString(params, nparams, VIR_SAVE_PARAM_DXML, &dxml) < 0)
+ if (virTypedParamsGetString(params, nparams,
+ VIR_DOMAIN_SAVE_PARAM_DXML, &dxml) < 0)
return -1;
cfg = virQEMUDriverGetConfig(driver);
@@ -5936,14 +5940,16 @@ qemuDomainRestoreParams(virConnectPtr conn,
int ret = -1;
if (virTypedParamsValidate(params, nparams,
- VIR_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING,
- VIR_SAVE_PARAM_DXML, VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING,
+ VIR_DOMAIN_SAVE_PARAM_DXML, VIR_TYPED_PARAM_STRING,
NULL) < 0)
return -1;
- if (virTypedParamsGetString(params, nparams, VIR_SAVE_PARAM_FILE, &path) < 0)
+ if (virTypedParamsGetString(params, nparams,
+ VIR_DOMAIN_SAVE_PARAM_FILE, &path) < 0)
return -1;
- if (virTypedParamsGetString(params, nparams, VIR_SAVE_PARAM_DXML, &dxml) < 0)
+ if (virTypedParamsGetString(params, nparams,
+ VIR_DOMAIN_SAVE_PARAM_DXML, &dxml) < 0)
return -1;
ret = qemuDomainRestoreInternal(conn, path, dxml, flags,
--
2.35.1
2 years, 10 months
[libvirt PATCH 0/4] Validate spice features without spice graphics
by Martin Kletzander
Without spice graphics non of the spicevmc, spiceport and spice audiodev do not
make sense. We could also check if the QEMU supports spice, but that check
would be a redundant check, which is redundant.
Martin Kletzander (4):
Remove serial-spiceport-nospice test
tests: Adjust for invalid qemu command combinations
conf: Add virDomainDefHasSpiceGraphics
qemu: Disable spice-related devices without spice graphics
src/conf/domain_conf.c | 14 ++++++
src/conf/domain_conf.h | 3 ++
src/libvirt_private.syms | 1 +
src/qemu/qemu_validate.c | 34 ++++++++++----
.../audio-spice-best.x86_64-4.1.0.args | 3 +-
.../audio-spice-best.x86_64-latest.args | 3 +-
tests/qemuxml2argvdata/audio-spice-best.xml | 7 +++
.../audio-spice-full.x86_64-latest.args | 3 +-
tests/qemuxml2argvdata/audio-spice-full.xml | 7 +++
.../audio-spice-minimal.x86_64-4.1.0.args | 3 +-
.../audio-spice-minimal.x86_64-latest.args | 3 +-
.../qemuxml2argvdata/audio-spice-minimal.xml | 7 +++
.../channel-virtio-default.args | 9 ++--
.../channel-virtio-default.xml | 1 +
.../serial-spiceport-nospice.args | 33 -------------
...erial-spiceport-nospice.x86_64-latest.args | 37 ---------------
.../serial-spiceport-nospice.xml | 37 ---------------
.../smartcard-passthrough-spicevmc.args | 7 +--
.../smartcard-passthrough-spicevmc.xml | 1 +
tests/qemuxml2argvdata/usb-redir-boot.args | 7 +--
tests/qemuxml2argvdata/usb-redir-boot.xml | 1 +
.../usb-redir-filter-version.args | 7 +--
.../usb-redir-filter-version.xml | 1 +
tests/qemuxml2argvdata/usb-redir-filter.args | 7 +--
tests/qemuxml2argvdata/usb-redir-filter.xml | 1 +
tests/qemuxml2argvdata/usb-redir.args | 7 +--
tests/qemuxml2argvdata/usb-redir.xml | 1 +
tests/qemuxml2argvtest.c | 21 +++++----
.../serial-spiceport-nospice.xml | 47 -------------------
.../smartcard-passthrough-spicevmc.xml | 11 ++++-
.../usb-redir-filter-version.xml | 11 ++++-
tests/qemuxml2xmloutdata/usb-redir-filter.xml | 11 ++++-
tests/qemuxml2xmloutdata/usb-redir.xml | 11 ++++-
tests/qemuxml2xmltest.c | 31 ++++++++----
34 files changed, 178 insertions(+), 210 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.args
delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.xml
delete mode 100644 tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
--
2.35.1
2 years, 10 months
[PATCH 0/4] qemu: Move originalMemlock
by Michal Privoznik
As I tried to explain the purpose of virDomainObj to somebody I've
came across this very weirdly placed member: originalMemlock. Let's move
it into qemuDomainObjPrivate. But after I've done so I've realized the
error label is needless. So that's dropped too.
Michal Prívozník (4):
conf: Move virDomainObj::originalMemlock into qemuDomainObjPrivate
qemu_domain: Format qemuDomainObjPrivate::originalMemlock
qemu_domain: Drop needless free from qemuDomainObjPrivateXMLParse()
qemu_domain: Drop needless 'error' label in
qemuDomainObjPrivateXMLParse()
src/conf/domain_conf.h | 3 --
src/qemu/qemu_domain.c | 76 +++++++++++++++++++++++-------------------
src/qemu/qemu_domain.h | 3 ++
3 files changed, 45 insertions(+), 37 deletions(-)
--
2.35.1
2 years, 10 months
[libvirt PATCH 0/5] ci: Add an integration test job utilizing upstream QEMU
by Erik Skultety
Since QEMU doesn't maintain a spec file in upstream, we cannot build RPM
artifacts as part of the CI as we do for libvirt. Instead of hard-coding the
build steps for QEMU though patch 3/5 pulls in QEMU's CI job template which
means we'll remain in sync if QEMU makes changes to its build process.
Erik Skultety (5):
ci: Separate the integration job template to a separate file
ci: Break off the integration_tests template into more templates
ci: Introduce a template for upstream QEMU build
ci: Add a new integration job template for the upstream QEMU scenario
ci: Add a Fedora integration test job utilizing upstream QEMU
ci/integration-template.yml | 98 +++++++++++++++++++++++++++++++++++++
ci/integration.yml | 70 +++++++-------------------
2 files changed, 116 insertions(+), 52 deletions(-)
create mode 100644 ci/integration-template.yml
--
2.34.1
2 years, 10 months
[PATCH] ui: Remove deprecated parameters of -display sdl and switch to QAPI parser
by Thomas Huth
The "-display sdl" option still used a hand-crafted parser for its
parameters since some of them used underscores which is forbidden
in QAPI. Now that they've been deprecated and the deprecation period
is over, we can remove the problematic parameters and switch to use
the QAPI parser instead.
Signed-off-by: Thomas Huth <thuth(a)redhat.com>
---
docs/about/deprecated.rst | 16 -----
docs/about/removed-features.rst | 17 +++++
qapi/ui.json | 16 ++++-
include/sysemu/sysemu.h | 2 -
softmmu/globals.c | 2 -
softmmu/vl.c | 109 +-------------------------------
ui/sdl2.c | 13 ++++
qemu-options.hx | 32 +---------
8 files changed, 48 insertions(+), 159 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 896e5a97ab..ce7a5b97fc 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -109,22 +109,6 @@ other options have been processed. This will either have no effect (if
if they were not given. The property is therefore useless and should not be
specified.
-``-display sdl,window_close=...`` (since 6.1)
-'''''''''''''''''''''''''''''''''''''''''''''
-
-Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of
-an underscore between "window" and "close").
-
-``-alt-grab`` and ``-display sdl,alt_grab=on`` (since 6.2)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
-
-``-ctrl-grab`` and ``-display sdl,ctrl_grab=on`` (since 6.2)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-Use ``-display sdl,grab-mod=rctrl`` instead.
-
``-sdl`` (since 6.2)
''''''''''''''''''''
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 4a0b270296..51bfc844f6 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -355,6 +355,23 @@ The ``-writeconfig`` option was not able to serialize the entire contents
of the QEMU command line. It is thus considered a failed experiment
and removed without a replacement.
+``-display sdl,window_close=...`` (removed in 7.1)
+''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of
+an underscore between "window" and "close").
+
+``-alt-grab`` and ``-display sdl,alt_grab=on`` (removed in 7.1)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
+
+``-ctrl-grab`` and ``-display sdl,ctrl_grab=on`` (removed in 7.1)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Use ``-display sdl,grab-mod=rctrl`` instead.
+
+
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/qapi/ui.json b/qapi/ui.json
index 059302a5ef..7d5097808a 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1309,6 +1309,19 @@
'*swap-opt-cmd': 'bool'
} }
+##
+# @DisplaySDL:
+#
+# SDL2 display options.
+#
+# @grab-mod: Modifier keys that should be pressed together
+# with "G" to release the mouse grab.
+#
+# Since: 7.1
+##
+{ 'struct' : 'DisplaySDL',
+ 'data' : { '*grab-mod' : 'str' } }
+
##
# @DisplayType:
#
@@ -1391,7 +1404,8 @@
'curses': { 'type': 'DisplayCurses', 'if': 'CONFIG_CURSES' },
'egl-headless': { 'type': 'DisplayEGLHeadless',
'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } },
- 'dbus': { 'type': 'DisplayDBus', 'if': 'CONFIG_DBUS_DISPLAY' }
+ 'dbus': { 'type': 'DisplayDBus', 'if': 'CONFIG_DBUS_DISPLAY' },
+ 'sdl': { 'type': 'DisplaySDL', 'if': 'CONFIG_SDL' }
}
}
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 360a408edf..7cca797450 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -42,8 +42,6 @@ extern int graphic_depth;
extern int display_opengl;
extern const char *keyboard_layout;
extern int win2k_install_hack;
-extern int alt_grab;
-extern int ctrl_grab;
extern int graphic_rotate;
extern int old_param;
extern int boot_menu;
diff --git a/softmmu/globals.c b/softmmu/globals.c
index 98b64e0492..12611c2a7a 100644
--- a/softmmu/globals.c
+++ b/softmmu/globals.c
@@ -50,8 +50,6 @@ QEMUOptionRom option_rom[MAX_OPTION_ROMS];
int nb_option_roms;
int old_param;
const char *qemu_name;
-int alt_grab;
-int ctrl_grab;
unsigned int nb_prom_envs;
const char *prom_envs[MAX_PROM_ENVS];
int boot_menu;
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 488cc4d09e..90a0a4d393 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1045,100 +1045,7 @@ static void parse_display(const char *p)
exit(0);
}
- if (strstart(p, "sdl", &opts)) {
- /*
- * sdl DisplayType needs hand-crafted parser instead of
- * parse_display_qapi() due to some options not in
- * DisplayOptions, specifically:
- * - ctrl_grab + alt_grab
- * They can't be moved into the QAPI since they use underscores,
- * thus they will get replaced by "grab-mod" in the long term
- */
-#if defined(CONFIG_SDL)
- dpy.type = DISPLAY_TYPE_SDL;
- while (*opts) {
- const char *nextopt;
-
- if (strstart(opts, ",grab-mod=", &nextopt)) {
- opts = nextopt;
- if (strstart(opts, "lshift-lctrl-lalt", &nextopt)) {
- alt_grab = 1;
- } else if (strstart(opts, "rctrl", &nextopt)) {
- ctrl_grab = 1;
- } else {
- goto invalid_sdl_args;
- }
- } else if (strstart(opts, ",alt_grab=", &nextopt)) {
- opts = nextopt;
- if (strstart(opts, "on", &nextopt)) {
- alt_grab = 1;
- } else if (strstart(opts, "off", &nextopt)) {
- alt_grab = 0;
- } else {
- goto invalid_sdl_args;
- }
- warn_report("alt_grab is deprecated, use grab-mod instead.");
- } else if (strstart(opts, ",ctrl_grab=", &nextopt)) {
- opts = nextopt;
- if (strstart(opts, "on", &nextopt)) {
- ctrl_grab = 1;
- } else if (strstart(opts, "off", &nextopt)) {
- ctrl_grab = 0;
- } else {
- goto invalid_sdl_args;
- }
- warn_report("ctrl_grab is deprecated, use grab-mod instead.");
- } else if (strstart(opts, ",window_close=", &nextopt) ||
- strstart(opts, ",window-close=", &nextopt)) {
- if (strstart(opts, ",window_close=", NULL)) {
- warn_report("window_close with an underscore is deprecated,"
- " please use window-close instead.");
- }
- opts = nextopt;
- dpy.has_window_close = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.window_close = true;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.window_close = false;
- } else {
- goto invalid_sdl_args;
- }
- } else if (strstart(opts, ",show-cursor=", &nextopt)) {
- opts = nextopt;
- dpy.has_show_cursor = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.show_cursor = true;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.show_cursor = false;
- } else {
- goto invalid_sdl_args;
- }
- } else if (strstart(opts, ",gl=", &nextopt)) {
- opts = nextopt;
- dpy.has_gl = true;
- if (strstart(opts, "on", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_ON;
- } else if (strstart(opts, "core", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_CORE;
- } else if (strstart(opts, "es", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_ES;
- } else if (strstart(opts, "off", &nextopt)) {
- dpy.gl = DISPLAYGL_MODE_OFF;
- } else {
- goto invalid_sdl_args;
- }
- } else {
- invalid_sdl_args:
- error_report("invalid SDL option string");
- exit(1);
- }
- opts = nextopt;
- }
-#else
- error_report("SDL display supported is not available in this binary");
- exit(1);
-#endif
- } else if (strstart(p, "vnc", &opts)) {
+ if (strstart(p, "vnc", &opts)) {
/*
* vnc isn't a (local) DisplayType but a protocol for remote
* display access.
@@ -1943,10 +1850,6 @@ static void qemu_create_early_backends(void)
const bool use_gtk = false;
#endif
- if ((alt_grab || ctrl_grab) && !use_sdl) {
- error_report("-alt-grab and -ctrl-grab are only valid "
- "for SDL, ignoring option");
- }
if (dpy.has_window_close && !use_gtk && !use_sdl) {
error_report("window-close is only valid for GTK and SDL, "
"ignoring option");
@@ -3302,16 +3205,6 @@ void qemu_init(int argc, char **argv, char **envp)
dpy.has_full_screen = true;
dpy.full_screen = true;
break;
- case QEMU_OPTION_alt_grab:
- alt_grab = 1;
- warn_report("-alt-grab is deprecated, please use "
- "-display sdl,grab-mod=lshift-lctrl-lalt instead.");
- break;
- case QEMU_OPTION_ctrl_grab:
- ctrl_grab = 1;
- warn_report("-ctrl-grab is deprecated, please use "
- "-display sdl,grab-mod=rctrl instead.");
- break;
case QEMU_OPTION_sdl:
warn_report("-sdl is deprecated, use -display sdl instead.");
#ifdef CONFIG_SDL
diff --git a/ui/sdl2.c b/ui/sdl2.c
index d3741f9b75..18c63e1fc9 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -40,6 +40,8 @@ static struct sdl2_console *sdl2_console;
static SDL_Surface *guest_sprite_surface;
static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
+static bool alt_grab;
+static bool ctrl_grab;
static int gui_saved_grab;
static int gui_fullscreen;
@@ -853,6 +855,17 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
gui_fullscreen = o->has_full_screen && o->full_screen;
+ if (o->u.sdl.has_grab_mod) {
+ if (g_str_equal(o->u.sdl.grab_mod, "lshift-lctrl-lalt")) {
+ alt_grab = true;
+ } else if (g_str_equal(o->u.sdl.grab_mod, "rctrl")) {
+ ctrl_grab = true;
+ } else {
+ error_report("Unsupported grab-mod: %s", o->u.sdl.grab_mod);
+ exit(1);
+ }
+ }
+
for (i = 0;; i++) {
QemuConsole *con = qemu_console_lookup_by_index(i);
if (!con) {
diff --git a/qemu-options.hx b/qemu-options.hx
index 796229c433..0fa873d088 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1903,8 +1903,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
"-display spice-app[,gl=on|off]\n"
#endif
#if defined(CONFIG_SDL)
- "-display sdl[,alt_grab=on|off][,ctrl_grab=on|off][,gl=on|core|es|off]\n"
- " [,grab-mod=<mod>][,show-cursor=on|off][,window-close=on|off]\n"
+ "-display sdl[,gl=on|core|es|off][,grab-mod=<mod>][,show-cursor=on|off]\n"
+ " [,window-close=on|off]\n"
#endif
#if defined(CONFIG_GTK)
"-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n"
@@ -1977,12 +1977,6 @@ SRST
the mouse grabbing in conjunction with the "g" key. ``<mods>`` can be
either ``lshift-lctrl-lalt`` or ``rctrl``.
- ``alt_grab=on|off`` : Use Control+Alt+Shift-g to toggle mouse grabbing.
- This parameter is deprecated - use ``grab-mod`` instead.
-
- ``ctrl_grab=on|off`` : Use Right-Control-g to toggle mouse grabbing.
- This parameter is deprecated - use ``grab-mod`` instead.
-
``gl=on|off|core|es`` : Use OpenGL for displaying
``show-cursor=on|off`` : Force showing the mouse cursor
@@ -2068,28 +2062,6 @@ SRST
is displayed in graphical mode.
ERST
-DEF("alt-grab", 0, QEMU_OPTION_alt_grab,
- "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n",
- QEMU_ARCH_ALL)
-SRST
-``-alt-grab``
- Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that
- this also affects the special keys (for fullscreen, monitor-mode
- switching, etc). This option is deprecated - please use
- ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
-ERST
-
-DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
- "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n",
- QEMU_ARCH_ALL)
-SRST
-``-ctrl-grab``
- Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this
- also affects the special keys (for fullscreen, monitor-mode
- switching, etc). This option is deprecated - please use
- ``-display sdl,grab-mod=rctrl`` instead.
-ERST
-
DEF("sdl", 0, QEMU_OPTION_sdl,
"-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL)
SRST
--
2.27.0
2 years, 10 months
[PATCH] docs: formatdomain: Fix the introduced version of vdagent
by Han Han
The qemu-vdagent channel is introduced since:
"05b09f039e conf: add qemu-vdagent channel"
It will be in the version 8.4.0.
Signed-off-by: Han Han <hhan(a)redhat.com>
---
docs/formatdomain.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 993c65e50b..c1e99951a6 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -6630,7 +6630,7 @@ types have different ``target`` attributes.
Mouse mode is set by the ``mouse`` element, setting its ``mode`` attribute
to one of ``server`` or ``client``. If no mode is specified, the qemu
default will be used (client mode).
- :since:`Since 8.2.0`
+ :since:`Since 8.4.0`
:anchor:`<a id="elementsCharHostInterface"/>`
--
2.36.0
2 years, 10 months
