From patchwork Fri Apr 12 07:33:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 788264 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp591176wrm; Fri, 12 Apr 2024 00:36:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZVrfKFqg3Bs6bpHuPawfcoqZ/8+2x6p6IrV2z/JtHV0aX3z1kOETL0EW1dMC/VdvhPKTdu3n4qkR3p2nHJvvz X-Google-Smtp-Source: AGHT+IH5tH+lmpy/n5HGu6QYsVSp+mvOXkk6kUNyvfdUzdjMx4/HADgLH9nALayGgX/ZZqlcXLPM X-Received: by 2002:a81:e305:0:b0:618:5b27:e12b with SMTP id q5-20020a81e305000000b006185b27e12bmr1811486ywl.7.1712907407707; Fri, 12 Apr 2024 00:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712907407; cv=none; d=google.com; s=arc-20160816; b=QkadQebohz1XYGcOr5hMDTeY2lpbv216AoZJXgvGQD53xW39A5YacxJ8hmQ7MzWzXY cMyPzAT6GKBFPTGeVDKxwhiy2UHWcDJgbt1CMYR+GbZMb+vAxOzKhKYHR4yTfRg5OBOR JT0nij18XwR0jodvpFmwGwQXwihCGQ6RvYmthgPtiuST51mgziyV/1I+XuYFBzqzaSuO dMP0W0mKpSyoVdJmskraqU691T5EE9nPUklDRXuosUs9b8uQiC8bDMDNtLsAdxvhwJL0 96HmL/f07+OSa1Rh3S4gdt4cHTD2u6NTsfoEG38eIamQsiPPscjHiSMJovLIfs7a7eCD jQxQ== 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:cc:to :from:dkim-signature; bh=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=ussiJypf6E7invNkb4UFj1lWwQc01aDZ3oHWRf0KS4LTeHPSI22301P2b25zBInJLj D8F9toDYiMx6wnD4KYo4hZlw8VpSq2fiO0lDahk3kdgHLqQzXZEDq0X8iYXk9V9LM1yd pLEWDyYDDSku2oRs7t0Ng8rzuuh/RdGeSdb9SYOU2w8ZjX0lZVKF0HzCIZopNQWOO1A6 WRCclgIFKWbpLvbsW9p64LTSqY+ek+zM20cAMHlnS5yHZ90H10uYP8Eb9mh4sHScMzrb ki5VLXadCQO6GE2DcttFYRMCm+QbduOk0dIDxQJO7/fSeoSdMDYuBQTnVn1Gvwrz9Ovo iZPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=luqGkJIM; 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 ye4-20020a05620a3b8400b0078d4eccd81esi3115171qkn.636.2024.04.12.00.36.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Apr 2024 00:36:47 -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=luqGkJIM; 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 1rvBQR-00078D-3O; Fri, 12 Apr 2024 03:34:19 -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 1rvBQP-00076b-6e for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:17 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvBQJ-0007DW-4P for qemu-devel@nongnu.org; Fri, 12 Apr 2024 03:34:16 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e220e40998so4537685ad.1 for ; Fri, 12 Apr 2024 00:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712907247; x=1713512047; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; b=luqGkJIMFNSaoXXMI7IAIDBSz1wvp3ZHFtASxtg7unvnkkxUcmsQ7Q4xbBVnkUVItV AV9tUxdLbCJwsqjfrdUYZUaYAa/pmfL5NpZ3ywwINw8GRKFvU8oGYL3VKaw7TWTnal+1 +JG7xCJtnmu1ex8veBWf6yC7vbqjv/m2UpUm4ejGVRWhxOpNFSl0HUktr7ccZZdSxE3P BWcWhNe1JaXL74ZOxa7QzQmvl2rZrMNbd+DLcIYpTgYdcnz1gSzBbuBlGh/PFH2ECMS5 1AKpbYI52v+ka4mDeOHKm5iXoWFktn6T24BFgMjswHA0yTGYcKS6SFgYxIX2yHR0G/I0 SY2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712907247; x=1713512047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eRXCXUY4I/jEqq87nwbnLzBZIzxiWLj4iUBZS7Znhy0=; b=jhraScrkZZImigQoYfdMCQpUS9TCv0nmmMFaemyBlucj6REtrxf+yxHYZqAK+6ai/L RtGUbGmJY/PzQp5QsCWYZ60LHmL6VqGSFS/Vtp1qgNVOge3zZa8JebFPV31MRP+oWfRU 8UrwHvV6CX0STFrd8XJMvcNVll1xmCV5t7sL8js2wE+DOWJXeSYqfEng0AYmf1kWvOtG 5pFXekn+egNcI8cktWzMjjCz3dFVJhMVcH9hpBJPPMmACmJ9Q0+SxBj8eEiIe/Xu8xdJ ROMDRXgOUlEixpu1yOr0soGe9afchiPYjxnOMlM8iuW2s7jIINn8HH9FBcsQ8SgrAlcA DoAg== X-Gm-Message-State: AOJu0YzL3/ZyMJOKQ1bVszpANujlSN2Sjv2eZRTpMa8vqLGjuNsrhxru vAZmtyJ9y4bXjej8WuTFhmRRSpYsMhVqacnV+tsQ6BTYK+qmuEBK7BG9dn1C/GA302JqsXFVHot a X-Received: by 2002:a17:902:c101:b0:1e2:a5ee:c0a2 with SMTP id 1-20020a170902c10100b001e2a5eec0a2mr1613846pli.31.1712907247436; Fri, 12 Apr 2024 00:34:07 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e5-20020a17090301c500b001e556734814sm2206099plh.134.2024.04.12.00.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 00:34:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 25/27] hw/riscv/virt: Replace sprintf by g_strdup_printf Date: Fri, 12 Apr 2024 00:33:44 -0700 Message-Id: <20240412073346.458116-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org> References: <20240412073346.458116-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: Philippe Mathieu-Daudé sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Use g_strdup_printf instead. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20240411104340.6617-8-philmd@linaro.org> [rth: Use g_strdup_printf] Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier Reviewed-by: Alistair Francis --- hw/riscv/virt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d171e74f7b..4fdb660525 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1617,10 +1617,8 @@ static void virt_machine_instance_init(Object *obj) static char *virt_get_aia_guests(Object *obj, Error **errp) { RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); - char val[32]; - sprintf(val, "%d", s->aia_guests); - return g_strdup(val); + return g_strdup_printf("%d", s->aia_guests); } static void virt_set_aia_guests(Object *obj, const char *val, Error **errp) @@ -1741,7 +1739,6 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, static void virt_machine_class_init(ObjectClass *oc, void *data) { - char str[128]; MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); @@ -1767,7 +1764,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); #endif - object_class_property_add_bool(oc, "aclint", virt_get_aclint, virt_set_aclint); object_class_property_set_description(oc, "aclint", @@ -1785,9 +1781,14 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) object_class_property_add_str(oc, "aia-guests", virt_get_aia_guests, virt_set_aia_guests); - sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid value " - "should be between 0 and %d.", VIRT_IRQCHIP_MAX_GUESTS); - object_class_property_set_description(oc, "aia-guests", str); + { + g_autofree char *str = + g_strdup_printf("Set number of guest MMIO pages for AIA IMSIC. " + "Valid value should be between 0 and %d.", + VIRT_IRQCHIP_MAX_GUESTS); + object_class_property_set_description(oc, "aia-guests", str); + } + object_class_property_add(oc, "acpi", "OnOffAuto", virt_get_acpi, virt_set_acpi, NULL, NULL);