From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10B0AC433FF for ; Tue, 13 Aug 2019 15:52: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 D7E8720679 for ; Tue, 13 Aug 2019 15:52:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7E8720679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxZ5d-0004Vg-06 for qemu-devel@archiver.kernel.org; Tue, 13 Aug 2019 11:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52482) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxZ19-0004Sl-0s for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxZ17-0002at-Sk for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25941) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxZ17-0002aW-N7 for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFCA519CF92 for ; Tue, 13 Aug 2019 15:47:20 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B10587FB8C; Tue, 13 Aug 2019 15:47:20 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CD9AF1136458; Tue, 13 Aug 2019 17:46:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 17:46:41 +0200 Message-Id: <20190813154653.20568-18-armbru@redhat.com> In-Reply-To: <20190813154653.20568-1-armbru@redhat.com> References: <20190813154653.20568-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 13 Aug 2019 15:47:21 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 17/29] Include qom/object.h slightly less 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" hw/hw.h used to include headers hardware emulation "usually" needs. The previous commits removed all but one of them, to good effect. Only qom/object.h is left. Remove that one, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190812052359.30071-18-armbru@redhat.com> --- include/hw/display/edid.h | 2 +- include/hw/hw.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index 7948bd2c40..ff99dc0a05 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -1,7 +1,7 @@ #ifndef EDID_H #define EDID_H =20 -#include "hw/hw.h" +#include "qom/object.h" =20 typedef struct qemu_edid_info { const char *vendor; /* http://www.uefi.org/pnp_id_list */ diff --git a/include/hw/hw.h b/include/hw/hw.h index 8e18358e6a..8079b911fa 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -6,8 +6,6 @@ #error Cannot include hw/hw.h from user emulation #endif =20 -#include "qom/object.h" - void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); =20 #endif --=20 2.21.0