From patchwork Thu Feb 4 14:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 376281 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp1305087jah; Thu, 4 Feb 2021 06:07:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcyFoCagHz92leW/T0xwn2DJiiHoi56D9xbmVDh+h5TeuY1W4/MR5/hfhILAT6riynsesi X-Received: by 2002:a25:5cd7:: with SMTP id q206mr12531276ybb.150.1612447620194; Thu, 04 Feb 2021 06:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612447620; cv=none; d=google.com; s=arc-20160816; b=Sw7QiI+P0+l9MMBiaCbuhsUe4WmTtqxFaW3qmSjfDEupQmgPI5rDkW8lLQlcdXT4K2 X60abd/sj1JEazkFDtzpmobXWmVcd/NAz/g4BhS88gIeaWXufoxTr0EaJVjI4uVRlik0 c+UF9jlcsLr7wn08lIb5oXhAuYkwDSqwRxLhcHMqBeAU8+VsroCFL2k8Dwz5acKHwQ+i zzJ6tLyS/3HehrdDkBL6RmFthWVO82miITqjR1zHZbvrXvlLq1CtXy0/wUWC6rntlnkz aee4wNH79SdjDK8c7MX0nY815zV5ykYRxVXsRr4MvPK3b7IOkBk0ngE13qTb624ZS7/W TDzg== 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=zLjgWV8Q3RCpZchbXm/5IEIRLVNhIvbQi4mRUsAJg3E=; b=nU9kUezd4kQKgsngpbAwpyQVXwka4VuyqGW8W1c1G/wzh6hi1XyAomXxznUSXGQl90 0rVIMZRTr36ZZNGWMHvE6EsTlQCrnM64SA73jJJelUJwm/NmGcGqIVK4zIcKwr9C5PFL 4tFSZU6Y9LsKTMP0CkEkLRl8AtSGHmQEMPRGU9VdThjRFYQk2psWZN+rHyd9f0Rbq3ra saWlW+HLujKPn2qjmufoiDc1S2FVY1tkU0avFv2xbKBy7Z+EAWJwuJEuG0KVyawR5BQD +JAMJCQG93ACU631gjjLpz4P9IzwtCQiA5C434AJWGful8E5KxYpvlnZzZ6BQIAySX45 oU/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g+HJsrrg; 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=pass (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 t16si6437626ybb.446.2021.02.04.06.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Feb 2021 06:07:00 -0800 (PST) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g+HJsrrg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:46916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7fHe-0002qO-Sg for patch@linaro.org; Thu, 04 Feb 2021 09:06:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7fCe-0003ge-DO for qemu-devel@nongnu.org; Thu, 04 Feb 2021 09:01:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7fCa-00007M-LL for qemu-devel@nongnu.org; Thu, 04 Feb 2021 09:01:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612447304; 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=zLjgWV8Q3RCpZchbXm/5IEIRLVNhIvbQi4mRUsAJg3E=; b=g+HJsrrg2ulNeTeDAc1AaDnQ9oUhaqZzIH2lEpP+ZXL9CP57WOXWR6TKv1NyUa/XloqKYh MGSuPlo2nUiQQWGH0jDdywATuqF4lI6IX0UreZ6ZexVetbiCMC25Y7ScbohNBQvn7ji1+0 5BU4YnwPDTJ0T2r/ltyIli5Ks26JznE= 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-587-v1UzqxL5NfGIT4GUYjIe8A-1; Thu, 04 Feb 2021 09:01:39 -0500 X-MC-Unique: v1UzqxL5NfGIT4GUYjIe8A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25C40874982; Thu, 4 Feb 2021 14:01:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4D155C54B; Thu, 4 Feb 2021 14:01:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6B6EA113861E; Thu, 4 Feb 2021 15:01:36 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/9] monitor/qmp-cmds.c: Don't include ui/vnc.h Date: Thu, 4 Feb 2021 15:01:28 +0100 Message-Id: <20210204140136.2769065-2-armbru@redhat.com> In-Reply-To: <20210204140136.2769065-1-armbru@redhat.com> References: <20210204140136.2769065-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The qmp-cmds.c file currently includes ui/vnc.h, which (being located in the ui/ directory rather than include) is really supposed to be for use only by the ui subsystem. In fact the function prototypes we need (vnc_display_password(), etc) are all declared in include/ui/console.h, so we can switch to including that instead. (ui/vnc.h includes include/ui/console.h, so this change strictly reduces the quantity of headers qmp-cmds.c pulls in.) Signed-off-by: Peter Maydell Message-Id: <20210104161200.15068-1-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster --- monitor/qmp-cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.2 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 990936136c..c7df8c0ee2 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -23,7 +23,7 @@ #include "qemu/uuid.h" #include "chardev/char.h" #include "ui/qemu-spice.h" -#include "ui/vnc.h" +#include "ui/console.h" #include "sysemu/kvm.h" #include "sysemu/runstate.h" #include "sysemu/runstate-action.h"