From nobody Mon Feb 9 19:06:57 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671711269; cv=none; d=zohomail.com; s=zohoarc; b=Rd5vdqADGr4XYNEkHhiLpBJgSN5dKueZsP9A42GYYTFVUUuW8Hrxolh0i8c6j4NSbpdw7q9PxTKfCnVembAedjgYm+hP9Ozox8yEqmYnN7DRf6rrBqgaJyXDuMDpEEbKMwHEEQ+AsutgCKAPppEXanAOEULGdHSRtvbGCduCUfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671711269; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DtlmAGI4tYrX1qCtGmQnW9EFq9Qipk3gRJ1ke0PpJ/0=; b=Tr6KoqNNR/hyDgkX7rzhJmtHkWoMhbZyeIj+riNs/ntY24BhaOssLCEr544HAEbTgF1xZPEEhh+yeV3RliebZ4baWdfrlum6ntcT86Y8Ia1kz4TIj8gQgFqWSosb3PT7vE+aBv/xR692IYrhVdxbcbKXByE9sJk+vO8f87oDdKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671711269127755.1975764545037; Thu, 22 Dec 2022 04:14:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8KND-0007W3-1F; Thu, 22 Dec 2022 07:08:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8KNA-0007Sc-Br for qemu-devel@nongnu.org; Thu, 22 Dec 2022 07:08:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8KN4-0004Zs-8W for qemu-devel@nongnu.org; Thu, 22 Dec 2022 07:08:28 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-hBt_20iEPaeh8n8l9jXqyA-1; Thu, 22 Dec 2022 07:08:16 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E2E885A588; Thu, 22 Dec 2022 12:08:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67646C16028; Thu, 22 Dec 2022 12:08:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 43C3421E691E; Thu, 22 Dec 2022 13:08:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671710901; 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=DtlmAGI4tYrX1qCtGmQnW9EFq9Qipk3gRJ1ke0PpJ/0=; b=VhZsjtyhenJVwB9Gt8FVac3338W3b1lSVQymj8G2BDtidZdVrjd/XxN044HvTeEjsBygiB GT40UzvE+QbhmeHE39ANjxrVzsk3eJffYM1a+PnRowV9Hii1YVU3lxvRHGC4DOJTnIT8/V M99HYIFHnZuYr2XMLABquE9X0nUzH3M= X-MC-Unique: hBt_20iEPaeh8n8l9jXqyA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, peter.maydell@linaro.org, laurent@vivier.eu, edgar.iglesias@gmail.com, Alistair.Francis@wdc.com, bin.meng@windriver.com, palmer@dabbelt.com, marcel.apfelbaum@gmail.com, yangxiaojuan@loongson.cn, gaosong@loongson.cn, richard.henderson@linaro.org, deller@gmx.de, jasowang@redhat.com, vikram.garhwal@amd.com, francisco.iglesias@amd.com, clg@kaod.org, kraxel@redhat.com, marcandre.lureau@redhat.com, riku.voipio@iki.fi, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, crwulff@gmail.com, marex@denx.de, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Stefano Garzarella Subject: [PATCH v2 1/4] include/hw/virtio: Break inclusion loop Date: Thu, 22 Dec 2022 13:08:10 +0100 Message-Id: <20221222120813.727830-2-armbru@redhat.com> In-Reply-To: <20221222120813.727830-1-armbru@redhat.com> References: <20221222120813.727830-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, 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=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671711270132100001 hw/virtio/virtio.h and hw/virtio/vhost.h include each other. The former doesn't actually need the latter, so drop that inclusion to break the loop. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Stefano Garzarella Acked-by: Jason Wang Reviewed-by: Edgar E. Iglesias --- include/hw/virtio/virtio.h | 1 - hw/virtio/virtio-qmp.c | 1 + hw/virtio/virtio.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 24561e933a..48ab2117b5 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -22,7 +22,6 @@ #include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" #include "qom/object.h" -#include "hw/virtio/vhost.h" =20 /* * A guest should never accept this. It implies negotiation is broken diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index 8e7282658f..3d4497da99 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -11,6 +11,7 @@ =20 #include "qemu/osdep.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "virtio-qmp.h" =20 #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 289eb71045..0ec6ff9ae4 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -25,6 +25,7 @@ #include "qom/object_interfaces.h" #include "hw/core/cpu.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" --=20 2.38.1