Skip to contentSkip to conversation

Fix some typos

PATCH Applied Dongdong Zhang 5 participants 10 messages Nov 30, 2022 – Jan 16, 2023

lore
Share & tools
lore
#0 lore raw

cover Fix some typos

This patch mainly fixes some typos in the 'python' directory.

Dongdong Zhang (1):
Fix some typos

 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 Fix some typos

Fix some typos in 'python' directory.

---
 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
python/qemu/machine/console_socket.py +1 -1
index 8c4ff598ad..4e28ba9bb2 100644
@@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread:
         """Kick off a thread to drain the socket."""
         # Configure socket to not block and timeout.
         # This allows our drain thread to not block
-        # on recieve and exit smoothly.
+        # on receive and exit smoothly.
         socket.socket.setblocking(self, False)
         socket.socket.settimeout(self, 1)
         drain_thread = threading.Thread(target=self._drain_fn)
python/qemu/machine/qtest.py +1 -1
index 1a1fc6c9b0..906bd13298 100644
@@ -42,7 +42,7 @@ class QEMUQtestProtocol:
     :raise socket.error: on socket connection errors
 
     .. note::
-       No conection is estabalished by __init__(), this is done
+       No connection is estabalished by __init__(), this is done
        by the connect() or accept() methods.
     """
     def __init__(self, address: SocketAddrT,
python/qemu/qmp/protocol.py +1 -1
index 6ea86650ad..15909b7dba 100644
@@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool:
 
     @bottom_half
     async def _bh_close_stream(self, error_pathway: bool = False) -> None:
-        # NB: Closing the writer also implcitly closes the reader.
+        # NB: Closing the writer also implicitly closes the reader.
         if not self._writer:
             return
 
python/qemu/qmp/qmp_tui.py +3 -3
index ce239d8979..8369144723 100644
@@ -71,7 +71,7 @@ def format_json(msg: str) -> str:
     due to an decoding error then a simple string manipulation is done to
     achieve a single line JSON string.
 
-    Converting into single line is more asthetically pleasing when looking
+    Converting into single line is more aesthetically pleasing when looking
     along with error messages.
 
     Eg:
@@ -91,7 +91,7 @@ def format_json(msg: str) -> str:
 
         [1, true, 3]: QMP message is not a JSON object.
 
-    The single line mode is more asthetically pleasing.
+    The single line mode is more aesthetically pleasing.
 
     :param msg:
         The message to formatted into single line.
@@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None:
 class HistoryBox(urwid.ListBox):
     """
     This widget is modelled using the ListBox widget, contains the list of
-    all messages both QMP messages and log messsages to be shown in the TUI.
+    all messages both QMP messages and log messages to be shown in the TUI.
 
     The messages are urwid.Text widgets. On every append of a message, the
     focus is shifted to the last appended message.
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#2 lore raw
Quoted 3 lines · Dongdong Zhang

Fix some typos in 'python' directory.

Quoted 77 lines
---
  python/qemu/machine/console_socket.py | 2 +-
  python/qemu/machine/qtest.py          | 2 +-
  python/qemu/qmp/protocol.py           | 2 +-
  python/qemu/qmp/qmp_tui.py            | 6 +++---
  4 files changed, 6 insertions(+), 6 deletions(-)
python/qemu/machine/console_socket.py +1 -1
index 8c4ff598ad..4e28ba9bb2 100644
@@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread:
          """Kick off a thread to drain the socket."""
          # Configure socket to not block and timeout.
          # This allows our drain thread to not block
-        # on recieve and exit smoothly.
+        # on receive and exit smoothly.
          socket.socket.setblocking(self, False)
          socket.socket.settimeout(self, 1)
          drain_thread = threading.Thread(target=self._drain_fn)
python/qemu/machine/qtest.py +1 -1
index 1a1fc6c9b0..906bd13298 100644
@@ -42,7 +42,7 @@ class QEMUQtestProtocol:
      :raise socket.error: on socket connection errors
 
      .. note::
-       No conection is estabalished by __init__(), this is done
+       No connection is estabalished by __init__(), this is done
         by the connect() or accept() methods.
      """
      def __init__(self, address: SocketAddrT,
python/qemu/qmp/protocol.py +1 -1
index 6ea86650ad..15909b7dba 100644
@@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool:
 
      @bottom_half
      async def _bh_close_stream(self, error_pathway: bool = False) -> None:
-        # NB: Closing the writer also implcitly closes the reader.
+        # NB: Closing the writer also implicitly closes the reader.
          if not self._writer:
              return
 
python/qemu/qmp/qmp_tui.py +3 -3
index ce239d8979..8369144723 100644
@@ -71,7 +71,7 @@ def format_json(msg: str) -> str:
      due to an decoding error then a simple string manipulation is done to
      achieve a single line JSON string.
 
-    Converting into single line is more asthetically pleasing when looking
+    Converting into single line is more aesthetically pleasing when looking
      along with error messages.
 
      Eg:
@@ -91,7 +91,7 @@ def format_json(msg: str) -> str:
 
          [1, true, 3]: QMP message is not a JSON object.
 
-    The single line mode is more asthetically pleasing.
+    The single line mode is more aesthetically pleasing.
 
      :param msg:
          The message to formatted into single line.
@@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None:
  class HistoryBox(urwid.ListBox):
      """
      This widget is modelled using the ListBox widget, contains the list of
-    all messages both QMP messages and log messsages to be shown in the TUI.
+    all messages both QMP messages and log messages to be shown in the TUI.
 
      The messages are urwid.Text widgets. On every append of a message, the
      focus is shifted to the last appended message.
#3 lore raw

Le 30/11/2022 à 09:29, Philippe Mathieu-Daudé a écrit :

Quoted 67 lines · Dongdong Zhang
Quoted 3 lines

Fix some typos in 'python' directory.

Quoted 60 lines

---
  python/qemu/machine/console_socket.py | 2 +- python/qemu/machine/qtest.py          | 2 +- python/qemu/qmp/protocol.py           | 2 +- python/qemu/qmp/qmp_tui.py            | 6 +++---

  4 files changed, 6 insertions(+), 6 deletions(-)
python/qemu/machine/console_socket.py +0 -0
index 8c4ff598ad..4e28ba9bb2 100644
@@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread:

          """Kick off a thread to drain the socket.""" # Configure socket to not block and timeout. # This allows our drain thread to not block -        # on recieve and exit smoothly.
+        # on receive and exit smoothly. socket.socket.setblocking(self, False) socket.socket.settimeout(self, 1) drain_thread = threading.Thread(target=self._drain_fn)

python/qemu/machine/qtest.py +0 -0
index 1a1fc6c9b0..906bd13298 100644
@@ -42,7 +42,7 @@ class QEMUQtestProtocol:

      :raise socket.error: on socket connection errors .. note::
-       No conection is estabalished by __init__(), this is done +       No connection is estabalished by __init__(), this is done by the connect() or accept() methods.
      """
      def __init__(self, address: SocketAddrT,

python/qemu/qmp/protocol.py +0 -0
index 6ea86650ad..15909b7dba 100644
@@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool:

      @bottom_half
      async def _bh_close_stream(self, error_pathway: bool = False) -> None:
-        # NB: Closing the writer also implcitly closes the reader. +        # NB: Closing the writer also implicitly closes the reader. if not self._writer:
              return

python/qemu/qmp/qmp_tui.py +0 -0
index ce239d8979..8369144723 100644
@@ -71,7 +71,7 @@ def format_json(msg: str) -> str:

      due to an decoding error then a simple string manipulation is done to achieve a single line JSON string.
-    Converting into single line is more asthetically pleasing when looking +    Converting into single line is more aesthetically pleasing when looking along with error messages.
      Eg:

python/qemu/qmp/qmp_tui.py +0 -0
@@ -91,7 +91,7 @@ def format_json(msg: str) -> str:

          [1, true, 3]: QMP message is not a JSON object. -    The single line mode is more asthetically pleasing. +    The single line mode is more aesthetically pleasing. :param msg:
          The message to formatted into single line.

Quoted 10 lines
Quoted 8 lines
python/qemu/qmp/qmp_tui.py +0 -0
@@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None:

  class HistoryBox(urwid.ListBox):
      """
      This widget is modelled using the ListBox widget, contains the list of -    all messages both QMP messages and log messsages to be shown in the TUI. +    all messages both QMP messages and log messages to be shown in the TUI. The messages are urwid.Text widgets. On every append of a message, the focus is shifted to the last appended message.

Applied to my trivial-patches branch.

Thanks,
Laurent

#4 lore raw
Quoted 80 lines · Laurent Vivier
Quoted 67 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Dongdong Zhang

Fix some typos in 'python' directory.

Quoted 60 lines
---
  python/qemu/machine/console_socket.py | 2 +-
  python/qemu/machine/qtest.py          | 2 +-
  python/qemu/qmp/protocol.py           | 2 +-
  python/qemu/qmp/qmp_tui.py            | 6 +++---
  4 files changed, 6 insertions(+), 6 deletions(-)
python/qemu/machine/console_socket.py +1 -1
index 8c4ff598ad..4e28ba9bb2 100644
@@ -68,7 +68,7 @@ def _thread_start(self) -> threading.Thread:
          """Kick off a thread to drain the socket."""
          # Configure socket to not block and timeout.
          # This allows our drain thread to not block
-        # on recieve and exit smoothly.
+        # on receive and exit smoothly.
          socket.socket.setblocking(self, False)
          socket.socket.settimeout(self, 1)
          drain_thread = threading.Thread(target=self._drain_fn)
python/qemu/machine/qtest.py +1 -1
index 1a1fc6c9b0..906bd13298 100644
@@ -42,7 +42,7 @@ class QEMUQtestProtocol:
      :raise socket.error: on socket connection errors
      .. note::
-       No conection is estabalished by __init__(), this is done
+       No connection is estabalished by __init__(), this is done
         by the connect() or accept() methods.
      """
      def __init__(self, address: SocketAddrT,
python/qemu/qmp/protocol.py +1 -1
index 6ea86650ad..15909b7dba 100644
@@ -812,7 +812,7 @@ def _done(task: Optional['asyncio.Future[Any]']) -> bool:
      @bottom_half
      async def _bh_close_stream(self, error_pathway: bool = False) -> None:
-        # NB: Closing the writer also implcitly closes the reader.
+        # NB: Closing the writer also implicitly closes the reader.
          if not self._writer:
              return
python/qemu/qmp/qmp_tui.py +2 -2
index ce239d8979..8369144723 100644
@@ -71,7 +71,7 @@ def format_json(msg: str) -> str:
      due to an decoding error then a simple string manipulation is done to
      achieve a single line JSON string.
-    Converting into single line is more asthetically pleasing when looking
+    Converting into single line is more aesthetically pleasing when looking
      along with error messages.
      Eg:
@@ -91,7 +91,7 @@ def format_json(msg: str) -> str:
          [1, true, 3]: QMP message is not a JSON object.
-    The single line mode is more asthetically pleasing.
+    The single line mode is more aesthetically pleasing.
      :param msg:
          The message to formatted into single line.
Quoted 10 lines

python/qemu/qmp/qmp_tui.py def __init__(self, parent: App) -> None: · line 503

Quoted 8 lines
python/qemu/qmp/qmp_tui.py +1 -1
@@ -498,7 +498,7 @@ def __init__(self, parent: App) -> None:
  class HistoryBox(urwid.ListBox):
      """
      This widget is modelled using the ListBox widget, contains the list of
-    all messages both QMP messages and log messsages to be shown in the TUI.
+    all messages both QMP messages and log messages to be shown in the TUI.
      The messages are urwid.Text widgets. On every append of a message, the
      focus is shifted to the last appended message.
Quoted 4 lines

Applied to my trivial-patches branch.

Thanks,
Laurent

Laurent, I'll grab this one, sorry!

#5 lore raw
In reply to Dongdong Zhang

python/qemu/machine/qtest.py class QEMUQtestProtocol: · line 45

Quoted 10 lines · Dongdong Zhang
python/qemu/machine/qtest.py +1 -1
index 1a1fc6c9b0..906bd13298 100644
@@ -42,7 +42,7 @@ class QEMUQtestProtocol:
     :raise socket.error: on socket connection errors
 
     .. note::
-       No conection is estabalished by __init__(), this is done
+       No connection is estabalished by __init__(), this is done

There are two typos in this line, the other one is 'estabalished'.

Signature · 2 lines
Thanks.
-- Max
#6 lore raw

cover Fix some typos

In reply to Dongdong Zhang

Hi all,

I would like to ping a patch

https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04568.html
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04570.html

Quoted 15 lines

-----Original Messages-----From:"Dongdong Zhang" <[email protected]>Sent Time:2022-11-30 09:53:57 (Wednesday)To:[email protected]:[email protected], [email protected], [email protected], "Dongdong Zhang" <[email protected]>Subject:[PATCH 0/1] Fix some typos

This patch mainly fixes some typos in the 'python' directory.

Dongdong Zhang (1):
Fix some typos

 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#7 lore raw
Quoted 24 lines · Dongdong Zhang

Hi all,

I would like to ping a patch

https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04568.html
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04570.html

Quoted 15 lines

-----Original Messages-----From:"Dongdong Zhang" <[email protected]>Sent Time:2022-11-30 09:53:57 (Wednesday)To:[email protected]:[email protected], [email protected], [email protected], "Dongdong Zhang" <[email protected]>Subject:[PATCH 0/1] Fix some typos

This patch mainly fixes some typos in the 'python' directory.

Dongdong Zhang (1):
Fix some typos

 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

--
2.17.1

ACK to this patch.

For fixes under python/qemu/qmp/, I need to relay these fixes over to
https://gitlab.com/qemu-project/python-qemu-qmp -- you can do it yourself and send a small merge request, or I can do it for you, if you'd like. Please let me know what you'd prefer, and then I will stage this patch.

(Apologies that the code is duplicated in two repositories right now.... I'm working on fixing that.)

--js

#8 lore raw

Hi John,

Could you help me relay these fixes?
If I submit a pull request, I will go through company's internal review process again.

Thanks a lot!

Dongdong

Quoted 41 lines

-----原始邮件-----发件人:"John Snow" <[email protected]>发送时间:2023-01-06 07:25:43 (星期五)收件人:"Dongdong Zhang" <[email protected]>抄送:[email protected], [email protected], [email protected]主题:Re: [PING PATCH 0/1] Fix some typos

Quoted 24 lines · Dongdong Zhang

Hi all,

I would like to ping a patch

https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04568.html
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04570.html

Quoted 15 lines

-----Original Messages-----From:"Dongdong Zhang" <[email protected]>Sent Time:2022-11-30 09:53:57 (Wednesday)To:[email protected]:[email protected], [email protected], [email protected], "Dongdong Zhang" <[email protected]>Subject:[PATCH 0/1] Fix some typos

This patch mainly fixes some typos in the 'python' directory.

Dongdong Zhang (1):
Fix some typos

 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

--
2.17.1

ACK to this patch.

For fixes under python/qemu/qmp/, I need to relay these fixes over to
https://gitlab.com/qemu-project/python-qemu-qmp -- you can do it yourself and send a small merge request, or I can do it for you, if you'd like. Please let me know what you'd prefer, and then I will stage this patch.

(Apologies that the code is duplicated in two repositories right now.... I'm working on fixing that.)

--js

#9 lore raw
Quoted 5 lines · Dongdong Zhang

Hi John,

Could you help me relay these fixes?
If I submit a pull request, I will go through company's internal review process again.

No problem at all. My apologies for the delay.

Staged for QEMU, with additional fix spotted by Max:
https://gitlab.com/jsnow/qemu/-/commit/4cd8db9f367e12ccd7d3980f2573fe65f9949562
Staged for qemu.qmp, preserving credit:
https://gitlab.com/jsnow/python-qemu-qmp/-/commit/cd190a79bcee975d00b0334003e6dcbaf8ec9630

Quoted 3 lines

Thanks a lot!

Thank *you* :)

--js

Quoted 44 lines

Dongdong

Quoted 41 lines

-----原始邮件-----发件人:"John Snow" <[email protected]>发送时间:2023-01-06 07:25:43 (星期五)收件人:"Dongdong Zhang" <[email protected]>抄送:[email protected], [email protected], [email protected]主题:Re: [PING PATCH 0/1] Fix some typos

Quoted 24 lines · Dongdong Zhang

Hi all,

I would like to ping a patch

https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04568.html
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg04570.html

Quoted 15 lines

-----Original Messages-----From:"Dongdong Zhang" <[email protected]>Sent Time:2022-11-30 09:53:57 (Wednesday)To:[email protected]:[email protected], [email protected], [email protected], "Dongdong Zhang" <[email protected]>Subject:[PATCH 0/1] Fix some typos

This patch mainly fixes some typos in the 'python' directory.

Dongdong Zhang (1):
Fix some typos

 python/qemu/machine/console_socket.py | 2 +-
 python/qemu/machine/qtest.py          | 2 +-
 python/qemu/qmp/protocol.py           | 2 +-
 python/qemu/qmp/qmp_tui.py            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

--
2.17.1

ACK to this patch.

For fixes under python/qemu/qmp/, I need to relay these fixes over to
https://gitlab.com/qemu-project/python-qemu-qmp -- you can do it yourself and send a small merge request, or I can do it for you, if you'd like. Please let me know what you'd prefer, and then I will stage this patch.

(Apologies that the code is duplicated in two repositories right now.... I'm working on fixing that.)

--js