From nobody Fri Nov 7 00:45:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544629458429328.56847338579337; Wed, 12 Dec 2018 07:44:18 -0800 (PST) Received: from localhost ([::1]:45664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6gL-00014w-7A for importer@patchew.org; Wed, 12 Dec 2018 10:44:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6Mc-0000uK-OL for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6MZ-0000Ib-OV for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:54 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:40847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6MZ-0000Gj-EH for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:51 -0500 Received: by mail-wm1-x334.google.com with SMTP id q26so6345460wmf.5 for ; Wed, 12 Dec 2018 07:23:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=5cfkLTepo76y9FfWp+HiMhJbhnyEa8g2c7/EjtroLQc=; b=RbN05hynW+1bUHZmZbyhvFYv499YD2k5pEMmsoh0ETgAL+RDFgfhHUlExubQkGVnNL x2MMXcUjZIajB/s5Uej5UzkWw/7p8humvwfoQPdA87FvKiQSTJeuhPTp9q9lZ64+yDx4 ZuiDCAa9bVUEuzYpQHx5RDJbcR33znahvme1NZ7mg2CKIkHOdc0fLGMq/ovf0ZaDGMo8 859bgkMtQQC2AI7MoAY2QvNrlXVsFOyQVodIE0YNmTyT+OsvNLwvcRAmKw9mpRodLOYJ G/O7n0e+FPsT7i41pu6Jl1eXmDNRdw9icxxNkU67npHwcoBKDQY8dmIlS4MT8Wfwcz7z AVRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=5cfkLTepo76y9FfWp+HiMhJbhnyEa8g2c7/EjtroLQc=; b=JalWga164/aK8hoA5BOyF4MxogEec0hNTYMLCv22TdWSIkJQc7RK/X0UkLTjwJ5ksb /NvvbGvhJZ0BE0b7XZ+pSooCLqZHS0vPNeaKa38xzB9VeyiSFdcQjcuDvhG4Eq0pUehZ dE2eSXIh2HKcFxo7oNudEW0fSJShkJ8w3ELJnTk1D9SVfWKebVGywBufHXC1P2U8o0Q/ DaDMqPRKqv4zm3Hy87ZmsIECY0n+hY+itQACACsqNqkMUWuDVb+axrIk9Z0kLETiDyCN JEiTvL6lesWDZG03x4jTVhhddrEl0YZGwDkjeiBkI3pXwuZ2NOwo/t6Bl3VEqbKENHpq kZ8g== X-Gm-Message-State: AA+aEWZLlDVVtQpOgUpTT9uNY8g7p22iFhCQC8/k7C1cWSG8hjEZ9MoY uVgMd52/yzOwDiCwSkBcpl9blK+Y X-Google-Smtp-Source: AFSGD/V4BnrXtDDbaoSkLsHvWk+MfX8ykg1W7BLTVd+fPh6cjU7YYtcf1I0MzjTRMqdTolQSw814FA== X-Received: by 2002:a7b:c397:: with SMTP id s23mr4618767wmj.127.1544628229985; Wed, 12 Dec 2018 07:23:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:50 +0100 Message-Id: <1544628195-37728-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 29/54] qemu/queue.h: remove Q_TAILQ_{HEAD, ENTRY} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 ac418ef..b9571e9 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,) =20 #define QTAILQ_HEAD_INITIALIZER(head) \ { NULL, &(head).tqh_first } =20 -#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 elemen= t */\ + type *tqe_next; /* next element */ \ + type **tqe_prev; /* address of previous next element */ \ } -#define QTAILQ_ENTRY(type) Q_TAILQ_ENTRY(struct type,) =20 /* * Tail queue functions. diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h index 9f2e72e..5c49369 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 } =20 -#define Q_TAILQ_ENTRY(type, qual) \ -struct { \ - qual type *tqe_next; /* next element */ \ - qual type *qual *tqe_prev; /* address of previous next elemen= t */\ -} #define QTAILQ_ENTRY(type) \ struct { \ type *tqe_next; /* next element */ \ --=20 1.8.3.1