From patchwork Fri Jul 24 16:42:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 247137 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2617633ilg; Fri, 24 Jul 2020 09:43:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCf4Bdra+lqCzz5zQMcCHc0DNHs17s/vDdDk81greRhlp1Uyk0+XUL+Ic/bq8d5WgALmj7 X-Received: by 2002:a25:4c81:: with SMTP id z123mr16011698yba.309.1595609027904; Fri, 24 Jul 2020 09:43:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595609027; cv=none; d=google.com; s=arc-20160816; b=pJCm2YlNR/8rTDxvXY0qKl3QcgLUsBJPfCsF9jAkPYuA/d3hW/GOpbsOH6tU6QRye/ KsvXZHulcKPCVhuJJsdM9mv8ip4IpC8qa1WmeO+2I6Sy4diLzit7eKv10XzQ1pmMvv8s nROR0bJafljd7cPV7oHHJ2vlelr89nKIpydh/GD23eaTjl0T4sWcSaTttCnEipN/8PbF kWx4FCxvj4883xyHQW4+x8P7C4T8o/L2WfVPKo6V0mPUtcv5xtIXCWPWBeKjJUQ3/FNJ Y7mb9re6DsmXZuf4UkZFfUOr5Uo2nkfTXQQFrcuTuJNTNyuvfi8NLcpAHTgdGWBq28h3 8/kg== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=HjciOT3EI31nPUC4rwgPKpHpeL3y2GcS40JR0oEFXyw=; b=yLiv1gSxapuYaIzbIr4oXYFn+FfKKUkfGWCj/J/Mb5gSLSpUEyXNu405SCb+uAwThZ nG+DWaAu38GK0X94ygf/xxuMl7MlvQCGp7a4qrsUcjQ3siwDCgFtpbNGr9PcxyfRqfGo u6DmjbW/e9y7VR/6UY0fh0zhNO0XjPigaD5BcRaiUVABTTcNpBm94jfBx+v+DNu9BpXP WipbbEmiYq712xggk5UAXJQeq3746PFs1KIng6cKAfN1CgJ6Ks+ZF/pdSCeUR74wMxWK 3MaGaPvyVw6S8dFNTwzfP72esQ0cMT0mVf9vAA1T3J6hkaC+bNzMVng/6qVmyfDBE6T4 q/kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=CMRs58f9; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 195si1618887ybc.11.2020.07.24.09.43.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Jul 2020 09:43: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=@redhat.com header.s=mimecast20190719 header.b=CMRs58f9; 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=redhat.com Received: from localhost ([::1]:50934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz0nT-0005ui-CD for patch@linaro.org; Fri, 24 Jul 2020 12:43:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz0n0-0005Qo-SA for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:43:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22419 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jz0my-0002ah-8D for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:43:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595608994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=HjciOT3EI31nPUC4rwgPKpHpeL3y2GcS40JR0oEFXyw=; b=CMRs58f9vd7kDq/jsRRLWj5B819UBdSDI7tZcJIfX0PKYkyLRkk52Pe1dsv+Z4OiO2Yb6e sOP6f3mkPYBnsP+e0t0O6oLVtZC+WFJaWm9AtCsUUY6YUboV4C00ex+flZKBkRAY5u7bsG arq3cHLZQm+A+KXqFlK97K7PhlIhRD8= 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-248-nrvR9thLPvSFgNDAOHmVCw-1; Fri, 24 Jul 2020 12:43:10 -0400 X-MC-Unique: nrvR9thLPvSFgNDAOHmVCw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BEBB800597; Fri, 24 Jul 2020 16:43:09 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD4535D9D3; Fri, 24 Jul 2020 16:43:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AA2989D94; Fri, 24 Jul 2020 18:42:58 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES Date: Fri, 24 Jul 2020 18:42:57 +0200 Message-Id: <20200724164258.24886-3-kraxel@redhat.com> In-Reply-To: <20200724164258.24886-1-kraxel@redhat.com> References: <20200724164258.24886-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 08:23:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Peter Maydell , qemu-arm@nongnu.org, Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell virtio-input-hid.c undefines CONFIG_CURSES before including ui/console.h. However since commits e2f82e924d057935 and b0766612d16da18 that header does not have behaviour dependent on CONFIG_CURSES. Remove the now-unneeded undef. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Acked-by: Michael S. Tsirkin Message-id: 20200723192457.28136-1-peter.maydell@linaro.org Signed-off-by: Gerd Hoffmann --- hw/input/virtio-input-hid.c | 1 - 1 file changed, 1 deletion(-) -- 2.18.4 diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index 09cf2609854f..a7a244a95dbb 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -12,7 +12,6 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" -#undef CONFIG_CURSES #include "ui/console.h" #include "standard-headers/linux/input.h"