From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com
Subject: [Qemu-devel] [PATCH 5/8] qemu/queue.h: remove Q_TAILQ_{HEAD, ENTRY}
Date: Mon, 10 Dec 2018 19:28:13 +0100 [thread overview]
Message-ID: <20181210182816.2014-6-pbonzini@redhat.com> (raw)
In-Reply-To: <20181210182816.2014-1-pbonzini@redhat.com>
These are not present for other kinds of queue, and unused.
Zap them before more changes are made to the QTAILQ
implementation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/qemu/queue.h | 14 ++++++--------
scripts/cocci-macro-file.h | 10 ----------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/include/qemu/queue.h b/include/qemu/queue.h
index ac418efc43..b9571e93d8 100644
--- a/include/qemu/queue.h
+++ b/include/qemu/queue.h
@@ -350,22 +350,20 @@ struct { \
/*
* Tail queue definitions.
*/
-#define Q_TAILQ_HEAD(name, type, qual) \
+#define QTAILQ_HEAD(name, type) \
struct name { \
- qual type *tqh_first; /* first element */ \
- qual type *qual *tqh_last; /* addr of last next element */ \
+ type *tqh_first; /* first element */ \
+ type **tqh_last; /* addr of last next element */ \
}
-#define QTAILQ_HEAD(name, type) Q_TAILQ_HEAD(name, struct type,)
#define QTAILQ_HEAD_INITIALIZER(head) \
{ NULL, &(head).tqh_first }
-#define Q_TAILQ_ENTRY(type, qual) \
+#define QTAILQ_ENTRY(type) \
struct { \
- qual type *tqe_next; /* next element */ \
- qual type *qual *tqe_prev; /* address of previous next element */\
+ type *tqe_next; /* next element */ \
+ type **tqe_prev; /* address of previous next element */ \
}
-#define QTAILQ_ENTRY(type) Q_TAILQ_ENTRY(struct type,)
/*
* Tail queue functions.
diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h
index 9f2e72e7e1..5c49369dac 100644
--- a/scripts/cocci-macro-file.h
+++ b/scripts/cocci-macro-file.h
@@ -93,11 +93,6 @@ struct { \
/*
* Tail queue definitions.
*/
-#define Q_TAILQ_HEAD(name, type, qual) \
-struct name { \
- qual type *tqh_first; /* first element */ \
- qual type *qual *tqh_last; /* addr of last next element */ \
-}
#define QTAILQ_HEAD(name, type) \
struct name { \
type *tqh_first; /* first element */ \
@@ -107,11 +102,6 @@ struct name { \
#define QTAILQ_HEAD_INITIALIZER(head) \
{ NULL, &(head).tqh_first }
-#define Q_TAILQ_ENTRY(type, qual) \
-struct { \
- qual type *tqe_next; /* next element */ \
- qual type *qual *tqe_prev; /* address of previous next element */\
-}
#define QTAILQ_ENTRY(type) \
struct { \
type *tqe_next; /* next element */ \
--
2.19.2
next prev parent reply other threads:[~2018-12-10 18:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 18:28 [Qemu-devel] [PATCH for-4.0 v2 0/8] qemu/queue.h usage cleanup, improved QTAILQ API Paolo Bonzini
2018-12-10 18:28 ` [Qemu-devel] [PATCH 1/8] qemu/queue.h: do not access tqe_prev directly Paolo Bonzini
2018-12-10 18:28 ` [Qemu-devel] [PATCH 2/8] vfio: make vfio_address_spaces static Paolo Bonzini
2018-12-10 21:23 ` Alex Williamson
2018-12-10 18:28 ` [Qemu-devel] [PATCH 3/8] qemu/queue.h: leave head structs anonymous unless necessary Paolo Bonzini
2018-12-10 18:28 ` [Qemu-devel] [PATCH 4/8] qemu/queue.h: typedef QTAILQ heads Paolo Bonzini
2018-12-10 18:28 ` Paolo Bonzini [this message]
2018-12-10 18:28 ` [Qemu-devel] [PATCH 6/8] qemu/queue.h: reimplement QTAILQ without pointer-to-pointers Paolo Bonzini
2018-12-10 18:28 ` [Qemu-devel] [PATCH 7/8] qemu/queue.h: simplify reverse access to QTAILQ Paolo Bonzini
2019-02-04 11:45 ` [Qemu-devel] valgrind errors (was: [PATCH 7/8] qemu/queue.h: simplify reverse access to QTAILQ) Thomas Huth
2019-02-04 15:35 ` Paolo Bonzini
2018-12-10 18:28 ` [Qemu-devel] [PATCH 8/8] checkpatch: warn about qemu/queue.h head structs that are not typedef-ed Paolo Bonzini
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=20181210182816.2014-6-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@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).