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 C58ACC433EF for ; Thu, 14 Oct 2021 16:42:44 +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 76AF060E53 for ; Thu, 14 Oct 2021 16:42:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 76AF060E53 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:49586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb3oZ-0006ye-D2 for qemu-devel@archiver.kernel.org; Thu, 14 Oct 2021 12:42:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb3c7-0003UE-1g for qemu-devel@nongnu.org; Thu, 14 Oct 2021 12:29:51 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:34373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb3c5-0000ah-ED for qemu-devel@nongnu.org; Thu, 14 Oct 2021 12:29:50 -0400 Received: by mail-ed1-x52b.google.com with SMTP id g10so26619594edj.1 for ; Thu, 14 Oct 2021 09:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ymag38oEBbrqHm3cPd24eKF4QvmHP4oq+k1kIJYRu9c=; b=JYJYFPF/mLdjTVlG4dLQamL8tzWO7D3g5LqeVKiP9ORzIP+AV78gkI6oeKTsE+eWcC 4vVBGBGdA8ZDw6NFQK76QFyFZg3Av3DGAQ1blLkg6bWjmJJLGE8OxLqCDf3AgHgvx7/4 VA11KxvpmzFHBgwJgztwxAq050nCmsFlmykY+obIt+8VopZkI+ya27nzEP2ZXmZs0qnY wnq+wFymSn4FISYaE2iNyWf5ELd4PUJQSuvf6hEr/1ngOJ5mL5A58y5OwYLRoX16HL9z THlL8IJm8RyzqZfRimOUqgXwMTyazbNvCaeG3bbA39qBAXswz2vNV4SIjw0B/P3sVsB3 XOMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ymag38oEBbrqHm3cPd24eKF4QvmHP4oq+k1kIJYRu9c=; b=VK1AAKC1juo6gVf4Ze1kvJdu1VDnmRvAZ3FlwfIajqR0mCj34DAOob4MVUOYjTaNs9 oUDwnwcObSD/abc8s3gE6EcYebtJPo9Puhz/v5BUTRzmElz2zGjzKWXdmWM1HkDJ5xVX aK2AjS62gZAlnb4QyqHvKqqJcT5vEbh5onIQOK0WJtyJoHD5aNWqZD59gNM40Rmd8pRC 4snMW0vC9KVe+l8jsDJQtOw9BTV4wVqHFqGvMRZNTnxuBlfSOZUnt9kcWFLd6DY5yTno DsUNoOARQ8dMiIYWn+Cufpkt6+qkZ5bZyceLgrYK5f+XINBUB+7JVXM15qO4kHWbJ6S3 3A2Q== X-Gm-Message-State: AOAM530RIV2XZARk7fAfuijpWHQrhvLdrv7BfXcOqJ/Pr2p6TE+xm/Gu xpUplEOcc1zgQlXpDxH1s4Tq238WSpA= X-Google-Smtp-Source: ABdhPJxm+o467aSy6rV837fkAedTnTJhu9Xh7z5Ur/M7Pw6MMeAFNGJpAxH3MYk6edD54fZQf1i7ZA== X-Received: by 2002:a17:906:c055:: with SMTP id bm21mr4922597ejb.350.1634228988098; Thu, 14 Oct 2021 09:29:48 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x22sm2658404edv.14.2021.10.14.09.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 09:29:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/26] trace: simple: pass trace_file unmodified to config-host.h Date: Thu, 14 Oct 2021 18:29:20 +0200 Message-Id: <20211014162938.430211-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211014162938.430211-1-pbonzini@redhat.com> References: <20211014162938.430211-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add the suffix directly in trace/simple.c, so that quoting is done properly by Meson. Cc: Stefan Hajnoczi Reviewed-by: Marc-André Lureau Message-Id: <20211007130829.632254-3-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 -- meson.build | 2 +- trace/simple.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a9a424948c..c27c4d6f1c 100755 --- a/configure +++ b/configure @@ -4580,8 +4580,6 @@ if have_backend "nop"; then fi if have_backend "simple"; then echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak - # Set the appropriate trace file. - trace_file="\"$trace_file-\" FMT_pid" fi if have_backend "log"; then echo "CONFIG_TRACE_LOG=y" >> $config_host_mak diff --git a/meson.build b/meson.build index a3424bce7d..5418083db7 100644 --- a/meson.build +++ b/meson.build @@ -1571,7 +1571,7 @@ config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles(''' ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] -strings = ['HOST_DSOSUF', 'CONFIG_IASL'] +strings = ['HOST_DSOSUF', 'CONFIG_IASL', 'CONFIG_TRACE_FILE'] foreach k, v: config_host if ignored.contains(k) # do nothing diff --git a/trace/simple.c b/trace/simple.c index ac499edee0..18af590cf7 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -364,7 +364,7 @@ void st_set_trace_file(const char *file) if (!file) { /* Type cast needed for Windows where getpid() returns an int. */ - trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, (pid_t)getpid()); + trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE "-" FMT_pid, (pid_t)getpid()); } else { trace_file_name = g_strdup_printf("%s", file); } -- 2.31.1