From nobody Sun Nov 16 14:28:24 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600532901; cv=none; d=zohomail.com; s=zohoarc; b=cFbVYdN14QOSWQEIq71HJnLdv9gUUsmE5psr75Td60gsioLhz2N7Y71w8rhNnMa45olj+iIY7agfVcT676hwdL3ZkeaP7U/V40lGqmHj5TibzLU35NCrWt6MBsjWtp4S/IrmZyQ1yfsu/1Cs7mXDwuapsEP6hyAhMUEGYZOCIsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600532901; 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=FudltPM8rf6jphJZRpA3qlGS4lL865ouE2G0+dnv3Q8=; b=by+c6SeGOCgVLDmOYmd6izyeXIb6qn5z+h3PHg2AshY3FLvD8PqG8IA1YS0v+956MCHhM5cWv5bCwav9gmoyAOogzb8zQtNkIaVcQo9mDU0KZWjjQ++lDon0mwy6zHlW38T0IxWazk9ipEX2Qu29omRi8TFZAMMN6kZH23NmIBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1600532901360387.08718464710216; Sat, 19 Sep 2020 09:28:21 -0700 (PDT) Received: from localhost ([::1]:52578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJfil-0006Z9-U8 for importer@patchew.org; Sat, 19 Sep 2020 12:28:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJfHa-0005hy-9n for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJfHM-0007SL-Kj for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:13 -0400 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-31-zOs4kN8cMti3ALJk6tQZQw-1; Sat, 19 Sep 2020 11:59:52 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5B1D186DD4B for ; Sat, 19 Sep 2020 15:59:51 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94BE35576A; Sat, 19 Sep 2020 15:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600531195; 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=FudltPM8rf6jphJZRpA3qlGS4lL865ouE2G0+dnv3Q8=; b=bvtUtdV3Bd0fDThODq8dMwFyqDqIbfgCHK1UnwYcIq84ORnQuTH1z6iPMwQgXp+wBjAsEX tuMad/dj+QRAuDRly0sKRPjA9SJV7s0oTRi/g5uyhV6RlMioD73dCUusgSwha3RorbWJke 9vFXrZigcRrNGC9U4CaB7mGwGKGDGLg= X-MC-Unique: zOs4kN8cMti3ALJk6tQZQw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 49/57] vl: relocate path to configuration file Date: Sat, 19 Sep 2020 11:59:08 -0400 Message-Id: <20200919155916.1046398-50-pbonzini@redhat.com> In-Reply-To: <20200919155916.1046398-1-pbonzini@redhat.com> References: <20200919155916.1046398-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 06:41:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index c872657e60..c4f9671c48 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2676,8 +2676,9 @@ static int global_init_func(void *opaque, QemuOpts *o= pts, Error **errp) static int qemu_read_default_config_file(void) { int ret; + g_autofree char *file =3D get_relocated_path(CONFIG_QEMU_CONFDIR "/qem= u.conf"); =20 - ret =3D qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); + ret =3D qemu_read_config_file(file); if (ret < 0 && ret !=3D -ENOENT) { return ret; } --=20 2.26.2