From patchwork Fri Aug 9 06:46:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11085455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA9E013B1 for ; Fri, 9 Aug 2019 06:55:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A693E28BB6 for ; Fri, 9 Aug 2019 06:55:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 964F628B8E; Fri, 9 Aug 2019 06:55:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 48AA628B8E for ; Fri, 9 Aug 2019 06:55:39 +0000 (UTC) Received: from localhost ([::1]:56776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvyoM-0006tK-LM for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Aug 2019 02:55:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48393) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvygC-0000vN-RP for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:47:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvyg8-0001qC-Ka for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:47:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59994) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvyg8-0001nv-DA for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:47:08 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id A0117315C00D for ; Fri, 9 Aug 2019 06:47:06 +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 6B6B15D9CC; Fri, 9 Aug 2019 06:47:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ADDF71136429; Fri, 9 Aug 2019 08:46:45 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2019 08:46:33 +0200 Message-Id: <20190809064645.22656-18-armbru@redhat.com> In-Reply-To: <20190809064645.22656-1-armbru@redhat.com> References: <20190809064645.22656-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 09 Aug 2019 06:47:06 +0000 (UTC) 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] [PATCH v3 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_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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é Tested-by: Philippe Mathieu-Daudé --- 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 -#include "hw/hw.h" +#include "qom/object.h" 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 -#include "qom/object.h" - void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #endif