qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Stable-7.2.13 00/19] Patch Round-up for stable 7.2.13, frozen on 2024-07-14
@ 2024-07-15  5:52 Michael Tokarev
  2024-07-15  5:52 ` [Stable-7.2.13 18/19] virtio: remove virtio_tswap16s() call in vring_packed_event_read() Michael Tokarev
  2024-07-15  5:52 ` [Stable-7.2.13 19/19] char-stdio: Restore blocking mode of stdout on exit Michael Tokarev
  0 siblings, 2 replies; 3+ messages in thread
From: Michael Tokarev @ 2024-07-15  5:52 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-stable, Michael Tokarev

The following patches are queued for QEMU stable v7.2.13:

  https://gitlab.com/qemu-project/qemu/-/commits/staging-7.2

Patch freeze is 2024-07-14 (frozen), and the release is planned for 2024-07-16:

  https://wiki.qemu.org/Planning/7.2

Please respond here or CC qemu-stable@nongnu.org on any additional patches
you think should (or shouldn't) be included in the release.

The changes which are staging for inclusion, with the original commit hash
from master branch, are given below the bottom line.

Thanks!

/mjt

--------------------------------------
01* 3973615e7fba Mark Cave-Ayland:
   target/i386: fix size of EBP writeback in gen_enter()
02* 2c3e4e2de699 Alexey Dobriyan:
   virtio-net: drop too short packets early
03* b1cf266c82cb Gerd Hoffmann:
   stdvga: fix screen blanking
04* 54b27921026d Ilya Leoshkevich:
   linux-user: Make TARGET_NR_setgroups affect only the current thread
05* 521d7fb3ebdf Richard Henderson:
   tcg/loongarch64: Fix tcg_out_movi vs some pcrel pointers
06* e030d08c2fc0 Thomas Huth:
   gitlab-ci.d/buildtest: Merge the --without-default-* jobs
07* 0054dc8bde40 Marc-André Lureau:
   Update lcitool and fedora to 37
08* d639cf79783a Paolo Bonzini:
   ci, docker: update CentOS and OpenSUSE Python to non-EOL versions
09* 641b1efe01b2 Thomas Huth:
   tests: Update our CI to use CentOS Stream 9 instead of 8
10* 7c7d369b33f0 Alex Bennée:
   tests: don't run benchmarks for the tsan build
11* f51f90c65ed7 Thomas Huth:
   gitlab-ci: Disable the riscv64-debian-cross-container by default
12* 903916f0a017 Chuang Xu:
   i386/cpu: fixup number of addressable IDs for processor cores in the 
   physical package
13* 76bccf3cb9d9 Richard Henderson:
   target/arm: Fix VCMLA Dd, Dn, Dm[idx]
14* bd385a5298d7 Kevin Wolf:
   qcow2: Don't open data_file with BDRV_O_NO_IO
15* 2eb42a728d27 Kevin Wolf:
   iotests/244: Don't store data-file with protocol in image
16* 7e1110664ecb Kevin Wolf:
   iotests/270: Don't store data-file with json: prefix in image
17* 7ead94699861 Kevin Wolf:
   block: Parse filenames only when explicitly requested
18 7aa6492401e9 Stefano Garzarella:
   virtio: remove virtio_tswap16s() call in vring_packed_event_read()
19 a0124e333e21 Maxim Mikityanskiy:
   char-stdio: Restore blocking mode of stdout on exit

(commit(s) marked with * were in previous series and are not resent)


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Stable-7.2.13 18/19] virtio: remove virtio_tswap16s() call in vring_packed_event_read()
  2024-07-15  5:52 [Stable-7.2.13 00/19] Patch Round-up for stable 7.2.13, frozen on 2024-07-14 Michael Tokarev
@ 2024-07-15  5:52 ` Michael Tokarev
  2024-07-15  5:52 ` [Stable-7.2.13 19/19] char-stdio: Restore blocking mode of stdout on exit Michael Tokarev
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2024-07-15  5:52 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-stable, Stefano Garzarella, jasowang, Xoykie, Peter Maydell,
	Eugenio Pérez, Michael S . Tsirkin, Michael Tokarev

From: Stefano Garzarella <sgarzare@redhat.com>

Commit d152cdd6f6 ("virtio: use virtio accessor to access packed event")
switched using of address_space_read_cached() to virito_lduw_phys_cached()
to access packed descriptor event.

When we used address_space_read_cached(), we needed to call
virtio_tswap16s() to handle the endianess of the field, but
virito_lduw_phys_cached() already handles it internally, so we no longer
need to call virtio_tswap16s() (as the commit had done for `off_wrap`,
but forgot for `flags`).

Fixes: d152cdd6f6 ("virtio: use virtio accessor to access packed event")
Cc: jasowang@redhat.com
Cc: qemu-stable@nongnu.org
Reported-by: Xoykie <xoykie@gmail.com>
Link: https://lore.kernel.org/qemu-devel/CAFU8RB_pjr77zMLsM0Unf9xPNxfr_--Tjr49F_eX32ZBc5o2zQ@mail.gmail.com
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20240701075208.19634-1-sgarzare@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 7aa6492401e95fb296dec7cda81e67d91f6037d7)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 4a35d7cb0c..1227e3d692 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -732,7 +732,6 @@ static void vring_packed_event_read(VirtIODevice *vdev,
     /* Make sure flags is seen before off_wrap */
     smp_rmb();
     e->off_wrap = virtio_lduw_phys_cached(vdev, cache, off_off);
-    virtio_tswap16s(vdev, &e->flags);
 }
 
 static void vring_packed_off_wrap_write(VirtIODevice *vdev,
-- 
2.39.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Stable-7.2.13 19/19] char-stdio: Restore blocking mode of stdout on exit
  2024-07-15  5:52 [Stable-7.2.13 00/19] Patch Round-up for stable 7.2.13, frozen on 2024-07-14 Michael Tokarev
  2024-07-15  5:52 ` [Stable-7.2.13 18/19] virtio: remove virtio_tswap16s() call in vring_packed_event_read() Michael Tokarev
@ 2024-07-15  5:52 ` Michael Tokarev
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2024-07-15  5:52 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-stable, Maxim Mikityanskiy, Paolo Bonzini, Michael Tokarev

From: Maxim Mikityanskiy <maxtram95@gmail.com>

qemu_chr_open_fd() sets stdout into non-blocking mode. Restore the old
fd flags on exit to avoid breaking unsuspecting applications that run on
the same terminal after qemu and don't expect to get EAGAIN.

While at at, also ensure term_exit is called once (at the moment it's
called both from char_stdio_finalize() and as the atexit() hook.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2423
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Link: https://lore.kernel.org/r/20240703190812.3459514-1-maxtram95@gmail.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit a0124e333e2176640f233e5ea57a2f413985d9b5)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 3c648678ab..b960ddd4e4 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -41,6 +41,7 @@
 /* init terminal so that we can grab keys */
 static struct termios oldtty;
 static int old_fd0_flags;
+static int old_fd1_flags;
 static bool stdio_in_use;
 static bool stdio_allow_signal;
 static bool stdio_echo_state;
@@ -50,6 +51,8 @@ static void term_exit(void)
     if (stdio_in_use) {
         tcsetattr(0, TCSANOW, &oldtty);
         fcntl(0, F_SETFL, old_fd0_flags);
+        fcntl(1, F_SETFL, old_fd1_flags);
+        stdio_in_use = false;
     }
 }
 
@@ -102,6 +105,7 @@ static void qemu_chr_open_stdio(Chardev *chr,
 
     stdio_in_use = true;
     old_fd0_flags = fcntl(0, F_GETFL);
+    old_fd1_flags = fcntl(1, F_GETFL);
     tcgetattr(0, &oldtty);
     if (!g_unix_set_fd_nonblocking(0, true, NULL)) {
         error_setg_errno(errp, errno, "Failed to set FD nonblocking");
-- 
2.39.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-07-15  5:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15  5:52 [Stable-7.2.13 00/19] Patch Round-up for stable 7.2.13, frozen on 2024-07-14 Michael Tokarev
2024-07-15  5:52 ` [Stable-7.2.13 18/19] virtio: remove virtio_tswap16s() call in vring_packed_event_read() Michael Tokarev
2024-07-15  5:52 ` [Stable-7.2.13 19/19] char-stdio: Restore blocking mode of stdout on exit Michael Tokarev

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).