qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] af7648: Fix some typos


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] af7648: Fix some typos
Date: Thu, 02 Feb 2023 02:10:00 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: af76484e54f6c5e20452c2b329378026b8f2c59d
      
https://github.com/qemu/qemu/commit/af76484e54f6c5e20452c2b329378026b8f2c59d
  Author: Dongdong Zhang <zhangdongdong@eswincomputing.com>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/machine/console_socket.py
    M python/qemu/machine/qtest.py
    M python/qemu/qmp/protocol.py
    M python/qemu/qmp/qmp_tui.py

  Log Message:
  -----------
  Fix some typos

Fix some typos in 'python' directory.

Signed-off-by: Dongdong Zhang <zhangdongdong@eswincomputing.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20221130015358.6998-2-zhangdongdong@eswincomputing.com
[Fixed additional typo spotted by Max Filippov. --js]
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: ada73a492cb29b9c3a9f88c5e6d3407fa0d999e7
      
https://github.com/qemu/qemu/commit/ada73a492cb29b9c3a9f88c5e6d3407fa0d999e7
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/machine/machine.py

  Log Message:
  -----------
  python: QEMUMachine: enable qmp accept timeout by default

I've spent much time trying to debug hanging pipeline in gitlab. I
started from and idea that I have problem in code in my series (which
has some timeouts). Finally I found that the problem is that I've used
QEMUMachine class directly to avoid qtest, and didn't add necessary
arguments. Qemu fails and we wait for qmp accept endlessly. In gitlab
it's just stopped by timeout (one hour) with no sign of what's going
wrong.

With timeout enabled, gitlab don't wait for an hour and prints all
needed information.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-Id: <20220624195252.175249-1-vsementsov@yandex-team.ru>
[Fixed typing. --js]
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: f9922937d173f50fe59fd1b20fadc445fb6b2564
      
https://github.com/qemu/qemu/commit/f9922937d173f50fe59fd1b20fadc445fb6b2564
  Author: Peter Delevoryas <peter@pjd.dev>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/machine/machine.py
    M tests/avocado/avocado_qemu/__init__.py

  Log Message:
  -----------
  python/machine: Fix AF_UNIX path too long on macOS

On macOS, private $TMPDIR's are the default. These $TMPDIR's are
generated from a user's unix UID and UUID [1], which can create a
relatively long path:

    /var/folders/d7/rz20f6hd709c1ty8f6_6y_z40000gn/T/

QEMU's avocado tests create a temporary directory prefixed by
"avo_qemu_sock_", and create QMP sockets within _that_ as well.
The QMP socket is unnecessarily long, because a temporary directory
is created for every QEMUMachine object.

    /avo_qemu_sock_uh3w_dgc/qemu-37331-10bacf110-monitor.sock

The path limit for unix sockets on macOS is 104: [2]

    /*
     * [XSI] Definitions for UNIX IPC domain.
     */
    struct  sockaddr_un {
        unsigned char   sun_len;        /* sockaddr len including null */
        sa_family_t     sun_family;     /* [XSI] AF_UNIX */
        char            sun_path[104];  /* [XSI] path name (gag) */
    };

This results in avocado tests failing on macOS because the QMP unix
socket can't be created, because the path is too long:

    ERROR| Failed to establish connection: OSError: AF_UNIX path too long

This change resolves by reducing the size of the socket directory prefix
and the suffix on the QMP and console socket names.

The result is paths like this:

    pdel@pdel-mbp:/var/folders/d7/rz20f6hd709c1ty8f6_6y_z40000gn/T
    $ tree qemu*
    qemu_df4evjeq
    qemu_jbxel3gy
    qemu_ml9s_gg7
    qemu_oc7h7f3u
    qemu_oqb1yf97
    ├── 10a004050.con
    └── 10a004050.qmp

[1] 
https://apple.stackexchange.com/questions/353832/why-is-mac-osx-temp-directory-in-weird-path
[2] /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk/usr/include/sys/un.h

Signed-off-by: Peter Delevoryas <peter@pjd.dev>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230110082930.42129-2-peter@pjd.dev
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 166464c6ce82f748e33b24361a72e9d310130fa0
      
https://github.com/qemu/qemu/commit/166464c6ce82f748e33b24361a72e9d310130fa0
  Author: Maksim Davydov <davydov-max@yandex-team.ru>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/qmp/qmp_client.py

  Log Message:
  -----------
  python/qmp: increase read buffer size

Current 256KB is not enough for some real cases. As a possible solution
limit can be chosen to be the same as libvirt (10MB)

Signed-off-by: Maksim Davydov <davydov-max@yandex-team.ru>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20230112152805.33109-3-davydov-max@yandex-team.ru
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: a3cfea92e2030926e00a2519d299384ea648e36e
      
https://github.com/qemu/qemu/commit/a3cfea92e2030926e00a2519d299384ea648e36e
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/qmp/protocol.py

  Log Message:
  -----------
  python/qmp/protocol: add open_with_socket()

Instead of listening for incoming connections with a SocketAddr, add a
new method open_with_socket() that accepts an existing socket.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111080101.969151-2-marcandre.lureau@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 603a3bad4b9a95b524dc8d6a41b1be4d5c5cacdf
      
https://github.com/qemu/qemu/commit/603a3bad4b9a95b524dc8d6a41b1be4d5c5cacdf
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/qmp/legacy.py

  Log Message:
  -----------
  python/qmp/legacy: make QEMUMonitorProtocol accept a socket

Teach QEMUMonitorProtocol to accept an exisiting socket.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111080101.969151-3-marcandre.lureau@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: bd4c0ef409140bd1be393407c04005ac077d4574
      
https://github.com/qemu/qemu/commit/bd4c0ef409140bd1be393407c04005ac077d4574
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2023-01-24 (Tue, 24 Jan 2023)

  Changed paths:
    M python/qemu/machine/machine.py

  Log Message:
  -----------
  python/qemu/machine: use socketpair() for QMP by default

When no monitor address is given, establish the QMP communication through
a socketpair() (API is also supported on Windows since Python 3.5)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111080101.969151-4-marcandre.lureau@redhat.com
[Resolved conflicts, fixed typing error. --js]
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 026817fb69414c9d3909d8b1a209f90180d777d6
      
https://github.com/qemu/qemu/commit/026817fb69414c9d3909d8b1a209f90180d777d6
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-02-01 (Wed, 01 Feb 2023)

  Changed paths:
    M python/qemu/machine/console_socket.py
    M python/qemu/machine/machine.py
    M python/qemu/machine/qtest.py
    M python/qemu/qmp/legacy.py
    M python/qemu/qmp/protocol.py
    M python/qemu/qmp/qmp_client.py
    M python/qemu/qmp/qmp_tui.py
    M tests/avocado/avocado_qemu/__init__.py

  Log Message:
  -----------
  Merge tag 'python-pull-request' of https://gitlab.com/jsnow/qemu into staging

Python

Bits and pieces, kibbles'n'bits

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+ber27ys35W+dsvQfe+BBqr8OQ4FAmPQlMIACgkQfe+BBqr8
# OQ5RIxAAqaG8Dx63CXa8WHMsGWc0CKTOcwTcRDw92GT3qhVkebZiNmNlZwckaU/c
# CkVunJnU5T6T2qkploysUXwdlQ+XsY4fQlACNciZeffmT2E4siNQ/4H1uPB4xca6
# 8Sgmg2VH7OF+EWwuBihY1pbe7g+sOJg9w9isRduBnLGrLbOrewGIJBNbiVzFlz5W
# 30RdvfLoUUak5qTlMT/6yl98r6fkkDmfPX653iYmpA/H/Ah+17ZJXB2XNigkqBdD
# Cp8OxtFceKQdZOqNiADJRzT3Gore4lBkPnULKwct/5U0B/tUiBdZ2YDJW8EObUMY
# zFE7giE5mCnyFSmfBmjKu8yS8zJm9NooYEjunTcodop/FDb96c3sh8376ZLamTii
# /p5WSwfo4a6DXPUTx0aiCkqpeCdPncRgwKc5TvqyKLKxQHbfjt6UZrcL6iYbe6O6
# ltBcdvfdzL41TNjS678QqiGuYkADVa/nhig3ano4msx/Tf5e0O8eMoK9bDbVS9KF
# QuONtOcut1YhnAHJp4oYN2Nimtr0t8j07iOOfc4X3+WwdbMCfR+toDM4wWVJ3u/O
# 8Phy8hinfndMXdP9Q4eeFAiJ1zuD/XkpaKoDe0gHcEvp3zMEXmHiEOdv4hFeWTQB
# ivU3oM/j2uVcHU4CSxra3B54vfLc1gudJ2yLPvhwPKoIRbJ/kbc=
# =36NA
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 25 Jan 2023 02:32:34 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* tag 'python-pull-request' of https://gitlab.com/jsnow/qemu:
  python/qemu/machine: use socketpair() for QMP by default
  python/qmp/legacy: make QEMUMonitorProtocol accept a socket
  python/qmp/protocol: add open_with_socket()
  python/qmp: increase read buffer size
  python/machine: Fix AF_UNIX path too long on macOS
  python: QEMUMachine: enable qmp accept timeout by default
  Fix some typos

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/13356edb8750...026817fb6941



reply via email to

[Prev in Thread] Current Thread [Next in Thread]