From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 02/30] qapi: Tidy up whitespace in generated code
Date: Wed, 14 Dec 2022 08:46:53 +0100 [thread overview]
Message-ID: <20221214074721.731441-5-armbru@redhat.com> (raw)
In-Reply-To: <20221214074721.731441-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20221104160712.3005652-3-armbru@redhat.com>
---
docs/devel/qapi-code-gen.rst | 1 -
scripts/qapi/commands.py | 7 +++----
scripts/qapi/events.py | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index 997313fce7..b56ea4546d 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -1664,7 +1664,6 @@ Example::
$ cat qapi-generated/example-qapi-commands.c
[Uninteresting stuff omitted...]
-
static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in,
QObject **ret_out, Error **errp)
{
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index 38ca38a7b9..cf68aaf0bf 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -83,7 +83,7 @@ def gen_call(name: str,
trace_qmp_enter_%(name)s(req_json->str);
}
- ''',
+''',
upper=upper, name=name)
ret += mcgen('''
@@ -124,13 +124,13 @@ def gen_call(name: str,
trace_qmp_exit_%(name)s(ret_json->str, true);
}
- ''',
+''',
upper=upper, name=name)
else:
ret += mcgen('''
trace_qmp_exit_%(name)s("{}", true);
- ''',
+''',
name=name)
return ret
@@ -316,7 +316,6 @@ def _begin_user_module(self, name: str) -> None:
#include "qapi/error.h"
#include "%(visit)s.h"
#include "%(commands)s.h"
-
''',
commands=commands, visit=visit))
diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py
index 27b44c49f5..e762d53d19 100644
--- a/scripts/qapi/events.py
+++ b/scripts/qapi/events.py
@@ -196,7 +196,6 @@ def _begin_user_module(self, name: str) -> None:
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp-event.h"
-
''',
events=events, visit=visit,
prefix=self._prefix))
--
2.37.3
next prev parent reply other threads:[~2022-12-14 8:45 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 7:46 [PULL 00/30] QAPI patches patches for 2022-12-14 Markus Armbruster
2022-12-14 7:46 ` [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-12-14 7:46 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
2022-12-14 7:46 ` [PATCH 2/2] include: Include headers where needed Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
2022-12-14 7:46 ` Markus Armbruster [this message]
2022-12-14 7:46 ` [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change Markus Armbruster
2022-12-14 7:46 ` [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:46 ` [PULL 05/30] qapi tests: Elide " Markus Armbruster
2022-12-14 7:46 ` [PULL 06/30] qapi acpi: " Markus Armbruster
2022-12-14 7:46 ` [PULL 07/30] qapi audio: " Markus Armbruster
2022-12-14 7:46 ` [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format Markus Armbruster
2022-12-14 7:47 ` [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg Markus Armbruster
2022-12-14 7:47 ` [PULL 10/30] qapi block: Elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:47 ` [PULL 11/30] qapi chardev: " Markus Armbruster
2022-12-14 7:47 ` [PULL 12/30] qapi crypto: " Markus Armbruster
2022-12-14 7:47 ` [PULL 13/30] qapi dump: " Markus Armbruster
2022-12-14 7:47 ` [PULL 14/30] qapi job: " Markus Armbruster
2022-12-14 7:47 ` [PULL 15/30] qapi machine: " Markus Armbruster
2022-12-14 7:47 ` [PULL 16/30] qapi migration: " Markus Armbruster
2022-12-14 7:47 ` [PULL 17/30] qapi misc: " Markus Armbruster
2022-12-14 7:47 ` [PULL 18/30] qapi net: " Markus Armbruster
2022-12-14 7:47 ` [PULL 19/30] qapi pci: " Markus Armbruster
2022-12-14 7:47 ` [PULL 20/30] qapi qdev qom: " Markus Armbruster
2022-12-14 7:47 ` [PULL 21/30] qapi replay: " Markus Armbruster
2022-12-14 7:47 ` [PULL 22/30] qapi rocker: " Markus Armbruster
2022-12-14 7:47 ` [PULL 23/30] qapi run-state: " Markus Armbruster
2022-12-14 7:47 ` [PULL 24/30] qapi stats: " Markus Armbruster
2022-12-14 7:47 ` [PULL 25/30] qapi tpm: " Markus Armbruster
2022-12-14 7:47 ` [PULL 26/30] qapi transaction: " Markus Armbruster
2022-12-14 7:47 ` [PULL 27/30] qapi ui: " Markus Armbruster
2022-12-14 7:47 ` [PULL 28/30] qapi virtio: " Markus Armbruster
2022-12-14 7:47 ` [PULL 29/30] qapi qga: " Markus Armbruster
2022-12-14 7:47 ` [PULL 30/30] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-12-14 17:03 ` [PULL 00/30] QAPI patches patches for 2022-12-14 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221214074721.731441-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).