Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2021-02-01 14:41:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Mon Feb 1 14:41:57 2021 rev:194 rq:867746 version:5.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2021-01-29 14:56:39.941471308 +0100
+++ /work/SRC/openSUSE:Factory/.qemu.new.28504/qemu.changes 2021-02-01 14:41:58.820691585 +0100
@@ -1,0 +2,14 @@
+Fri Jan 29 14:41:19 UTC 2021 - Bruce Rogers
+
+- Additional tweaks to ensure libvirt runs ok when
+ qemu-hw-display-virtio-gpu package is not installed
+
+-------------------------------------------------------------------
+Fri Jan 29 02:47:35 UTC 2021 - Lin Ma
+
+- Use '%service_del_postun_without_restart' instead of
+ '%service_del_postun' to avoid "Failed to try-restart
+ qemu-ga@.service" error while updating the qemu-guest-agent.
+ (bsc#1178565)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.NInK4a/_old 2021-02-01 14:42:01.576695536 +0100
+++ /var/tmp/diff_new_pack.NInK4a/_new 2021-02-01 14:42:01.580695541 +0100
@@ -1759,7 +1759,12 @@
fi
%postun guest-agent
-%service_del_postun qemu-ga@.service
+%service_del_postun_without_restart qemu-ga@.service
+if [ "$1" = "1" ] ; then
+ if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then
+ /usr/bin/systemctl restart qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || :
+ fi
+fi
%pre ksm
%service_add_pre ksm.service
++++++ bundles.tar.xz ++++++
Binary files old/553032db17440f8de011390e5a1cfddd13751b0b.bundle and new/553032db17440f8de011390e5a1cfddd13751b0b.bundle differ
++++++ module-for-virtio-gpu-pre-load-module-to.patch ++++++
--- /var/tmp/diff_new_pack.NInK4a/_old 2021-02-01 14:42:02.096696281 +0100
+++ /var/tmp/diff_new_pack.NInK4a/_new 2021-02-01 14:42:02.096696281 +0100
@@ -4,16 +4,17 @@
module
If the hw-display-virtio-gpu module is not loadable when the virtio-gpu
-device is on the commandline or being added in monitor, qemu will call
-abort. We can fail gracefully by doing the module load in a context
-which is set up to handle errors properly. (bsc#1181103)
+device is referenced either on the command line or the monitor, qemu
+will call abort. We can fail gracefully by moving the attempted module
+load to a context better situated to handle errors properly. (bsc#1181103)
Signed-off-by: Bruce Rogers
---
include/qemu/module.h | 1 +
qom/object.c | 12 ++++++++++++
- softmmu/qdev-monitor.c | 8 ++++++++
- 3 files changed, 21 insertions(+)
+ qom/qom-qmp-cmds.c | 17 +++++++++++++++++
+ softmmu/qdev-monitor.c | 15 +++++++++++++++
+ 4 files changed, 45 insertions(+)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 944d403cbd1535cc121af76a94f2..4b42dd285eeac1ba12e5c9e18ac0 100644
@@ -49,11 +50,53 @@
void object_initialize(void *data, size_t size, const char *typename)
{
TypeImpl *type = type_get_by_name(typename);
+diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
+index 310ab2d0481d1517b0432be23256..cf130dc875bb6a7921fd7fb5af26 100644
+--- a/qom/qom-qmp-cmds.c
++++ b/qom/qom-qmp-cmds.c
+@@ -131,6 +131,23 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
+ ObjectPropertyIterator iter;
+ ObjectPropertyInfoList *prop_list = NULL;
+
++#ifdef CONFIG_MODULES
++ if (!strcmp(typename, "virtio-gpu-pci") || !strcmp(typename, "virtio-gpu-ccw")) {
++ if (module_load_check("virtio-gpu-device")) {
++ ObjectPropertyInfo *info;
++ info = g_new0(ObjectPropertyInfo, 1);
++ info->name = g_strdup("dummy");
++ info->type = g_strdup("dummy");
++ info->has_description = false;
++ info->description = NULL;
++ info->default_value = 0;
++ info->has_default_value = 0;
++ QAPI_LIST_PREPEND(prop_list, info);
++ return prop_list;
++ }
++ }
++#endif
++
+ klass = module_object_class_by_name(typename);
+ if (klass == NULL) {
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
-index bf79d0bbcd986320eb609f37253e..7f6ad469638ba55a5bb8bfd02fe3 100644
+index bf79d0bbcd986320eb609f37253e..564dfaeeda9c3ae9dbf1afa97825 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
-@@ -650,6 +650,14 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
+@@ -263,6 +263,13 @@ int qdev_device_help(QemuOpts *opts)
+ int i;
+
+ driver = qemu_opt_get(opts, "driver");
++#ifdef CONFIG_MODULES
++ if (driver && !strcmp(driver, "virtio-gpu")) {
++ if (module_load_check("virtio-gpu-device")) {
++ return 0;
++ }
++ }
++#endif
+ if (driver && is_help_option(driver)) {
+ qdev_print_devinfos(false);
+ return 1;
+@@ -650,6 +657,14 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
return NULL;
}
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.NInK4a/_old 2021-02-01 14:42:02.244696493 +0100
+++ /var/tmp/diff_new_pack.NInK4a/_new 2021-02-01 14:42:02.248696499 +0100
@@ -1618,7 +1618,12 @@
fi
%postun guest-agent
-%service_del_postun qemu-ga@.service
+%service_del_postun_without_restart qemu-ga@.service
+if [ "$1" = "1" ] ; then
+ if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then
+ /usr/bin/systemctl restart qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || :
+ fi
+fi
%pre ksm
%service_add_pre ksm.service
++++++ qom-handle-case-of-chardev-spice-module-.patch ++++++
--- /var/tmp/diff_new_pack.NInK4a/_old 2021-02-01 14:42:02.264696522 +0100
+++ /var/tmp/diff_new_pack.NInK4a/_new 2021-02-01 14:42:02.268696528 +0100
@@ -6,7 +6,7 @@
qemu should handle that gracefully. When chardev-spice.so isn't
able to be loaded and qemu is invoked with -display spice-app,
qemu will reach an abort call. Explicitly detect these conditions
-and error out in a normal way before we reach that code.
+and error out in a normal way before we reach the abort.
Signed-off-by: Bruce Rogers
---