From patchwork Wed May 13 17:31:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 186665 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp656827ilb; Wed, 13 May 2020 10:33:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRuv+p7edlAMsJiBwlUl5FgU9jhvIAFLtRQPzlOp9r36ZbxoaAM67Xj5wb/1vZvwm0S/Hn X-Received: by 2002:ac8:3383:: with SMTP id c3mr225955qtb.220.1589391181318; Wed, 13 May 2020 10:33:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589391181; cv=none; d=google.com; s=arc-20160816; b=SPCziSNFjD1sG98GEX3jQWw7d2zyYs7T3i7CiVepdOR9VPHJ0U0zEUjalIF/haV01f cs6rgeXAUHTS7fPZPBS+O0oGm7Hc/6f/kwkdaNxelaoRBQAMio05K07nmdrISCxizzzk Om1JWSgXoxhvnx961qiCri+Etg8i88qdEvwGuRB8qjtsHspWJ49biz5wHn5xQigT9ogk DDiyQDvjrQo5LqtIBC8Ba/xbIGRUT/sjD1rReE9Uvr9vue35QSWZTE0gez7cViPlkZBh 7lX85E4s2FR0+eAx4El6/quHJWHqMMgP1X6LXLxgF/BIPCcFnJw817Q9EgwIeNP/CAdU Q/6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=t9Sop/JZIFc8+KcCWQNsKU9OCXVZGmJjWJpVbXq1m9s=; b=WzXW4VxmlOQqfkkSaEBAux32HBFb7JJ0debWoHW9AlDirxC2Eyus9Tkc1Mq9WEQi24 lnTV6EA7aIPWDlpq+JzZpqQfVsWmYnMACtrFVcPG1yOq2v+OVAOaYEV3IJSv4LeX0ahV Phzj0SSCKIci2rRsjdD8IxNs4KrlSZxaxeVDP20fG7JYDXsrbR4+DY9nW8cNHfWYjDUG hra0o7Z4N1I19ln2ktWywn9OIhz9wfzKZL+YMx6xvgCGqR2y5divykFRIxFd5dZr+MhI unEgmK3WM8gQBBupdJYluxGlPmhAwWEoLiGFWXECdxMBfHfaPaRLgmLm4Y8Q7sy4JTXJ s43Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q3IXCHJ9; 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=fail (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 t51si288204qtj.31.2020.05.13.10.33.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 May 2020 10:33:01 -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=fail header.i=@linaro.org header.s=google header.b=Q3IXCHJ9; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYvFc-0004lf-SI for patch@linaro.org; Wed, 13 May 2020 13:33:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYvEp-0004i3-87 for qemu-devel@nongnu.org; Wed, 13 May 2020 13:32:11 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYvEn-0007lP-06 for qemu-devel@nongnu.org; Wed, 13 May 2020 13:32:10 -0400 Received: by mail-wr1-x441.google.com with SMTP id e16so445908wra.7 for ; Wed, 13 May 2020 10:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t9Sop/JZIFc8+KcCWQNsKU9OCXVZGmJjWJpVbXq1m9s=; b=Q3IXCHJ9ags7AJsZ3eetC1UY49ttWRma2/I/aiUyBZkOjOcDOoOiDqNPipFY7iQRXc MDa3DOUnbJD09FVa28baN2AeEc2Ndwsifqb4C7Y/gyAxtgM+pHwT5U288Vg0WmDyXNpb QZG4BR3sQa3MW+bosBnNpfgbq/57fXjKZw0OZWCs5SYr0eguQEENih4jsude7X+4wsKD MvGJmVj/xy7b+bFaAAvhw68Pl8fRmtPkgrUWQ4jRS4lkJZbfLGquFOiERUcFqq8WHDcD 6c/CMO8p2xZSQ46/6Vmahp1e9rPHw/WieJl+sw5iuu7B88NyI0/9cq9wMeG8fGaDJV7U h9pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t9Sop/JZIFc8+KcCWQNsKU9OCXVZGmJjWJpVbXq1m9s=; b=trJCl3qpT0PQJHm8b/9X36mOHiMnWVvMZFSXpXWgKS5BWhj77msUEAdo7D79fWHlxw 0fNWJg/7h8RsXUJLOb+myX7YDqUABIy+LpBpan8IXToTilXeciEOvFKkUuUSmSW/Vj5E i4qxifKf65qneLcZY5n6l+C4rxUPkBLsj9iGVyGrOMLunF5KK5Ci4/gntNQNm73oo2KX JJCVpdybRJeOl0wQ5ekHiM7Lih1PE9K2JO5nyGtbt88mSl2+aZjAkUWT115pv1i2Cg/+ Yu6m4Xq5eVX2J0Ci2Zb5uW8yITJkWJl5ijQPjt9Fe8SRdbsQ3WST+PfU/vzmXJioobwR nopQ== X-Gm-Message-State: AOAM530BAyEx8gXV9QB+q+3XLNR2iTgSDU++Qw2wLgmY6n23ZCk8IEy3 XhkTRMGJhqVoHraTk41PsJX/4A== X-Received: by 2002:a5d:49c4:: with SMTP id t4mr408377wrs.127.1589391126623; Wed, 13 May 2020 10:32:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 81sm20821140wme.16.2020.05.13.10.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 10:32:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 162461FF8C; Wed, 13 May 2020 18:32:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/8] qemu/plugin: Move !CONFIG_PLUGIN stubs altogether Date: Wed, 13 May 2020 18:31:54 +0100 Message-Id: <20200513173200.11830-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200513173200.11830-1-alex.bennee@linaro.org> References: <20200513173200.11830-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Simplify the ifdef'ry by moving all stubs together. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200510171119.20827-3-f4bug@amsat.org> --- include/qemu/plugin.h | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) -- 2.20.1 diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index e45f950fe36..ab790ad105c 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -46,22 +46,6 @@ static inline void qemu_plugin_add_opts(void) void qemu_plugin_opt_parse(const char *optarg, QemuPluginList *head); int qemu_plugin_load_list(QemuPluginList *head); -#else /* !CONFIG_PLUGIN */ -static inline void qemu_plugin_add_opts(void) -{ } - -static inline void qemu_plugin_opt_parse(const char *optarg, - QemuPluginList *head) -{ - error_report("plugin interface not enabled in this build"); - exit(1); -} - -static inline int qemu_plugin_load_list(QemuPluginList *head) -{ - return 0; -} -#endif /* !CONFIG_PLUGIN */ union qemu_plugin_cb_sig { qemu_plugin_simple_cb_t simple; @@ -182,8 +166,6 @@ struct qemu_plugin_insn *qemu_plugin_tb_insn_get(struct qemu_plugin_tb *tb) return insn; } -#ifdef CONFIG_PLUGIN - void qemu_plugin_vcpu_init_hook(CPUState *cpu); void qemu_plugin_vcpu_exit_hook(CPUState *cpu); void qemu_plugin_tb_trans_cb(CPUState *cpu, struct qemu_plugin_tb *tb); @@ -207,6 +189,21 @@ void qemu_plugin_disable_mem_helpers(CPUState *cpu); #else /* !CONFIG_PLUGIN */ +static inline void qemu_plugin_add_opts(void) +{ } + +static inline void qemu_plugin_opt_parse(const char *optarg, + QemuPluginList *head) +{ + error_report("plugin interface not enabled in this build"); + exit(1); +} + +static inline int qemu_plugin_load_list(QemuPluginList *head) +{ + return 0; +} + static inline void qemu_plugin_vcpu_init_hook(CPUState *cpu) { }