From nobody Mon Nov 17 19:52:05 2025 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=1605110398; cv=none; d=zohomail.com; s=zohoarc; b=EzHjfMgsGGPyABKXGoSY58I7VJTspKv+8FL3792MmqcX/dWg/16hoUKyU6NyZubi/d/G6LKbMfhdSrgsoVwsh5vaQ4NSAasyy6sCVc8B4W/lH1hCfRhJScmh/foz06oFEL/n1Vi2K1a2XG5WH7ZeLHlVkfWVXn+74J+jYtPQwqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605110398; h=Content-Type: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=h8+ZnRtFvoo542xcHmKysseK1uama+Tl50UvbQas9jU=; b=LtMRZRYColFbSZ3atY3GEEkaQxYr9OZZiW5e7n1eGDUsVgP0gq/yzRGBf86ADDC+Rk9vrcLqUQOeuG1OYU/2BEN9JA/h4d+YIGM6jXh2NstTxdplCs58Y3NWG7DBtEokxSUj7jVsqzehAPGvreOVwPXmAsYwTCLRfn+G4W/Mqpo= 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 1605110398865140.45531717822382; Wed, 11 Nov 2020 07:59:58 -0800 (PST) Received: from localhost ([::1]:40920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcsXM-0003TC-MS for importer@patchew.org; Wed, 11 Nov 2020 10:59:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcsUj-0008VH-23 for qemu-devel@nongnu.org; Wed, 11 Nov 2020 10:57:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcsUe-0000aZ-Rm for qemu-devel@nongnu.org; Wed, 11 Nov 2020 10:57:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-nHTUX0wcMIiKsdgJ9vZ2XA-1; Wed, 11 Nov 2020 10:57:05 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 468D4188C138; Wed, 11 Nov 2020 15:57:04 +0000 (UTC) Received: from localhost (ovpn-112-222.ams2.redhat.com [10.36.112.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E6E9100239F; Wed, 11 Nov 2020 15:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605110227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h8+ZnRtFvoo542xcHmKysseK1uama+Tl50UvbQas9jU=; b=VmT5MEQpR7E9pTRgw9zEe7kh0DhNqzzLuGd9+C4T2tmyRqAPmDbKunkrhKzHybR0im6kup qL/retlTvgR6kOpotKZ+3ZpzvBc0884FmlHHmKUL/JdqzP/Hd8IHLI8gnvosVg+kZh/iAK vt5+fhEm07CU6FUkyf1mI8DkO4ZgqJo= X-MC-Unique: nHTUX0wcMIiKsdgJ9vZ2XA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL for-5.2 1/2] trace: remove argument from trace_init_file Date: Wed, 11 Nov 2020 15:56:53 +0000 Message-Id: <20201111155654.1430860-2-stefanha@redhat.com> In-Reply-To: <20201111155654.1430860-1-stefanha@redhat.com> References: <20201111155654.1430860-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/11 01:42:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-block@nongnu.org, Stefan Hajnoczi , Paolo Bonzini 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: Paolo Bonzini It is not needed, all the callers are just saving what was retrieved from -trace and trace_init_file can retrieve it on its own. Signed-off-by: Paolo Bonzini Message-id: 20201102115841.4017692-1-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/control.h | 12 +++--------- bsd-user/main.c | 6 ++---- linux-user/main.c | 6 ++---- qemu-img.c | 6 ++---- qemu-io.c | 6 ++---- qemu-nbd.c | 6 ++---- scsi/qemu-pr-helper.c | 6 ++---- softmmu/vl.c | 6 ++---- storage-daemon/qemu-storage-daemon.c | 9 +++------ trace/control.c | 10 ++++------ 10 files changed, 24 insertions(+), 49 deletions(-) diff --git a/trace/control.h b/trace/control.h index 1f81c491b6..05b95ea453 100644 --- a/trace/control.h +++ b/trace/control.h @@ -167,8 +167,6 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu, =20 /** * trace_init_backends: - * @file: Name of trace output file; may be NULL. - * Corresponds to commandline option "--trace file=3D...". * * Initialize the tracing backend. * @@ -178,14 +176,12 @@ bool trace_init_backends(void); =20 /** * trace_init_file: - * @file: Name of trace output file; may be NULL. - * Corresponds to commandline option "--trace file=3D...". * * Record the name of the output file for the tracing backend. * Exits if no selected backend does not support specifying the - * output file, and a non-NULL file was passed. + * output file, and a file was specified with "-trace file=3D...". */ -void trace_init_file(const char *file); +void trace_init_file(void); =20 /** * trace_init_vcpu: @@ -229,10 +225,8 @@ extern QemuOptsList qemu_trace_opts; * @optarg: A string argument of --trace command line argument * * Initialize tracing subsystem. - * - * Returns the filename to save trace to. It must be freed with g_free(). */ -char *trace_opt_parse(const char *optarg); +void trace_opt_parse(const char *optarg); =20 /** * trace_get_vcpu_event_count: diff --git a/bsd-user/main.c b/bsd-user/main.c index ac40d79bfa..0a918e8f74 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -745,7 +745,6 @@ int main(int argc, char **argv) const char *gdbstub =3D NULL; char **target_environ, **wrk; envlist_t *envlist =3D NULL; - char *trace_file =3D NULL; bsd_type =3D target_openbsd; =20 if (argc <=3D 1) @@ -851,8 +850,7 @@ int main(int argc, char **argv) } else if (!strcmp(r, "strace")) { do_strace =3D 1; } else if (!strcmp(r, "trace")) { - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); } else { usage(); } @@ -880,7 +878,7 @@ int main(int argc, char **argv) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); =20 /* Zero out regs */ memset(regs, 0, sizeof(struct target_pt_regs)); diff --git a/linux-user/main.c b/linux-user/main.c index 75c9785157..24d1eb73ad 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -386,11 +386,9 @@ static void handle_arg_version(const char *arg) exit(EXIT_SUCCESS); } =20 -static char *trace_file; static void handle_arg_trace(const char *arg) { - g_free(trace_file); - trace_file =3D trace_opt_parse(arg); + trace_opt_parse(arg); } =20 #if defined(TARGET_XTENSA) @@ -672,7 +670,7 @@ int main(int argc, char **argv, char **envp) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); if (qemu_plugin_load_list(&plugins)) { exit(1); } diff --git a/qemu-img.c b/qemu-img.c index c2c56fc797..8bdea40b58 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -5466,7 +5466,6 @@ int main(int argc, char **argv) const img_cmd_t *cmd; const char *cmdname; Error *local_error =3D NULL; - char *trace_file =3D NULL; int c; static const struct option long_options[] =3D { {"help", no_argument, 0, 'h'}, @@ -5516,8 +5515,7 @@ int main(int argc, char **argv) printf(QEMU_IMG_VERSION); return 0; case 'T': - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); break; } } @@ -5535,7 +5533,7 @@ int main(int argc, char **argv) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); qemu_set_log(LOG_TRACE); =20 /* find the command */ diff --git a/qemu-io.c b/qemu-io.c index 7cc832b3d6..ac88d8bd40 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -536,7 +536,6 @@ int main(int argc, char **argv) Error *local_error =3D NULL; QDict *opts =3D NULL; const char *format =3D NULL; - char *trace_file =3D NULL; bool force_share =3D false; =20 #ifdef CONFIG_POSIX @@ -601,8 +600,7 @@ int main(int argc, char **argv) } break; case 'T': - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); break; case 'V': printf("%s version " QEMU_FULL_VERSION "\n" @@ -653,7 +651,7 @@ int main(int argc, char **argv) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); qemu_set_log(LOG_TRACE); =20 /* initialize commands */ diff --git a/qemu-nbd.c b/qemu-nbd.c index 75ced65030..a7075c5419 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -581,7 +581,6 @@ int main(int argc, char **argv) const char *tlscredsid =3D NULL; bool imageOpts =3D false; bool writethrough =3D true; - char *trace_file =3D NULL; bool fork_process =3D false; bool list =3D false; int old_stderr =3D -1; @@ -768,8 +767,7 @@ int main(int argc, char **argv) imageOpts =3D true; break; case 'T': - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); break; case QEMU_NBD_OPT_TLSAUTHZ: tlsauthz =3D optarg; @@ -816,7 +814,7 @@ int main(int argc, char **argv) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); qemu_set_log(LOG_TRACE); =20 socket_activation =3D check_socket_activation(); diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index d26faaf91e..2733d92f2d 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -884,7 +884,6 @@ int main(int argc, char **argv) int quiet =3D 0; int ch; Error *local_err =3D NULL; - char *trace_file =3D NULL; bool daemonize =3D false; bool pidfile_specified =3D false; bool socket_path_specified =3D false; @@ -968,8 +967,7 @@ int main(int argc, char **argv) ++loglevel; break; case 'T': - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); break; case 'V': version(argv[0]); @@ -992,7 +990,7 @@ int main(int argc, char **argv) if (!trace_init_backends()) { exit(EXIT_FAILURE); } - trace_init_file(trace_file); + trace_init_file(); qemu_set_log(LOG_TRACE); =20 #ifdef CONFIG_MPATH diff --git a/softmmu/vl.c b/softmmu/vl.c index a71164494e..42e6d1057b 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2886,7 +2886,6 @@ void qemu_init(int argc, char **argv, char **envp) int display_remote =3D 0; const char *log_mask =3D NULL; const char *log_file =3D NULL; - char *trace_file =3D NULL; ram_addr_t maxram_size; uint64_t ram_slots =3D 0; FILE *vmstate_dump_file =3D NULL; @@ -3688,8 +3687,7 @@ void qemu_init(int argc, char **argv, char **envp) xen_domid_restrict =3D true; break; case QEMU_OPTION_trace: - g_free(trace_file); - trace_file =3D trace_opt_parse(optarg); + trace_opt_parse(optarg); break; case QEMU_OPTION_plugin: qemu_plugin_opt_parse(optarg, &plugin_list); @@ -3939,7 +3937,7 @@ void qemu_init(int argc, char **argv, char **envp) if (!trace_init_backends()) { exit(1); } - trace_init_file(trace_file); + trace_init_file(); =20 /* Open the logfile at this point and set the log mask if necessary. */ diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index e419ba9f19..7c914b0dc1 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -180,12 +180,9 @@ static void process_options(int argc, char *argv[]) help(); exit(EXIT_SUCCESS); case 'T': - { - char *trace_file =3D trace_opt_parse(optarg); - trace_init_file(trace_file); - g_free(trace_file); - break; - } + trace_opt_parse(optarg); + trace_init_file(); + break; case 'V': printf("qemu-storage-daemon version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n"); diff --git a/trace/control.c b/trace/control.c index 5669db7eea..b82fb87316 100644 --- a/trace/control.c +++ b/trace/control.c @@ -222,8 +222,10 @@ static void trace_init_events(const char *fname) loc_pop(&loc); } =20 -void trace_init_file(const char *file) +void trace_init_file(void) { + QemuOpts *opts =3D qemu_find_opts_singleton("trace"); + const char *file =3D qemu_opt_get(opts, "file"); #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); if (init_trace_on_startup) { @@ -289,9 +291,8 @@ bool trace_init_backends(void) return true; } =20 -char *trace_opt_parse(const char *optarg) +void trace_opt_parse(const char *optarg) { - char *trace_file; QemuOpts *opts =3D qemu_opts_parse_noisily(qemu_find_opts("trace"), optarg, true); if (!opts) { @@ -301,11 +302,8 @@ char *trace_opt_parse(const char *optarg) trace_enable_events(qemu_opt_get(opts, "enable")); } trace_init_events(qemu_opt_get(opts, "events")); - trace_file =3D g_strdup(qemu_opt_get(opts, "file")); init_trace_on_startup =3D true; qemu_opts_del(opts); - - return trace_file; } =20 uint32_t trace_get_vcpu_event_count(void) --=20 2.28.0