From patchwork Thu Sep 3 11:21:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 248995 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp351292ilg; Thu, 3 Sep 2020 04:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYeYzynRDy2DvCLqOaaNPink3YO21pFdgcj6uRf4BP1v/5WNtckmYphp0QDrwl6vyqhlXC X-Received: by 2002:a25:2fcc:: with SMTP id v195mr1763439ybv.145.1599132287519; Thu, 03 Sep 2020 04:24:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599132287; cv=none; d=google.com; s=arc-20160816; b=KDTOF9yVCp7dyKEroEKSgzCoPIh1FSiT9muagLtyu1VGE/sFfDAncZriWrmL2V3w1B 6G2m3/HbGjqLh6gKcsr8RKfb4Y0+DZvL5cwSZBuuurJbGq+Fm6bHsX9G/uQGEGSXLKwk oX36QQAgFsM2gB998gDe97LQ1pcQRjAoUkeC8q4sQIDBWVmp6+VF9Q5+J5XZhM9JIITT pHbgB1YcTQYvHF8Y82lg6kmxj9paCM8ouz/AuadL6bdH9ffa2Tw1IXBh/WOH38Sv3rke meDSAjDBubOEVw4q0lUv17TEGUvE7gCBe1FxX/coIniXdNlpUcz1zZ9xNKUtVN//A83E cwkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=UfLmeyinwTfx2td9nAoql0B4G0Y9Mq+vo4wZTVDMAU8=; b=zyuhScVUaQompPW3BsOZw2tbRDWzELfNvRLCAQDz6f8HDvKDM5twMrchwD72opUnSm FnZLxsMGM3tQdtoUiZfMoZdijBAifX/ylQEYMbLl5Ku1ltXwVnKGB9HXx6vf2W4EWs08 VsYwyoF59QAfd6H84evaIRV2hSFlTzfIIgTzAXhJ+NVaUXINUq8xwUtwgtKKKF6T2q8p z19GL9FzZmtwb97OlXq9n+Mx2OV0nOU2OSFcuowbV4BJEjUl+9yEL8ZHIdZX6NPsTB1I emtQsr6FLBgXDkASYnrZ31aZe0K7aoUpZAp4NbsVPQUjoW6NJBW81IbWNcujKs1ILtfg yXaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wF0awVtB; 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=fail (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 l9si2466306ybb.254.2020.09.03.04.24.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Sep 2020 04:24: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=fail header.i=@linaro.org header.s=google header.b=wF0awVtB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDnMF-0007ts-25 for patch@linaro.org; Thu, 03 Sep 2020 07:24:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDnIs-0002X5-Ns for qemu-devel@nongnu.org; Thu, 03 Sep 2020 07:21:18 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDnIq-0007ZZ-Vy for qemu-devel@nongnu.org; Thu, 03 Sep 2020 07:21:18 -0400 Received: by mail-wr1-x443.google.com with SMTP id c15so2748623wrs.11 for ; Thu, 03 Sep 2020 04:21:16 -0700 (PDT) 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=UfLmeyinwTfx2td9nAoql0B4G0Y9Mq+vo4wZTVDMAU8=; b=wF0awVtBYPJArW7TWAsBK0ccboGjoqzO51X6s9PioA8XT0x5TU38ibBcQUNAYmYOxu GgwA74/wL4FSNIrLZSSeTNfCYPLExPlJN/+MdvMgeZAkk/+qlH3MMSTmSiheRSaiXtV+ a+6vpjsMHlhcKpMtJVup9CjjVJtMluPt+NuncRGroynfPrAGVS48n267uEWa/VK8VFP3 KvgC4MCfA/qLkljDvYujZ6MfKn7L2CA/G1X5A5O6YE/dO6Pjvo2rnpNeM0xI2aDcoyhz bGmLliAu6SNt84YjaUgKvAIr2HDbo4t7Soq+BZGdZSiGvg7DmW7z0VrE0U7Y12splMSJ oUug== 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=UfLmeyinwTfx2td9nAoql0B4G0Y9Mq+vo4wZTVDMAU8=; b=PYNfEqDHhi6gq/KUvvVpi9QGQTLtUd0PJoEdF/WuTtor7q0qZKxKTkR31jEewhyOaf /3MQoq/J/eAtaKAqE14qb5Rk4drXqMEy5skm+4BmaMyyqPddKTN8bNPtyb5eZdUK/Ot+ feRUwGQ30o1scMrbJaIsGiC7IEG6k6bUhVGt3ziTrtG5zem1qzf0hPYbLv9R9PQ0Djty g9dqTA2AuzQV3KoasHOa050bQUpKXK2A/ZksO/gyZ1Q38FUXN+0UW1DxDcCM4HUZDjkL l9udFA+5LgjgcA1/Cs7slm4G0oxcUXiTqCdcI1XnXB4joBWbIUs21dioMu6R1X2tPyRl lXAQ== X-Gm-Message-State: AOAM533m8Uk6wGYSyY2NyRcnltK5uixVtjqOjTZDzzeeiB1QqkQSgnO7 eyLDKkKwQwneVfwVu9c+rXUlfQ== X-Received: by 2002:adf:f3c6:: with SMTP id g6mr2091917wrp.340.1599132075605; Thu, 03 Sep 2020 04:21:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 2sm3825191wrs.64.2020.09.03.04.21.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 04:21:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 217B51FF90; Thu, 3 Sep 2020 12:21:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/8] usb-host: restrict workaround to new libusb versions Date: Thu, 3 Sep 2020 12:21:03 +0100 Message-Id: <20200903112107.27367-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903112107.27367-1-alex.bennee@linaro.org> References: <20200903112107.27367-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_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: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Fixes build failures with old kernels (USBDEVFS_GET_SPEED missing), on the assumtion that distros with old kernels also have old libusb. Reported-by: Alex Bennée Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200902081445.3291-1-kraxel@redhat.com> --- hw/usb/host-libusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 08604f787fd..c5d38cb09c0 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) usb_host_ep_update(s); libusb_speed = libusb_get_device_speed(dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) if (hostfd && libusb_speed == 0) { /* * Workaround libusb bug: libusb_get_device_speed() does not