From nobody Tue May 7 16:34:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618330749; cv=none; d=zohomail.com; s=zohoarc; b=HCsMsqdbxZaOdsOAGUoUtAupfyN/pB/wI5JFSsJAUneO/hGTE17O7VO226W8tpE9D+XU7vKN4+iYHrMCIgTwzzZbRWiHjbvIgFklDnRJ+EOM5egi8FjWgn252ikv/14wq3R+ncJPlJz/iUdNuq5bntEwrWTKRv6DIv4qRi5f9io= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618330749; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GYYM676T6K8E6MUwjt+OWaC5EYYCUhAjll3beQRTaTY=; b=kdkneeCIxgY3ItrkpKJ4Fve2g1h4i5yCB04Sf6luE72+j+z2cLntiT9fR+2+ZeZLS50iENCxl0pvRKyShZ7ARoCifq4OUu7dxVmpHLwiET0AMyjaGGuO3KQl7X4q4uYdjNgvy6NCF3ovKw7TBlXqjsvET8cDhYlXaB1XfFqkGkg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618330749921531.662155759366; Tue, 13 Apr 2021 09:19:09 -0700 (PDT) Received: from localhost ([::1]:41912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWLkr-0002eP-6D for importer@patchew.org; Tue, 13 Apr 2021 12:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWLax-0006zl-Qf for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:55 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:40468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWLaw-0007GM-4l for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:55 -0400 Received: by mail-ej1-x629.google.com with SMTP id n2so26799483ejy.7 for ; Tue, 13 Apr 2021 09:08:53 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id u19sm9897670edy.23.2021.04.13.09.08.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 09:08:52 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=GYYM676T6K8E6MUwjt+OWaC5EYYCUhAjll3beQRTaTY=; b=WlXzZ5OE2Rxl/EDu55R6ZZRknKashJ6rOHBWWR95XFoA+k7E+IPaZkF/pQi0wqHbFB aA0ciGiRfkazG2CGCTtr57pl//rggfIwBFGLv20trSgB/6ZaPpj+M3eCMU4v1FTRlWU9 vjHVi071mwoEwEAAfy3x7Te/Zrvh3bgPqxzSsupG8ywdEi/ZJDsWGtEhEtK605CUG8xx ZByxCr/f6239F8TaVCov7lMENoPLAP4flvQSUcd1YHGAjEQXhujbmvV0GybsgDIjkM9n yix7JIPkycFrYzzSaFJqbamYtIc3JCErDU6p4nGVL22wnxrbpXMmd+0lV51GykQFJqow MCuQ== 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:mime-version:content-transfer-encoding; bh=GYYM676T6K8E6MUwjt+OWaC5EYYCUhAjll3beQRTaTY=; b=aM8fOoceCop1HgesPWcYOvPUnmwsjFhERNAPqJ7E2RGnxOFYQcq0qOXviaLLffcmh9 FBtH3vWA2EGD7QVoC9HDg1Z/PQt5BA+Eed9rSVn2EUBM2fz2hdowkOGoABpwsqsXQDdm Q6wTcV6TTbDQ5/1nJbbgOPbUQtsaL2KeN44vrMp79U4Mvuf0aS9HHfM4/XQ2ettzypZt qwtvrUxa3Xf6gA0jgZv3df3iEg04mav1xLfmTeT+inoqxgC0aLVSB4pmCihUkTpj0t3r yVj62YKmWg8GigezGR3GsvV2YbuDOBhvmCwPNng6/KiKZp4P9zyEMxbRC3q5knR3hFbI vdSQ== X-Gm-Message-State: AOAM5332bqvC9UjFnzaTKQdU9UmqM8aQ1DZxETPiKCl6/24zDtzQDWLq 9c/UNjeRf0ZhF16pK0tZIzLXYQ8CItk= X-Google-Smtp-Source: ABdhPJwF6eE+IPaNPsOANh7+kGkG6DrRo9BPnSTBnxfypTaZLeI0i1WmgCEPqDG07hkvmO5IuaB4Vg== X-Received: by 2002:a17:906:4756:: with SMTP id j22mr5932119ejs.506.1618330132832; Tue, 13 Apr 2021 09:08:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v2 1/3] osdep: include glib-compat.h before other QEMU headers Date: Tue, 13 Apr 2021 18:08:48 +0200 Message-Id: <20210413160850.240064-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210413160850.240064-1-pbonzini@redhat.com> References: <20210413160850.240064-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" glib-compat.h is sort of like a system header, and it needs to include system headers (glib.h) that may dislike being included under 'extern "C"'. Move it right after all system headers and before all other QEMU headers. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- include/qemu/osdep.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index ba15be9c56..b67b0a1e8c 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -111,6 +111,8 @@ extern int daemon(int, int); #define WEXITSTATUS(x) (x) #endif =20 +#include "glib-compat.h" + #ifdef _WIN32 #include "sysemu/os-win32.h" #endif @@ -123,7 +125,6 @@ extern int daemon(int, int); #include #endif =20 -#include "glib-compat.h" #include "qemu/typedefs.h" =20 /* --=20 2.30.1 From nobody Tue May 7 16:34:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618331386; cv=none; d=zohomail.com; s=zohoarc; b=M7ZPepZakafHg6VzJvxIruWMMX4CyQMMN5uZJmmDpjPmLxrZjCaQbRDZ/Ahuv4+7/tCUap7fi6cAV2t/EezijwW2nN6egOjEpEk13zkBfYPvotJ/xlc0+dNq66FmmMJl4CiaXyyMKkYWj9v+q2V8rEiXpjIgU3h99yqdCLkvI44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618331386; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e+0DU0nssNE9Dqd2GnOeTqteOT/NqCeugXBt1xrlSO8=; b=nAlp+QbcCtAolhPZP9b22U6nul+oOq3wUCdsfBIDn96vyIwdcWI3r5yhui+/YXRRovVPhSwagn/U43YJS4qT/Vin9oafJ437elNCzts5Ii5t0yah7v4SL7tt7F3qF6/34Ne43uXb74VDFrwBy0C4pKseKuJSH15JNsHF/dLudLM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618331386818824.9243168165215; Tue, 13 Apr 2021 09:29:46 -0700 (PDT) Received: from localhost ([::1]:42300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWLv7-00063W-A3 for importer@patchew.org; Tue, 13 Apr 2021 12:29:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWLay-00071x-Kj for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:56 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:43796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWLaw-0007HD-T4 for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:56 -0400 Received: by mail-ej1-x62c.google.com with SMTP id l4so26793014ejc.10 for ; Tue, 13 Apr 2021 09:08:54 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id u19sm9897670edy.23.2021.04.13.09.08.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 09:08:53 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=e+0DU0nssNE9Dqd2GnOeTqteOT/NqCeugXBt1xrlSO8=; b=uN1uvx461op83sZWSReRLWw47BI0mcFC9uIPRsx1koHAz7L3gtdx1YFfzMX1CCuMBT vZ93Z1sZ+3sAvlEARB8U5tWx0wnYAYvLZlr1bWycNv9ANjILfJarwxXdq+O1ohfdWvRb jrtQmEK3SyDWlEd/NXHJygn5sZeKtj9eX5fEI8Wx9cEVPGBFAK4X2yLqK0SATy5For+Z /20kAEDlHGdEOEz9g4m+PqMw83fLBwoOyl79jdm8tmZtnOlyBjrk0sXRfqmpx2qfkUCk JfcQNInGXEB747YoHmaqiO/sYKrNpEodbyLA58dFDn0qWwB4Uzt3zb2NApKCegXx8Rw6 UCNw== 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:mime-version:content-transfer-encoding; bh=e+0DU0nssNE9Dqd2GnOeTqteOT/NqCeugXBt1xrlSO8=; b=VC6ICaSj+pLJ2AssU6V98fFRvwe9oRdiIA2CdX9BiOupxDLq4Szpm5EEuuVHxIj7uT /v7Vie4Ac2mT0dzvwFcT3lk0g2322yqEmx85AJ0h0F6ivyCI+RC66G3oxpp0QuXphlkO P1+kfto63+I6ha2v1cacvpsXEKufTr/wljwe41ryWDnmzOZ5t/m5+kpKXvrQ74bHJpyn bNXvfJArmcwtVApSu7OKLcG7keFGJGQCCkqJytTDwQOZdUoEewA2NrTLWUmir486NAi2 Tjs6377TI0pmhVGb5baRAUnzaf7su191lQ4CJmpxhDOds2qh7tZi5EZUtfxBHV5wNu/Z 2N6w== X-Gm-Message-State: AOAM533ZDKnsQ5aaFBWg1oSsGjttsSdIP1EvFTmK2pVXf5QRrq+CoN3B 7pryeh63YZIjrF4PFObBLgGlC+4CyIk= X-Google-Smtp-Source: ABdhPJxj9B38PNKSx1kJh06HI4upEnYSWRJEi52kgvBtKxsOoMeLE3FOOejhK1jZ6f4f39yKxgZKEA== X-Received: by 2002:a17:906:dfcc:: with SMTP id jt12mr33167316ejc.31.1618330133489; Tue, 13 Apr 2021 09:08:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v2 2/3] osdep: protect qemu/osdep.h with extern "C" Date: Tue, 13 Apr 2021 18:08:49 +0200 Message-Id: <20210413160850.240064-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210413160850.240064-1-pbonzini@redhat.com> References: <20210413160850.240064-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" System headers may include templates if compiled with a C++ compiler, which cause the compiler to complain if qemu/osdep.h is included within a C++ source file's 'extern "C"' block. Add an 'extern "C"' block directly to qemu/osdep.h, so that system headers can be kept out of it. There is a stray declaration early in qemu/osdep.h, which needs to be special cased. Add a definition in qemu/compiler.h to make it look nice. config-host.h, CONFIG_TARGET, exec/poison.h and qemu/compiler.h are included outside the 'extern "C"' block; that is not an issue because they consist entirely of preprocessor directives. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- disas/nanomips.cpp | 2 +- include/qemu/compiler.h | 6 ++++++ include/qemu/osdep.h | 10 +++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 2b09655271..8ddef897f0 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -27,8 +27,8 @@ * Reference Manual", Revision 01.01, April 27, 2018 */ =20 -extern "C" { #include "qemu/osdep.h" +extern "C" { #include "disas/dis-asm.h" } =20 diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index cf28bb2bcd..091c45248b 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -11,6 +11,12 @@ #define QEMU_STATIC_ANALYSIS 1 #endif =20 +#ifdef __cplusplus +#define QEMU_EXTERN_C extern "C" +#else +#define QEMU_EXTERN_C extern +#endif + #define QEMU_NORETURN __attribute__ ((__noreturn__)) =20 #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index b67b0a1e8c..3f8785a471 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -57,7 +57,7 @@ #define daemon qemu_fake_daemon_function #include #undef daemon -extern int daemon(int, int); +QEMU_EXTERN_C int daemon(int, int); #endif =20 #ifdef _WIN32 @@ -113,6 +113,10 @@ extern int daemon(int, int); =20 #include "glib-compat.h" =20 +#ifdef __cplusplus +extern "C" { +#endif + #ifdef _WIN32 #include "sysemu/os-win32.h" #endif @@ -723,4 +727,8 @@ static inline int platform_does_not_support_system(cons= t char *command) } #endif /* !HAVE_SYSTEM_FUNCTION */ =20 +#ifdef __cplusplus +} +#endif + #endif --=20 2.30.1 From nobody Tue May 7 16:34:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618331662; cv=none; d=zohomail.com; s=zohoarc; b=CcUBV8CaJH05WIVnXmdLLv7YzGMWqxlmToJw/TNhb3Zx8vaEA0ywCsp/VtPkRiWo1zuqx/Jae6MLWpdVUV72F4JkdHF7jPWORphs0EZrma53iqWs8724I0N4fPlgsH3tJzH/ljjR91q7csfJs86KI1MJOyp9xSp7maWcaxcn9nI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618331662; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qsvSz9M49RzWb+6RGDeUXmR8bevynykltE41KgLy07I=; b=UuYJw+SGA4tH3PB9htQSzFOSVDxjRzHhQtDEHYRHMWStXKad14H0mU8zKT1sBUJt+m0IwXIlCpHZBLTeefQ2X7Jv1c7wY6Ij2mSqBGRGu7vDG2svKcyZgnw2GZGBDNjgAwOC1K8uiV/+L//eL+tbhciHon7d/GZNWUh5bf+9PKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618331662098153.64542457311825; Tue, 13 Apr 2021 09:34:22 -0700 (PDT) Received: from localhost ([::1]:48986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWLzX-0000VU-5a for importer@patchew.org; Tue, 13 Apr 2021 12:34:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWLay-00072m-VQ for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:57 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:46997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWLax-0007Ht-C5 for qemu-devel@nongnu.org; Tue, 13 Apr 2021 12:08:56 -0400 Received: by mail-ej1-x62a.google.com with SMTP id u21so26808241ejo.13 for ; Tue, 13 Apr 2021 09:08:54 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id u19sm9897670edy.23.2021.04.13.09.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 09:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qsvSz9M49RzWb+6RGDeUXmR8bevynykltE41KgLy07I=; b=Tg+6slIxNMnxwrDVcyVT0TF1wA+Xrtb182sjzbUHdKUXT8pnazuwlwaekv4QtxWG97 ejm/U1wCqEVo2psGL5PHwUjGD9iuZ2KNCy7wGhD/OZ4n69zQ2uxYOKiNojnWfCNRrkIu sBMWkF6ZeUPdV/v50xKgv+TUAl6JtESEsVV6uokCAKBbKCPAPypJ5ymd2BhLq99j7sYr Etllm4eMBCEjK+dYBZn7KieyPD4PLhcORvFbGgcJbILfZqPtHUJUQgbIpT9eOJvmYFnZ ybzQkZYmBYU0jOrVVGKD53XYa33BtEn5EHtBkE5RZQT7TV96ifQufroRCB2GVjG/HlPa hvnQ== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qsvSz9M49RzWb+6RGDeUXmR8bevynykltE41KgLy07I=; b=s0N4DaCFnOSlv7O2gY6C1r4dEMZbrG30HgZKUDvC5PS6yuo1Pes2H1QkBvI5FQrNcY 0fnQxp4v3uFVervAMagdzcj6Nv2P2r+XuGNtIfyn5llS0Epk4if94tqf2TdxYQ4hNASc WJppKX4edDmljQWsxk6fJg6NJObtLDKjWRJkbqLnn78j9b7vIM6SmweT1dJC1tQQz6xR 5lFhAXtWUwhtXBVHqSH+SiwBVFHc9RupC1l9DZWNmTOnZKzmK8rx+aBChCL+B2riRPEf VX9/FdNT9ZkSIyCSbXYlxClC+7u0rdieGFUNAONpoTEPzYnQTg3Tc5MHdN6sXyOCAjvT TJTg== X-Gm-Message-State: AOAM532E4CQeFijnDO+JhlxWnAEu/KvsjaUwZRzfYgnc+IcL3htozbvz q7j1u4QTxDD2qay2T8rEvNu9oZa5q4U= X-Google-Smtp-Source: ABdhPJzH2La0PZXTRbYfxdSMOmiE6QcKqjITQ88f1EuEn+CqMNXWJTPkps/c6l27t42eBsHsjBx/WA== X-Received: by 2002:a17:906:c1c9:: with SMTP id bw9mr12599709ejb.239.1618330134121; Tue, 13 Apr 2021 09:08:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v2 3/3] qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code Date: Tue, 13 Apr 2021 18:08:50 +0200 Message-Id: <20210413160850.240064-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210413160850.240064-1-pbonzini@redhat.com> References: <20210413160850.240064-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Thomas Huth The ObjectType enum and ObjectOptions are included from qapi-types-qom.h into common code. We should not use target-specific config switches like CONFIG_VIRTIO_CRYPTO here, since this is not defined in common code and thus the enum will look differently between common and target specific code. For this case, it's hopefully enough to check for CONFIG_VHOST_CRYPTO only (which is a host specific config switch, i.e. it's the same on all targets). Signed-off-by: Thomas Huth Message-Id: <20210412160710.639800-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- qapi/qom.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi/qom.json b/qapi/qom.json index db5ac419b1..cd0e76d564 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -752,7 +752,7 @@ 'cryptodev-backend', 'cryptodev-backend-builtin', { 'name': 'cryptodev-vhost-user', - 'if': 'defined(CONFIG_VIRTIO_CRYPTO) && defined(CONFIG_VHOST_CRYPTO)= ' }, + 'if': 'defined(CONFIG_VHOST_CRYPTO)' }, 'dbus-vmstate', 'filter-buffer', 'filter-dump', @@ -809,7 +809,7 @@ 'cryptodev-backend': 'CryptodevBackendProperties', 'cryptodev-backend-builtin': 'CryptodevBackendProperties', 'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserPropertie= s', - 'if': 'defined(CONFIG_VIRTIO_CRYPTO)= && defined(CONFIG_VHOST_CRYPTO)' }, + 'if': 'defined(CONFIG_VHOST_CRYPTO)'= }, 'dbus-vmstate': 'DBusVMStateProperties', 'filter-buffer': 'FilterBufferProperties', 'filter-dump': 'FilterDumpProperties', --=20 2.30.1