diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-12-10 18:03:06 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-11 15:46:55 +0100 |
| commit | f95bb39cf1014cfffbc94a1b4cea42864940fe3a (patch) | |
| tree | 809e8e0f90f4d5e642d0b220c92312432ea16fcd | |
| parent | f481ee2d5e3d77c12a4c9a7756b8c2612aad84c6 (diff) | |
qemu/queue.h: remove Q_TAILQ_{HEAD,ENTRY}
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>
| -rw-r--r-- | include/qemu/queue.h | 14 | ||||
| -rw-r--r-- | 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 7e200a1023..e274ca3682 100644 --- a/scripts/cocci-macro-file.h +++ b/scripts/cocci-macro-file.h @@ -92,11 +92,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 */ \ @@ -106,11 +101,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 */ \ |