From patchwork Thu Aug 24 09:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 716537 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1237651wrp; Thu, 24 Aug 2023 02:34:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbQaexJwy5fzAJBcAWPP0Pe6k4Zf0Vf2vslgz/rvBu7Fo16ZthbD0JnHZsrcnb0nw68Bs2 X-Received: by 2002:ac8:7f95:0:b0:403:a662:a3c1 with SMTP id z21-20020ac87f95000000b00403a662a3c1mr19673182qtj.29.1692869677940; Thu, 24 Aug 2023 02:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869677; cv=none; d=google.com; s=arc-20160816; b=u9bWQHCaLIbq6GcZuqkuGcfH8K9WfpZJd+1zaLTgN/SLxdx4CXd75Wstske5fbBbJc kzymkj+BJ+ycETKNeRbZNMs/zj7nykY5ow0Idn1g2dLLEgspbbysI8aRI0yQUDWAkqsV 0FsFTjJyQP9UanJ00x12uFna09a3P2aOVbmlTTI3wgtsq/8lXXZEJEWCXgVBgH4uf8u1 Xec2MYtiG45E0OUUWUMLDsQ5eeIQtj0C0Klqx5FXlizdZCL9u1tHwii64C2K3crOoSf+ BzyMPsV5jYM7QbZt27cqCIpQ3meMrf/lPJx6HT5sATHAYRVRMSQXA3qWEmUuoTRBf2fU OxxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=tswNfDLVJW3+gP/uE8SUQjolW4HExHb2Af24QmhcctE=; fh=bFDrUYhlTVi/QyetgXx/byg2+yO/22Hp9SjwoefyKLk=; b=leMkJZzWQaOafTvMM1LqFrD+5k1x2YrI8qaQz53Uy3FazOyu4Jqt5d3wUsOAcwyjHj ZrGykQFKGTdIiSgZzYedEnsCTUnVaSQLKkarKkQ2xvKi3i4PO5GvI5ukbuux2vN3/PTd BU1NQTERP+DUlNgBFYziiwJJ0CS/BZHq/81V/HMMj5fHxwdW7/Xo8JdmNS5qIrR1boJV h6f7bIB9Tc+mUW7FijGirlMGyE1n8f8FLAN3Q6uDUpghu2D4xQNG+nnDCQvSPZS5pOMh MYTNLZcFI96OijrWagSPZ9ybQ+WZVZpm+q+jvI9iuJwR6YEa/Uz18eFcXfznIzDSRvWc 9JMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mTf67cUp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r12-20020a05622a034c00b00401e02e6338si8249502qtw.601.2023.08.24.02.34.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Aug 2023 02:34:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mTf67cUp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ6eC-0004GE-KB; Thu, 24 Aug 2023 05:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZ6e0-00044D-EC for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:51 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6du-0004xV-0H for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:45 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3fefe898f76so17945275e9.0 for ; Thu, 24 Aug 2023 02:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692869319; x=1693474119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tswNfDLVJW3+gP/uE8SUQjolW4HExHb2Af24QmhcctE=; b=mTf67cUpxCi0l+pJ/pxovfAuHgB6d+uLa3Gpb+29MZJrgwrntCKo3WG0w2MDEI6VAZ Jq3cGBJBNdR05FyZ0ppBmlpkM8Q4Yz6FLuXLwg/LspYrKZHP07UsUl+OifcBkyieYaKB PzCD2fQQMnX+N+boCgzCSWIeoz10k9+1Or650+aOOSCTxWf1rEgFfK9mtfZhSCCPovuM dqHZmX+BKKYr2oTTGJ17oJIj7O4fbM2dl5rdhZtLsyR/hRLnjvjqvSAF8e2djuXFPh12 xl8JjeDuezKF7Oy/eqbbNYDJgDfuPEREcsJVkBA/rImGsUbBCPoNU+QLdurA+tREKc20 NuaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692869319; x=1693474119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tswNfDLVJW3+gP/uE8SUQjolW4HExHb2Af24QmhcctE=; b=bW7HoxSVnYtvq+kINUXtihjl/GtPHMwoc5AZoKLz1sR7Gerc8T4jCijXYueqDmFO61 lzPT8njElRdu+S5N1L1r8wOnOU5DAskAfgFKAR2/XfmoKzq9OT59qoJJrUPq5Q4CInIb 4Di9OuPImMAjnEcbzg+EicFlZMNrRN0Iitc3ah1VTF3uBnaSMxHshFiIzDQlA4ILbzlQ Pfhg/vVDWB6BJzBXuaMyxBq5JlO9XirtDVMO/7zFvendMWlYytrLa2ryVtR4ii4P+vHD LZaK/2k1Iw6nlbSjhkAU0R54isKDjZ6Vh5PtCyclY4XSvHYZ/r6Tv7Ru7X2mjEnofPgR hOgg== X-Gm-Message-State: AOJu0Yzzai/lY6wMurF4wnRWgM0qc7CAmu+zUySFb2Lq1W8vX1OqlC7F yI2GotIEyCelHmKKAQ+dqa/Rcj7THNDanglmtfM= X-Received: by 2002:a5d:51c1:0:b0:317:58a8:baa with SMTP id n1-20020a5d51c1000000b0031758a80baamr10406293wrv.28.1692869318661; Thu, 24 Aug 2023 02:28:38 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b00317b5c8a4f1sm21844004wro.60.2023.08.24.02.28.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 02:28:38 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/35] qtest: factor out qtest_install_gpio_out_intercept Date: Thu, 24 Aug 2023 10:28:03 +0100 Message-Id: <20230824092836.2239644-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824092836.2239644-1-peter.maydell@linaro.org> References: <20230824092836.2239644-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Chris Laplante Signed-off-by: Chris Laplante Reviewed-by: Peter Maydell Message-id: 20230728160324.1159090-3-chris@laplante.io Signed-off-by: Peter Maydell --- softmmu/qtest.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/softmmu/qtest.c b/softmmu/qtest.c index f8d764b7190..1b864891629 100644 --- a/softmmu/qtest.c +++ b/softmmu/qtest.c @@ -365,6 +365,15 @@ void qtest_set_command_cb(bool (*pc_cb)(CharBackend *chr, gchar **words)) process_command_cb = pc_cb; } +static void qtest_install_gpio_out_intercept(DeviceState *dev, const char *name, int n) +{ + qemu_irq *disconnected = g_new0(qemu_irq, 1); + qemu_irq icpt = qemu_allocate_irq(qtest_irq_handler, + disconnected, n); + + *disconnected = qdev_intercept_gpio_out(dev, icpt, name, n); +} + static void qtest_process_command(CharBackend *chr, gchar **words) { const gchar *command; @@ -415,12 +424,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words) if (words[0][14] == 'o') { int i; for (i = 0; i < ngl->num_out; ++i) { - qemu_irq *disconnected = g_new0(qemu_irq, 1); - qemu_irq icpt = qemu_allocate_irq(qtest_irq_handler, - disconnected, i); - - *disconnected = qdev_intercept_gpio_out(dev, icpt, - ngl->name, i); + qtest_install_gpio_out_intercept(dev, ngl->name, i); } } else { qemu_irq_intercept_in(ngl->in, qtest_irq_handler,