* [Stable-8.1.2 58/61] vfio/display: Fix missing update to set backing fields
2023-10-12 7:16 [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-12-14 Michael Tokarev
@ 2023-10-12 7:16 ` Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 59/61] util/log: re-allow switching away from stderr log file Michael Tokarev
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2023-10-12 7:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-stable, Alex Williamson, Cédric Le Goater,
Michael Tokarev
From: Alex Williamson <alex.williamson@redhat.com>
The below referenced commit renames scanout_width/height to
backing_width/height, but also promotes these fields in various portions
of the egl interface. Meanwhile vfio dmabuf support has never used the
previous scanout fields and is therefore missed in the update. This
results in a black screen when transitioning from ramfb to dmabuf display
when using Intel vGPU with these features.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1891
Link: https://lists.gnu.org/archive/html/qemu-devel/2023-08/msg02726.html
Fixes: 9ac06df8b684 ("virtio-gpu-udmabuf: correct naming of QemuDmaBuf size properties")
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
(cherry picked from commit 931150e56b056b120c868f94751722710df0b6a7)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index bec864f482..837d9e6a30 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -243,6 +243,8 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev,
dmabuf->dmabuf_id = plane.dmabuf_id;
dmabuf->buf.width = plane.width;
dmabuf->buf.height = plane.height;
+ dmabuf->buf.backing_width = plane.width;
+ dmabuf->buf.backing_height = plane.height;
dmabuf->buf.stride = plane.stride;
dmabuf->buf.fourcc = plane.drm_format;
dmabuf->buf.modifier = plane.drm_format_mod;
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Stable-8.1.2 59/61] util/log: re-allow switching away from stderr log file
2023-10-12 7:16 [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-12-14 Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 58/61] vfio/display: Fix missing update to set backing fields Michael Tokarev
@ 2023-10-12 7:16 ` Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 60/61] migration/qmp: Fix crash on setting tls-authz with null Michael Tokarev
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2023-10-12 7:16 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-stable, Fiona Ebner, Paolo Bonzini, Michael Tokarev
From: Fiona Ebner <f.ebner@proxmox.com>
Commit 59bde21374 ("util/log: do not close and reopen log files when
flags are turned off") prevented switching away from stderr on a
subsequent invocation of qemu_set_log_internal(). This prevented
switching away from stderr with the 'logfile' monitor command as well
as an invocation like
> ./qemu-system-x86_64 -trace 'qemu_mutex_lock,file=log'
from opening the specified log file.
Fixes: 59bde21374 ("util/log: do not close and reopen log files when flags are turned off")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20231004124446.491481-1-f.ebner@proxmox.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit f05142d511e86d8e97967d21f205d990dfc634de)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/util/log.c b/util/log.c
index def88a9402..d36c98da0b 100644
--- a/util/log.c
+++ b/util/log.c
@@ -298,6 +298,8 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name,
r->fd = logfile;
qatomic_rcu_set(&global_file, NULL);
call_rcu(r, rcu_close_file, rcu);
+ }
+ if (changed_name) {
logfile = NULL;
}
}
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Stable-8.1.2 60/61] migration/qmp: Fix crash on setting tls-authz with null
2023-10-12 7:16 [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-12-14 Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 58/61] vfio/display: Fix missing update to set backing fields Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 59/61] util/log: re-allow switching away from stderr log file Michael Tokarev
@ 2023-10-12 7:16 ` Michael Tokarev
2023-10-12 7:16 ` [Stable-8.1.2 61/61] hw/audio/es1370: reset current sample counter Michael Tokarev
2023-10-12 7:24 ` [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-10-14 Michael Tokarev
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2023-10-12 7:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-stable, Peter Xu, Daniel P . Berrangé, Fabiano Rosas,
Philippe Mathieu-Daudé, Juan Quintela, Michael Tokarev
From: Peter Xu <peterx@redhat.com>
QEMU will crash if anyone tries to set tls-authz (which is a type
StrOrNull) with 'null' value. Fix it in the easy way by converting it to
qstring just like the other two tls parameters.
Cc: qemu-stable@nongnu.org # v4.0+
Fixes: d2f1d29b95 ("migration: add support for a "tls-authz" migration parameter")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230905162335.235619-2-peterx@redhat.com>
(cherry picked from commit 86dec715a7339fc61c3bdb9715993b277b2089db)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/migration/options.c b/migration/options.c
index 1d1e1321b0..6bbfd4853d 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1408,20 +1408,25 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
{
MigrationParameters tmp;
- /* TODO Rewrite "" to null instead */
+ /* TODO Rewrite "" to null instead for all three tls_* parameters */
if (params->tls_creds
&& params->tls_creds->type == QTYPE_QNULL) {
qobject_unref(params->tls_creds->u.n);
params->tls_creds->type = QTYPE_QSTRING;
params->tls_creds->u.s = strdup("");
}
- /* TODO Rewrite "" to null instead */
if (params->tls_hostname
&& params->tls_hostname->type == QTYPE_QNULL) {
qobject_unref(params->tls_hostname->u.n);
params->tls_hostname->type = QTYPE_QSTRING;
params->tls_hostname->u.s = strdup("");
}
+ if (params->tls_authz
+ && params->tls_authz->type == QTYPE_QNULL) {
+ qobject_unref(params->tls_authz->u.n);
+ params->tls_authz->type = QTYPE_QSTRING;
+ params->tls_authz->u.s = strdup("");
+ }
migrate_params_test_apply(params, &tmp);
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Stable-8.1.2 61/61] hw/audio/es1370: reset current sample counter
2023-10-12 7:16 [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-12-14 Michael Tokarev
` (2 preceding siblings ...)
2023-10-12 7:16 ` [Stable-8.1.2 60/61] migration/qmp: Fix crash on setting tls-authz with null Michael Tokarev
@ 2023-10-12 7:16 ` Michael Tokarev
2023-10-12 7:24 ` [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-10-14 Michael Tokarev
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2023-10-12 7:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-stable, Volker Rümelin, Rene Engel,
Marc-André Lureau, BALATON Zoltan, Michael Tokarev
From: Volker Rümelin <vr_qemu@t-online.de>
Reset the current sample counter when writing the Channel Sample
Count Register. The Linux ens1370 driver and the AROS sb128
driver expect the current sample counter counts down from sample
count to 0 after a write to the Channel Sample Count Register.
Currently the current sample counter starts from 0 after a reset
or the last count when the counter was stopped.
The current sample counter is used to raise an interrupt whenever
a complete buffer was transferred. When the counter starts with a
value lower than the reload value, the interrupt triggeres before
the buffer was completly transferred. This may lead to corrupted
audio streams.
Tested-by: Rene Engel <ReneEngel80@emailn.de>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230917065813.6692-1-vr_qemu@t-online.de>
(cherry picked from commit 00e3b29d065f3b88bb3726afbd5c73f8b2bff1b4)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 4f738a0ad8..9a8e29c39c 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -502,7 +502,7 @@ static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
case ES1370_REG_DAC2_SCOUNT:
case ES1370_REG_ADC_SCOUNT:
d += (addr - ES1370_REG_DAC1_SCOUNT) >> 2;
- d->scount = (val & 0xffff) | (d->scount & ~0xffff);
+ d->scount = (val & 0xffff) << 16 | (val & 0xffff);
ldebug ("chan %td CURR_SAMP_CT %d, SAMP_CT %d\n",
d - &s->chan[0], val >> 16, (val & 0xffff));
break;
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-10-14
2023-10-12 7:16 [Stable-8.1.2 00/61] Patch Round-up for stable 8.1.2, freeze on 2023-12-14 Michael Tokarev
` (3 preceding siblings ...)
2023-10-12 7:16 ` [Stable-8.1.2 61/61] hw/audio/es1370: reset current sample counter Michael Tokarev
@ 2023-10-12 7:24 ` Michael Tokarev
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tokarev @ 2023-10-12 7:24 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-stable
12.10.2023 10:16, Michael Tokarev:
..
> I was quite busy the last few days, - so I had to move the initially planned
> release by 2 days, - freeze from Oct-10 to Oct-12 (today), release from
> Oct-12 to Oct-14. Please excuse me for this delay.
Sigh. That's a fiasco, bro :)) Being busy does not help doing things well :)
Sure thing the initial plans are in order, planned for Oct-14 and release date
for Oct-16.
/mjt
^ permalink raw reply [flat|nested] 6+ messages in thread