From nobody Sat May 18 12:05:15 2024 Delivered-To: importer@patchew.org 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; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578536386; cv=none; d=zohomail.com; s=zohoarc; b=P+oVey6w0WMb+Q5ewXheq58zG9QgihJyHiS5QCletQCPvuS1BpDbhzbRQePhhxjbRb2BGSVlWL+AgXRLvJCdg4jRkNtrSVVUJlkGtbefvTCLaV410Lnpyd8FQCO3QYRueB8s2WeqqKdvOqJQBLAdn3bdDI7rgDbbTFSCBlps3D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578536386; 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=UEu09f1Nlqe8aDmLncxcurE+ZboCmDUATKx9s84WZ/k=; b=i08xsi5gyUNx0DbXsEs2O5inQP2INtR8hnBzVMgMWj9WNYeQyYCyp6gASbrrPqmxDGBgmvpnhx6aK9Z6KSU9kyN1k2jBNJJKy+NQNBWgJldnCt5JhjW2p0rownHF5e/kICcdWh6PaRTlejEh6B7OvDUO37h/nOqUZUCnBF/elFA= 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 1578536386438449.28651423641315; Wed, 8 Jan 2020 18:19:46 -0800 (PST) Received: from localhost ([::1]:53420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNQG-0001Jq-QK for importer@patchew.org; Wed, 08 Jan 2020 21:19:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34808) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNO2-0007Fg-Ku for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipNNz-00086R-DD for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:26 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:39204) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipNNw-00083y-9D for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:20 -0500 Received: by mail-pf1-x444.google.com with SMTP id q10so2572651pfs.6 for ; Wed, 08 Jan 2020 18:17:19 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id n26sm5166715pgd.46.2020.01.08.18.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 18:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UEu09f1Nlqe8aDmLncxcurE+ZboCmDUATKx9s84WZ/k=; b=A5S75hZQnMsJ1nbOjo9RnK9XtB8yFbaUULsBPbLEB6/GcjVm1l+2HCgRNadFzGkQX1 5z3Ipkc3WySJA6h5CZvIMPLVPvKo3QAynfKGtJcyZDsuhID9J80AWz74o+0+czmTcL2G i+bpptvkeMh8CnM5/fz7PuFgE66wbrdItvABM5WrcNjK9JPXnrpEiuP4AbU4A6AF5rVe Uq6lHbgssuhBgTi9PC9onSmtLj/JTJ5pY9le/s6H4VMo/gg00V8b684AZw117AtUPvFy HhjJq08vpO/9yWSRFwOScY9rfzP0gtl6b5c6xTmdVoqE8BlS9ywvpRJwSdFRrihVV9Rr fGaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UEu09f1Nlqe8aDmLncxcurE+ZboCmDUATKx9s84WZ/k=; b=dy5xenbeVRA/JxZmUPbgNJxF5KOon54udTrfyWldl2VHcYvsX/UXqYDu4tGrpbT0Qw YvGjW0OvjZgbaRQeLyXwaLyvhvpbXWvV+BEd0l2PgoyaYld3QYkvQO78oLeWeJJkQxE3 cbv/Z5TcJEDR5zUx3xAzHPyHZqf/Twos1I1IEfhGFIVBEmNO0I0TMdeYu93DurO61M46 BJa+8XPm5v3669iiQaljwaP+D1RiHccR/h5lc//MKO1VjlIluaToRyiKsl5Lqioawabf 4m75PQ75BtXx8AXXFRyVTLFQC6+yxkPAAzllRiokEIyj0F74jVblDXMFEzZO5w2pQqSW vWUA== X-Gm-Message-State: APjAAAW7Vzr0srWd8Zjv3uLeYKlNUKZie5eys04L0DLFCRVMUOHcM89g 8mut5UKTql7qq8BRJ4ni6mIuYqaFQ+3qHw== X-Google-Smtp-Source: APXvYqwfby/zSXjZLIIpJ63PWhjBorfJamXTyalnpdttGAVYZRG8FFVnc8/xAoMLCBnyD5HTBN8cOA== X-Received: by 2002:a62:e30d:: with SMTP id g13mr8714360pfh.92.1578536238344; Wed, 08 Jan 2020 18:17:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/4] vl: Remove unused variable in configure_accelerators Date: Thu, 9 Jan 2020 13:17:07 +1100 Message-Id: <20200109021710.1219-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109021710.1219-1-richard.henderson@linaro.org> References: <20200109021710.1219-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 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: pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The accel_initialised variable no longer has any setters. Fixes: 6f6e1698a68c Signed-off-by: Richard Henderson Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- vl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 86474a55c9..be79b03c1a 100644 --- a/vl.c +++ b/vl.c @@ -2749,7 +2749,6 @@ static void configure_accelerators(const char *progna= me) { const char *accel; char **accel_list, **tmp; - bool accel_initialised =3D false; bool init_failed =3D false; =20 qemu_opts_foreach(qemu_find_opts("icount"), @@ -2776,7 +2775,7 @@ static void configure_accelerators(const char *progna= me) =20 accel_list =3D g_strsplit(accel, ":", 0); =20 - for (tmp =3D accel_list; !accel_initialised && tmp && *tmp; tmp++)= { + for (tmp =3D accel_list; tmp && *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities * such as "-machine accel=3Dtcg,,thread=3Dsingle". --=20 2.20.1 From nobody Sat May 18 12:05:15 2024 Delivered-To: importer@patchew.org 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; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578536378; cv=none; d=zohomail.com; s=zohoarc; b=dzyICbsbVxy/63MJjbIEWcYMhRRrVgF0jr392R5YHhtJlueMTJtYGb9wmM74hwDwVcj8CpORNOhr+JOOSUxeYRyEF6g9coeynnaNOD+pPt+F6dLxx1lW6IPZWxblqWFfU67GZdE+zkGLzPPoNdNEt4ZTGEQj3QDMUzLzJ2tZ+m0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578536378; 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=HbO57U5Hq9On8Ktr+WRBLRrRyCTJojmW4JU+oahW540=; b=T/tlvz9NbCq36fli/se6VAMT8W1C/tW+qEtD/77EqJZ7bT4izy38J2uSxbzUXM8NY9da3FUJyWToHJ0bdPVmhCAWn12OSrLKMhWs5RXJbeufjVu6XeKKKSNLwsF5oadNPxocVAn/MeeI61iLZsLSjXFUf1rj+cdmJKoub7FTCE8= 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 1578536378391691.573925620551; Wed, 8 Jan 2020 18:19:38 -0800 (PST) Received: from localhost ([::1]:53416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNQ8-000169-KH for importer@patchew.org; Wed, 08 Jan 2020 21:19:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34590) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNO0-0007FW-Tt for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipNNz-00087i-Pv for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:24 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:54706) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipNNz-00085C-Cc for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:23 -0500 Received: by mail-pj1-x1044.google.com with SMTP id kx11so439833pjb.4 for ; Wed, 08 Jan 2020 18:17:21 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id n26sm5166715pgd.46.2020.01.08.18.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 18:17:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HbO57U5Hq9On8Ktr+WRBLRrRyCTJojmW4JU+oahW540=; b=uKnU0jk7th8WOW03TQGS2qQHsZO9iA/QRWb7E+qQDhLvPPw3RJAzfiDPBO7We+Xbcc uHAZ6JooqY4A6oR1/FUI4Gp5nKcvKcvIF0eDQuebZoOZWvWM5isWUFAEW0ym/gJI21bV ezA/R/SalQ7OApBC62hZKhQ4uxN1t4RnnUddUyS/ORlMZS7TnGEn96uHMDgpDOn+KZVw bG3UfejmS8IdRBmbunpEBe67kM4T2baR/GpcO2WSsQXWAsP11PkaCWcmFlPaugj74bpF AdjBUmQA/51RNxKjpr9tPvWRYSylmJkVOD6uDKe7sWqPawA/3dRRZCN2SNzSHx0uol13 vthA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HbO57U5Hq9On8Ktr+WRBLRrRyCTJojmW4JU+oahW540=; b=mwDM5hG6eXR4P0943kIJHOrHXMoVJoTfgC9l61rNQR8e6uDSWU/THSNQg6xL/+NV/a Cu2avQA7El6/6j6Wmud5ZNsDsYpczXqaJzfpkv4OSdSOXXhBEo3aQuoAv3Te5XjiZ5R1 sNnwAUVUvRRJ3uiBP5B0zaBPVLLTk1Fl10XgikMR9TMMz/tS4s9It/pJcoQKgH5LWUJa M+g+TE7rSuakiyNWoQqtdOzXR4/2fe7L0Dz9txvBzlbzSP3xo/rLVo02zXRzcFk7mxoU 8QFCL5RvuRgCkOMHPkjwJn26SFkmqQd14YUKcXrILdBXXP19BLYxyOIAyXCY9+FTFMKz A5zQ== X-Gm-Message-State: APjAAAXBZ/pUU6KAzmjZz/oiXkDLjb/SoLXSIqXGoUNxgK/a8Esh3ebj LVLPnmgqwDNgWhwqoVNjZj+3JlVhvsOuKA== X-Google-Smtp-Source: APXvYqw1I+cI2qWixqqu2wJ/PBXmvmvMYiyvZRr/UVwCislu/kMjq7JHi5Dz3+svrh0CvYm99zXp3Q== X-Received: by 2002:a17:90a:19d3:: with SMTP id 19mr2294472pjj.1.1578536240516; Wed, 08 Jan 2020 18:17:20 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/4] vl: Free accel_list in configure_accelerators Date: Thu, 9 Jan 2020 13:17:08 +1100 Message-Id: <20200109021710.1219-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109021710.1219-1-richard.henderson@linaro.org> References: <20200109021710.1219-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 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: pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" We allocate the list with g_strsplit, so free it too. This freeing was lost during one of the rearrangements. Fixes: 6f6e1698a68c Signed-off-by: Richard Henderson Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- vl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index be79b03c1a..c9329fe699 100644 --- a/vl.c +++ b/vl.c @@ -2748,7 +2748,6 @@ static int do_configure_accelerator(void *opaque, Qem= uOpts *opts, Error **errp) static void configure_accelerators(const char *progname) { const char *accel; - char **accel_list, **tmp; bool init_failed =3D false; =20 qemu_opts_foreach(qemu_find_opts("icount"), @@ -2756,6 +2755,8 @@ static void configure_accelerators(const char *progna= me) =20 accel =3D qemu_opt_get(qemu_get_machine_opts(), "accel"); if (QTAILQ_EMPTY(&qemu_accel_opts.head)) { + char **accel_list, **tmp; + if (accel =3D=3D NULL) { /* Select the default accelerator */ if (!accel_find("tcg") && !accel_find("kvm")) { @@ -2787,6 +2788,7 @@ static void configure_accelerators(const char *progna= me) error_report("invalid accelerator %s", *tmp); } } + g_strfreev(accel_list); } else { if (accel !=3D NULL) { error_report("The -accel and \"-machine accel=3D\" options are= incompatible"); --=20 2.20.1 From nobody Sat May 18 12:05:15 2024 Delivered-To: importer@patchew.org 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; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578536519; cv=none; d=zohomail.com; s=zohoarc; b=Z/uCNKR91Q26MKSPv/r+ddqDFJe4EWJftLzqC5wFt0c8BklFfqV0lpR+4oDPN0V90rWjUTZ75aUyuoc69jG5ZLyFtvcvM7baw/P+5MnqYzR/ZXF7RKLNHFQ72BqOeaolF1d2mdzvHGpRPTbu6VBgCquWN/DAESa5l4aHdSA8wcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578536519; 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=ggTNIXckHEhs6NEA+P+FO98Kh7NZuAYc0hm4wcTirRY=; b=mN4SUpCGqed5QLtVZBVga1lMYVFN3rIf2hs1FiOSC/bvMAcDphME54gGA4DAFDWzqhkzdlCJXKFKNnKkAknwA29mFC9L+v3d4X1012ovBN580gx04FZ3R5yFUeRVnNbJZdx73VCqx4xIfGFU2Px8DJJoVYZ1x++lLWcJQNOfPUA= 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 157853651931931.661325170273813; Wed, 8 Jan 2020 18:21:59 -0800 (PST) Received: from localhost ([::1]:53482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNSQ-0003v5-5I for importer@patchew.org; Wed, 08 Jan 2020 21:21:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34661) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNO1-0007FY-FT for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipNO0-00088e-6q for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:25 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:38330) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipNO0-00086l-1J for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:24 -0500 Received: by mail-pj1-x1044.google.com with SMTP id l35so438251pje.3 for ; Wed, 08 Jan 2020 18:17:23 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id n26sm5166715pgd.46.2020.01.08.18.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 18:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ggTNIXckHEhs6NEA+P+FO98Kh7NZuAYc0hm4wcTirRY=; b=OQoNxuTJI4X9Dq7yjWdNkLddYniY1zFSLk6MnaecmRqplXArLbeTjytpfaQ47j69eG 9Oht3XGM4nI8tCBu2wjuIEZclvERC8A2+fwSevE6CxiQBKyKXYr97GKPiXJTt5LfLfsl D0qbCalJiILRip/zJ95AOTdWDWta8YGZT1ne+F8wYR2NZhWIkLsV9cn/lFtWlMnnredM loaqiAbU2EJl5D1SS0uihO7wJYZuu5XpcM7qrI6dmkZY9mW5UOcYox5+IWbgTW3GKejP djYWVEoN38atM5rcLM+QC7iXotg6vqj+185pun6luR7IR64fVhjjXvGiCOy+cXgxpmJk JBlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ggTNIXckHEhs6NEA+P+FO98Kh7NZuAYc0hm4wcTirRY=; b=MNlOI+NbVLjI8DS78JEuy1CL6WBwZH5HDXf1pR3ah8/ZO5hNP58V3DZBFgz14bX3Dc fc52JMgQowWKHjPqsKDc1dEvy6Ja3bLMH0w5zBn8eokTDyZcaiyt6KkiFoFSuxBP2CvQ 4PGfLJ5KysYtXM5Jh9xqzUceXWv7V5Vt39ydtaRiRa1I4kkWb4uAf3RWBvrG/RgOoT/f YlbnmSzOLz5sK9jRrKDOSAVU4/IYDbzTVsHquLp0DzjM7ogeHiUK8qwRvl11vAXssj4H pnHk7F5OIKBYWnM+cQ6q8WZnILpzW9TbziCaQF73r8wniJl+7dT41FfTkfoJUQOFhDVx ZyIQ== X-Gm-Message-State: APjAAAW4WFtvsn5Rs6Cx4EjoC8Fg2fbHB9NTpbig0tWFi8MPWGTmJNW+ S6jCbVbCY9qbEALLYtxzyKlu0x0bG+fwxA== X-Google-Smtp-Source: APXvYqzPSjGUKI8Prlov2PiBK8AqJTLC3BadY0la/IfH+uKgx6S9IM/H4kWP3htuqlZI6CPSPO7LgA== X-Received: by 2002:a17:90a:e982:: with SMTP id v2mr2306669pjy.53.1578536242765; Wed, 08 Jan 2020 18:17:22 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/4] vl: Remove useless test in configure_accelerators Date: Thu, 9 Jan 2020 13:17:09 +1100 Message-Id: <20200109021710.1219-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109021710.1219-1-richard.henderson@linaro.org> References: <20200109021710.1219-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 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: pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The result of g_strsplit is never NULL. Signed-off-by: Richard Henderson Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index c9329fe699..887dbfbb5d 100644 --- a/vl.c +++ b/vl.c @@ -2776,7 +2776,7 @@ static void configure_accelerators(const char *progna= me) =20 accel_list =3D g_strsplit(accel, ":", 0); =20 - for (tmp =3D accel_list; tmp && *tmp; tmp++) { + for (tmp =3D accel_list; *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities * such as "-machine accel=3Dtcg,,thread=3Dsingle". --=20 2.20.1 From nobody Sat May 18 12:05:15 2024 Delivered-To: importer@patchew.org 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; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578536385; cv=none; d=zohomail.com; s=zohoarc; b=mY2lwYM7ur97QdTPTc0/NMq7YiE5rJKAH5+gCuxXWmgwF+5Kmp8QcZ+D/v04KCCgbJkOI2niL+vJua6QL2onEN8N61ZChCOjVt59IsEq0y4P02iyO5q+TPLtV15Vv1FZM2WYBIoWvQPi6v5CxQQaSV0IVu0d7iKdvdUs5gq8wXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578536385; 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=71biz+iT3vb9rCukTO9Hbb/aNJiPW+OOTq+eiVqnO3Q=; b=FHsgxIBAJfWrrNu/XP9EA2aJp80ecH3zzwRRJvtKDYPFp9GgGFQsrk9PuN0/ZM7f7U+mSBnMhc5zIHNBNEXgGnmXnVbSs7iqVlGq1IZsZfLw1BZYq2eY9c1wFUL6qrrsBm2Z47rND6Mbe5yP63RWSq60G4LjBtsWAP6RgnXL3tY= 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 1578536385995881.4498309326106; Wed, 8 Jan 2020 18:19:45 -0800 (PST) Received: from localhost ([::1]:53424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNQG-0001NP-9Z for importer@patchew.org; Wed, 08 Jan 2020 21:19:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35191) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNO5-0007Ij-Bs for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipNO2-0008Cy-KJ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:29 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:51936) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipNO2-0008Bg-DO for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:17:26 -0500 Received: by mail-pj1-x1044.google.com with SMTP id j11so444618pjs.1 for ; Wed, 08 Jan 2020 18:17:26 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id n26sm5166715pgd.46.2020.01.08.18.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 18:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=71biz+iT3vb9rCukTO9Hbb/aNJiPW+OOTq+eiVqnO3Q=; b=XNxmweGOHA/RLA6fhSbtVVdLqgWBVA9GRqD6bNfy8sb4NmE+CwRq5dXkN3tMXXXmk2 ZR530tOfnnEHNMn0oU4kH5RrsyLmvfUtAgS+Bf8PcAqKF5yk6XdRqFcJjQncbLGPVe4o xYoKByrsHfWChuRk1XH8hXYLJcp1iqmuKwpM265kOpqqaU3VwprSq2xt13V9/tnv83CH REeYtVwAttLzKSJ8IsDWMfS+U1y2raz8iWySkCzcp24KN3sSfmtCg8hT1EucL5mo62Fo hMN+G14fEEx6DVYFb0F6xMTyT5jOMgRskKy/qPPNySZAt9mUjpLROmmS+DOeU2trw8Or QNfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=71biz+iT3vb9rCukTO9Hbb/aNJiPW+OOTq+eiVqnO3Q=; b=NpXwwCzfODsj9bwblxM89Gd7TCEu2KQ3HPeLlrwyz+UqZgzy76y8BMoad0oPJs/t5o YaKRK/3HmOwWgFQCbQ+avz/Oo5CXlyhJj4pSYXZ/umO4IGuwZknFxSjv8wWEaoWzmXnn khCgU0ouk9EMj0IlvOMKOmuTQsQVqjZii4NaL6gzSDaNq4RVU/ggWkmefOMbIgk5Zh5H K3wusw3DaSES9IUssYh+kYbB1dRjv3nGEtH8/Tr9DVh7Z+Trl6aEVS54hP6tNHQHOf8L ARXJRJBByRqfH5HJuVT00m6KR7NweSHpwVRS0s/232W8zPiOU4HxUU/qAuPSblb4JCw5 jRtQ== X-Gm-Message-State: APjAAAWfSjkqjqatbPdT4vzjYlxSvSxb96HFYAdldXA4rClbga5x4XI+ 14uBZAqKutYTJGmSWu6utijwpXe02rt4/w== X-Google-Smtp-Source: APXvYqxUB6I4dLnNlmyzXcrrdNETIxDJEoKqxw4LpV8MQHpA8zEPJTpaCUA8iMbfHv6km2C5lgbvKQ== X-Received: by 2002:a17:902:6906:: with SMTP id j6mr9065005plk.321.1578536245112; Wed, 08 Jan 2020 18:17:25 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/4] vl: Only choose enabled accelerators in configure_accelerators Date: Thu, 9 Jan 2020 13:17:10 +1100 Message-Id: <20200109021710.1219-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109021710.1219-1-richard.henderson@linaro.org> References: <20200109021710.1219-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 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: pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" By choosing "tcg:kvm" when kvm is not enabled, we generate an incorrect warning: "invalid accelerator kvm". Presumably the inverse is also true with --disable-tcg. Fixes: 28a0961757fc Signed-off-by: Richard Henderson Acked-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- vl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/vl.c b/vl.c index 887dbfbb5d..9b7651c80d 100644 --- a/vl.c +++ b/vl.c @@ -2759,11 +2759,10 @@ static void configure_accelerators(const char *prog= name) =20 if (accel =3D=3D NULL) { /* Select the default accelerator */ - if (!accel_find("tcg") && !accel_find("kvm")) { - error_report("No accelerator selected and" - " no default accelerator available"); - exit(1); - } else { + bool have_tcg =3D accel_find("tcg"); + bool have_kvm =3D accel_find("kvm"); + + if (have_tcg && have_kvm) { int pnlen =3D strlen(progname); if (pnlen >=3D 3 && g_str_equal(&progname[pnlen - 3], "kvm= ")) { /* If the program name ends with "kvm", we prefer KVM = */ @@ -2771,9 +2770,16 @@ static void configure_accelerators(const char *progn= ame) } else { accel =3D "tcg:kvm"; } + } else if (have_kvm) { + accel =3D "kvm"; + } else if (have_tcg) { + accel =3D "tcg"; + } else { + error_report("No accelerator selected and" + " no default accelerator available"); + exit(1); } } - accel_list =3D g_strsplit(accel, ":", 0); =20 for (tmp =3D accel_list; *tmp; tmp++) { --=20 2.20.1