From patchwork Thu Jan 16 21:05:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11337785 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C91FC109A for ; Thu, 16 Jan 2020 21:06:45 +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 9FA0C20661 for ; Thu, 16 Jan 2020 21:06:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MjyPDGDy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FA0C20661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCLk-0003nd-7i for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jan 2020 16:06:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33428) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCKe-0002QT-77 for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isCKd-0007Oq-4b for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:36 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:39149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isCKc-0007NR-UA for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:35 -0500 Received: by mail-pg1-x544.google.com with SMTP id b137so10514442pga.6 for ; Thu, 16 Jan 2020 13:05:34 -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=3RxuNErO3G6jh94WlBjbMCnN6twwO5VkwerBc+JWKzQ=; b=MjyPDGDyS8qi8yxrdxJYmKATXHLD+PYqOIlGEO/5u98PQ8+fx+sb9/E7U983jgsNP3 MmUVvqx8phopN6xIU/itr9Jil4C+nkLz8No1PVTPBaMO0UrI8MAtPLEEqrUG2g2p96ws c/XKJvz1zzPmSa+28+bLPQ6PR5XByiS7Q5tVDwehYfdxD57Cxa3iJV4SpbwbbNXDP47a sz15qyjNzNul4c3t8W7frG4yoG3UXE+iLQZD5cEY/yPjNPVpj4dXmRfue932UsTBZ+0F UeYWFrpZ5LSG1KB9+tKdMI295lpHwerVItfndI8w3fpeUDyQrnEYFDkWBIYzwo6k8NEH DWQw== 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=3RxuNErO3G6jh94WlBjbMCnN6twwO5VkwerBc+JWKzQ=; b=g7dkWhnisxhW1xPKdTmCXH0dK3cPUToFLmk9GKc6P0UcFOtr55JOG7Gltq1coT6MXK D+Mo0AldhBkxr7J5Xx/i3QSpR5gFQWdWXP/PrrxULk6GYq5A8CIMznD+1gAm+r80NLdp qr0xdfEEzyiyNXj6RJodgeHEq5kBmO+NHvVnlfD0AhI7HAd/jEhOuzHN71hyX2pely4S /aEc8p4e54FS3maKytYbAE8gCvoUHxDJVSXrcFTt5gXNJ/ViURiTCGQENvw9MspNNado MpECPCZdpxE83K7zoGXumWwe6FaNCC47ppedQWlT64m0PL6Zwa8AwFL2OXPipf05djnb fSXg== X-Gm-Message-State: APjAAAUjimxn19RJtk2xCVUkyUd2Wf1rOE0QHwcBtHFuwFCRGPrxjmbi z5DShAqnw3tDWI6wQtWTybNYh90RTvE= X-Google-Smtp-Source: APXvYqyXKrO8h/2ufqMNr+kxAdYD2tBix+VL1dG4KoUHoUHfhP0Mm5Ndi89Gu1bIfcESq3Nk6J8m+Q== X-Received: by 2002:a63:b642:: with SMTP id v2mr40768301pgt.126.1579208733618; Thu, 16 Jan 2020 13:05:33 -0800 (PST) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id k21sm25494907pgt.22.2020.01.16.13.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 13:05:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] vl: Remove unused variable in configure_accelerators Date: Thu, 16 Jan 2020 11:05:25 -1000 Message-Id: <20200116210528.31953-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116210528.31953-1-richard.henderson@linaro.org> References: <20200116210528.31953-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 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, alex.bennee@linaro.org, aleksandar.m.mail@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The accel_initialised variable no longer has any setters. Fixes: 6f6e1698a68c Acked-by: Paolo Bonzini Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed by: Aleksandar Markovic Signed-off-by: Richard Henderson --- vl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 751401214c..6a5abf2f54 100644 --- a/vl.c +++ b/vl.c @@ -2754,7 +2754,6 @@ static void configure_accelerators(const char *progname) { const char *accel; char **accel_list, **tmp; - bool accel_initialised = false; bool init_failed = false; qemu_opts_foreach(qemu_find_opts("icount"), @@ -2781,7 +2780,7 @@ static void configure_accelerators(const char *progname) accel_list = g_strsplit(accel, ":", 0); - for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) { + for (tmp = accel_list; tmp && *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities * such as "-machine accel=tcg,,thread=single". From patchwork Thu Jan 16 21:05:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11337791 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E0DA109A for ; Thu, 16 Jan 2020 21:09:24 +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 D7B0420661 for ; Thu, 16 Jan 2020 21:09:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="q2nHp+7r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7B0420661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCOI-0007Pp-Ht for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jan 2020 16:09:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCKg-0002TK-4O for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isCKf-0007Rr-0h for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:38 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:44766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isCKe-0007RA-Q3 for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:36 -0500 Received: by mail-pf1-x441.google.com with SMTP id 62so4183767pfu.11 for ; Thu, 16 Jan 2020 13:05:36 -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=H4QnzckU0LL28w0wQX6tx5bhPXYdOpaHqvueD20Pzw4=; b=q2nHp+7rN05vWxg+MFugnxb6VHeo3d71Kz7sEa9Y80rwOml6ZLzDzLyE6VZFWXtMSH fFVXEyQzpKKC3QurcA2YzQIBlEWvKpI2ZtaY1qrbWflxHLX0vdCeFdDmSKhkLjCIauOV sRhlFs79N7tJyUl1DJE4ztmZ6IsAHzOuRKqDiQW1ryVr5LQqk56LDSDElByoaInxn/c3 qgG5+RFWmi5THue7fMh9PmSrnDG1sfZFvKKXpI8mvHg8jT9LRS+jIcdpRez8ywxCkSaU xk0GEuAUetl/om/3eK/h1ek9M7r6u4+JIH7zjMuDeV7Z47ozuIkDyfJf3Q2Z87pObWW+ B4ug== 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=H4QnzckU0LL28w0wQX6tx5bhPXYdOpaHqvueD20Pzw4=; b=sT3ZjdBul0xIm4TDyUHjVCWpF7C+4HDSrtZjhDmt9mMf57v94IEXZmYR077/s8NDpn hKSh8nQB8vBh7zz7wYT5BGL7zpZJTfSttJPFojLPG73S2b2fcx0AxtTSZaeYkh8S2+8J JpfP29sJkkrYKnlhzJy9LsJj+IS4FLyTTC+CgnD+VKaLjljBA819WDStUVjxb87S5iXm 8bXwTwc0Wg4dr2S6yVAgaQETz1IpN++wYJLqm+V3NQ9a/5JSm15KibXg7zD6w8MnltUL e9dIGoRC1mfDXZKDmxjwhSuqjp65QpMZ06T4//HSRpCvEOWRTxAc2a52cEiBMf0vNhcr Shuw== X-Gm-Message-State: APjAAAXuH8oxGbG4fmKvX+WkOqiqBV+2Mb5YSM021CIJh6QAzvMK4C1U Qc3eonSbBZzx+LRRe7u7m4MCMvRJcR0= X-Google-Smtp-Source: APXvYqwqFuXXCilBqSrTe89hSNEV01TW/+DppEBq0VyayJcOCDDM2C1uSB9rMjPNFktRllxj3yhwVA== X-Received: by 2002:a63:1e47:: with SMTP id p7mr40886916pgm.339.1579208735554; Thu, 16 Jan 2020 13:05:35 -0800 (PST) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id k21sm25494907pgt.22.2020.01.16.13.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 13:05:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] vl: Reduce scope of variables in configure_accelerators Date: Thu, 16 Jan 2020 11:05:26 -1000 Message-Id: <20200116210528.31953-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116210528.31953-1-richard.henderson@linaro.org> References: <20200116210528.31953-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 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, alex.bennee@linaro.org, aleksandar.m.mail@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The accel_list and tmp variables are only used when manufacturing -machine accel, options based on -accel. Acked-by: Paolo Bonzini Reviewed-by: Alex Bennée Reviewed by: Aleksandar Markovic Signed-off-by: Richard Henderson --- v2: The freeing of accel_list was fixed in adb464ff671d. --- vl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 6a5abf2f54..3e2b77a4e8 100644 --- a/vl.c +++ b/vl.c @@ -2753,7 +2753,6 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp) static void configure_accelerators(const char *progname) { const char *accel; - char **accel_list, **tmp; bool init_failed = false; qemu_opts_foreach(qemu_find_opts("icount"), @@ -2761,6 +2760,8 @@ static void configure_accelerators(const char *progname) accel = qemu_opt_get(qemu_get_machine_opts(), "accel"); if (QTAILQ_EMPTY(&qemu_accel_opts.head)) { + char **accel_list, **tmp; + if (accel == NULL) { /* Select the default accelerator */ if (!accel_find("tcg") && !accel_find("kvm")) { From patchwork Thu Jan 16 21:05:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11337787 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE90F6C1 for ; Thu, 16 Jan 2020 21:09:02 +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 956E920661 for ; Thu, 16 Jan 2020 21:09:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TfnIR0pc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 956E920661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCNw-0006pk-Vc for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jan 2020 16:09:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33463) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCKi-0002Wn-3c for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isCKg-0007UU-Vi for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:39 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:46056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isCKg-0007TF-Pf for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:38 -0500 Received: by mail-pf1-x444.google.com with SMTP id 2so10815747pfg.12 for ; Thu, 16 Jan 2020 13:05:38 -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=ncyinpMmDKy28yziRLqa0f0i557ZSdsPadwgIMhtoD8=; b=TfnIR0pc2BgqyNOTZwgucsEvmC8Nsp8gd0WKM+wpmyS0srNV0sYfQz2m5NcJs1BIUj BHtelKdHOuT1os3b0LvX+hyVGYQU/XWA2Y5UACwCuUzUL5SJPWIZSkurf5rYunLZYF0A E91BjEZzXzpqjMretOLEaA1o5f6Az6SwzyZeQfcjSnSK10hu3RLnPurdnpJZganDGm0H cryrqdkejbpIZpRjD8TkD6m7xEdmrWpnEyZTN/JJ54Jn71dUl70i9maus1VgqPexmHVQ 1VPYEfR0GiARH6JVwt4tBDLsbF8cawTMQOyOpFMJtPQbs8gGC3aVtxrD0HEopVV/oUYx G0WA== 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=ncyinpMmDKy28yziRLqa0f0i557ZSdsPadwgIMhtoD8=; b=NSK2ATHcoICGEFic+Iza0aAs2OyMtyp+KauTb3Ys1wJV07vf75R9Sn2XRsoB2Vf1xY mivNJFBhiRwwKroImeqgMzKrlbBqCtfnrqPj1/E5L+tNZfv1NQ3obRXiUlC6EmmatPEC HecL+qNy80uggwE5b3dNd6TA9d7vJk8M6D4qMYY6dTJoYZrvXFJhovaiSyUwuTELtyfG Ea8JBWeikNKSehAlnTvBUwdBM4WtnZSBbAYkxWZ6CBasa1VTZWjAhawgJis1S4jD7uTT dY1nOYwjfittTSzJ1rFOHI1PZkC6NxJvfR+JUEbk/Nlkm1t11fOQazqMm90tiiHSf0WU 3cCw== X-Gm-Message-State: APjAAAVmuBIE5DC0A29X+whmL/cglGIzIjRefDg+yilwa4D1XrcTa020 b5K+ubOP3BKH5wlKF8uBcsjrTCDLC/s= X-Google-Smtp-Source: APXvYqyUa9RISP966WWhk58TQ6bQjz0g5tCkw6Iwo7TzJLK1w6ii0jbuP9n6wFzwopiW4t674b45mg== X-Received: by 2002:a63:358a:: with SMTP id c132mr42324420pga.286.1579208737494; Thu, 16 Jan 2020 13:05:37 -0800 (PST) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id k21sm25494907pgt.22.2020.01.16.13.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 13:05:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] vl: Remove useless test in configure_accelerators Date: Thu, 16 Jan 2020 11:05:27 -1000 Message-Id: <20200116210528.31953-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116210528.31953-1-richard.henderson@linaro.org> References: <20200116210528.31953-1-richard.henderson@linaro.org> MIME-Version: 1.0 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, alex.bennee@linaro.org, aleksandar.m.mail@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The result of g_strsplit is never NULL. Acked-by: Paolo Bonzini Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed by: Aleksandar Markovic Signed-off-by: Richard Henderson --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 3e2b77a4e8..8ae8a5d241 100644 --- a/vl.c +++ b/vl.c @@ -2781,7 +2781,7 @@ static void configure_accelerators(const char *progname) accel_list = g_strsplit(accel, ":", 0); - for (tmp = accel_list; tmp && *tmp; tmp++) { + for (tmp = accel_list; *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities * such as "-machine accel=tcg,,thread=single". From patchwork Thu Jan 16 21:05:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11337789 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 87E8D6C1 for ; Thu, 16 Jan 2020 21:09:03 +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 5EB3D20661 for ; Thu, 16 Jan 2020 21:09:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kvM93qUh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5EB3D20661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCNy-0006s6-51 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jan 2020 16:09:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isCKk-0002Zi-1W for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isCKi-0007Wd-Sr for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:41 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:44212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isCKi-0007W2-Mu for qemu-devel@nongnu.org; Thu, 16 Jan 2020 16:05:40 -0500 Received: by mail-pg1-x541.google.com with SMTP id x7so10501289pgl.11 for ; Thu, 16 Jan 2020 13:05:40 -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=mwvRgQcQ/nPioMHiLOS0giLq/Ty193xjRxMFlibh2LA=; b=kvM93qUhSTD/C6wdIOndRAjqp1apYqeI0UBTUvLHB6s64Jbq++WTZUTC5npi34KitU CYBr8SR3+Kq1WMGzO+o1DDNiARvOMq3uPKQGHv+fatcS8kR1pKzq+gblKxftDGcoaF5o aSkm4akUF5Nk+QDhoAlDhi+DFgPzTtmonj6dzPpv73ddsLUyRXFrUWbyKN9EeNMIpyWX cJKX8YZ1eQhSWrQyk/JI+xtU38le7VN7GhTwz+h1YNtp6jk/koraf90ZtqsWgJKlQSS1 Npkn+Z9o+jhzny4c9dA5z9W9mwR0GMg1/d4xtpOokwIV9tsgQF+8xp9BDzOMgA6JnGTI hiNw== 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=mwvRgQcQ/nPioMHiLOS0giLq/Ty193xjRxMFlibh2LA=; b=UTxvEaV5ENqvV+SK3q2nJUfCr9OxHOXtRx+9xInnLsizd6p357yZro55bxk3J7cXw4 AzODXX7igJPkC3fNRPM0C4SrMmN3ygxU4AOaGYrc079UobRPGwRv35iil+dAYG1LpviV BjOYGmgGlPTRDHBDZufWG/wHLK28c4jKfQPik5/f6IRl+fDa7ohktuYtDpsnO2GxDDI8 DTp3LAnZED3F/xk1DHDrtpKNMM+UqOMcg732z5aqkxL4rNnKZT5IFaOIpNhmoWb4F3IC HQ/ALM6dXWz/lZ0zn5Kgc3nJ1TbYKDdheZrzkQnQPtTn3QTkIUR8/gho2UwQugFLiDYd USgw== X-Gm-Message-State: APjAAAVmYgpDrQs+sfsed0p4ZgqBr2esYyo5Z65i5KZ03FK2y66xhpfx HMmH9QFV+3nBp51LNT7hI63sviKD6aA= X-Google-Smtp-Source: APXvYqxv3s9N0djwe4jul7S2IyGuxCQXEeQ661t6vEaLmXrPuWEnIyv6xEYOnRlAP8+D6lkPa3yJ4w== X-Received: by 2002:a63:cf41:: with SMTP id b1mr41122897pgj.53.1579208739432; Thu, 16 Jan 2020 13:05:39 -0800 (PST) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id k21sm25494907pgt.22.2020.01.16.13.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 13:05:38 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] vl: Only choose enabled accelerators in configure_accelerators Date: Thu, 16 Jan 2020 11:05:28 -1000 Message-Id: <20200116210528.31953-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116210528.31953-1-richard.henderson@linaro.org> References: <20200116210528.31953-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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, alex.bennee@linaro.org, aleksandar.m.mail@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" By choosing "tcg:kvm" when kvm is not enabled, we generate an incorrect warning: "invalid accelerator kvm". At the same time, use g_str_has_suffix rather than open-coding the same operation. Presumably the inverse is also true with --disable-tcg. Fixes: 28a0961757fc Acked-by: Paolo Bonzini Reviewed-by: Alex Bennée Reviewed by: Aleksandar Markovic Signed-off-by: Richard Henderson --- v2: Use g_str_has_suffix (ajb) --- vl.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 8ae8a5d241..40ac9c5544 100644 --- a/vl.c +++ b/vl.c @@ -2764,21 +2764,26 @@ static void configure_accelerators(const char *progname) if (accel == 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 { - int pnlen = strlen(progname); - if (pnlen >= 3 && g_str_equal(&progname[pnlen - 3], "kvm")) { + bool have_tcg = accel_find("tcg"); + bool have_kvm = accel_find("kvm"); + + if (have_tcg && have_kvm) { + if (g_str_has_suffix(progname, "kvm")) { /* If the program name ends with "kvm", we prefer KVM */ accel = "kvm:tcg"; } else { accel = "tcg:kvm"; } + } else if (have_kvm) { + accel = "kvm"; + } else if (have_tcg) { + accel = "tcg"; + } else { + error_report("No accelerator selected and" + " no default accelerator available"); + exit(1); } } - accel_list = g_strsplit(accel, ":", 0); for (tmp = accel_list; *tmp; tmp++) {