From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26052C433EF for ; Mon, 18 Oct 2021 16:25:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D06B560F9E for ; Mon, 18 Oct 2021 16:25:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D06B560F9E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:32786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcVRr-0005B1-7T for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 12:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcV96-0007kv-5i for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:55 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]:33732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcV8v-00088B-GP for qemu-devel@nongnu.org; Mon, 18 Oct 2021 12:05:51 -0400 Received: by mail-io1-xd2b.google.com with SMTP id n7so16966711iod.0 for ; Mon, 18 Oct 2021 09:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jkxdthMQGPp9kZB9oWq7ZCkR2L8kWX3z9UnL4TGn9bM=; b=CI5KBPq5zOER23DtLBjNvD51J13CbeFXpn9unuHyaznDpg8/UmpecSUTayfx1OCQb4 sHk+Qk1nd7snAWjfSS2PMXS67aeH3n49W+Tsbgt2zKhbtji0rkejDHpJmkbZyNh+u70Q IEgDdllRNFMMJNpB1aUsldnlgzKWPn9H3rr5v6KC7M3L8/GcvlpInjrIRzzUObkruBKG 9XpxFcNDjf/Xs5VP8Q5RGSUyc+HeGTM1F01tSQMTKKWkrkTiN9iaNGmDeKjYCguskUl0 Om3KS/THg64NuHllcW2TCZ4+hq7KK+pnEbYvVK81D7ExGszeD15S8czi8bKEH9JR6Uin +Tcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jkxdthMQGPp9kZB9oWq7ZCkR2L8kWX3z9UnL4TGn9bM=; b=vR/kTxi9svWCKQCSPo1VzUdAFKk8XGz2/R/LmCoGvw04va03raEMIvgkEAEJeqa43V M9ePzuPD6rozQTlCup2TWhKatF8TKuCltilNRy79LA1NkUtKE5tRCy6bGN7zDJ+ShTai /DR17GYhtJ2uZ3NllBDV/o34n35m9cjJYSzZaepFRg7b6Gqg7+UeTeUpMJIjy0W8sckM 6rpwJTAhD5XZI5BY6FPY32Gk0yBk8KU7Gan3Fub6fNKl1SqPs+eQhDsvydXgby7AhJf3 8N+7C24je7kafOKdyUjzWNpUFXS1Emaz7Pxvvl7xTTDo52riCCSvrMz5x+aPeAZwS3mn ohtA== X-Gm-Message-State: AOAM531oj6Jlxro8snNa92Bx9eoYw6RTq0mygQtkEZmMHoBW6KbAaQo5 JN69IKq/5UmvZiX4iMvj5+V3IYKK2mVm/Q== X-Google-Smtp-Source: ABdhPJwYqpmpHTrnA4dRYzmC4RMvIjsxykp0dYeSkNxeIixF5xiHdol+IdFUEewsJU089c/tAI46ag== X-Received: by 2002:a6b:7a01:: with SMTP id h1mr14770033iom.55.1634573136394; Mon, 18 Oct 2021 09:05:36 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a4sm7240936ild.52.2021.10.18.09.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 09:05:35 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 22/23] bsd-user: Rename sigqueue to qemu_sigqueue Date: Mon, 18 Oct 2021 10:04:57 -0600 Message-Id: <20211018160458.1976-23-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018160458.1976-1-imp@bsdimp.com> References: <20211018160458.1976-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::d2b; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To avoid a name clash with FreeBSD's sigqueue data structure in signalvar.h, rename sigqueue to qemu_sigqueue. This structure is currently defined, but unused. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/qemu.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index e65e41d53d..ba15b1b56f 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -73,15 +73,15 @@ struct image_info { #define MAX_SIGQUEUE_SIZE 1024 -struct sigqueue { - struct sigqueue *next; +struct qemu_sigqueue { + struct qemu_sigqueue *next; + target_siginfo_t info; }; struct emulated_sigtable { int pending; /* true if signal is pending */ - struct sigqueue *first; - /* in order to always have memory for the first signal, we put it here */ - struct sigqueue info; + struct qemu_sigqueue *first; + struct qemu_sigqueue info; /* Put first signal info here */ }; /* @@ -95,8 +95,8 @@ typedef struct TaskState { struct image_info *info; struct emulated_sigtable sigtab[TARGET_NSIG]; - struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */ - struct sigqueue *first_free; /* first free siginfo queue entry */ + struct qemu_sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */ + struct qemu_sigqueue *first_free; /* first free siginfo queue entry */ int signal_pending; /* non zero if a signal may be pending */ uint8_t stack[]; -- 2.32.0